From 3a7dd42a3a85f8f2e02470a4e89011950f49d319 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Fri, 26 Aug 2022 11:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=202022=E5=B9=B48=E6=9C=8826?=
 =?UTF-8?q?=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gaotao/modules/toolman/query/PoReceiptQuery.java   | 4 +---
 src/main/resources/mapper/toolman/PoReceiptMapper.xml      | 7 ++++++-
 src/main/resources/static/js/pda/publicMenu.js             | 2 +-
 src/main/resources/static/js/pda_base.js                   | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/toolman/query/PoReceiptQuery.java b/src/main/java/com/gaotao/modules/toolman/query/PoReceiptQuery.java
index 03fdc5a..936a505 100644
--- a/src/main/java/com/gaotao/modules/toolman/query/PoReceiptQuery.java
+++ b/src/main/java/com/gaotao/modules/toolman/query/PoReceiptQuery.java
@@ -25,12 +25,10 @@ public class PoReceiptQuery extends PoReceipt {
     private String supplierId;
     private String supplierName;
     private String invoicePrice;
-
     private Date startDate;
     private Date endDate;
-
     private Date rStartDate;
     private Date rEndDate;
-
     private String status;
+    private String receiptType;
 }
diff --git a/src/main/resources/mapper/toolman/PoReceiptMapper.xml b/src/main/resources/mapper/toolman/PoReceiptMapper.xml
index dc0bce7..7a03cd3 100644
--- a/src/main/resources/mapper/toolman/PoReceiptMapper.xml
+++ b/src/main/resources/mapper/toolman/PoReceiptMapper.xml
@@ -181,7 +181,8 @@
         pr.receive_date,pr.receiver,prd.receipt_no
         ,h.ToolDescription tool_description,pr.supplier_id,s.SupplierName supplier_name, prd.inspector
         ,prd.inspection_time,
-        (case when prd.arrive_qty = prd.invoice_qty then '已对账' else '未对账' end) status
+        (case when prd.arrive_qty = prd.invoice_qty then '已对账' else '未对账' end) status,
+        (case when charindex('TW',pr.OrderRef1) >0 then '维修入库' else '采购接收' end) receipt_type
         FROM po_receipt_detail prd
         LEFT JOIN po_receipt pr ON prd.site = pr.site AND pr.receipt_no = prd.receipt_no
         LEFT JOIN ToolHeader h ON prd.site = h.site AND prd.part_no = h.ToolID
@@ -222,6 +223,10 @@
             <if test=" poReceiptQuery.rEndDate != null">
                 AND  prd.inspection_time <![CDATA[ <= ]]>  #{ poReceiptQuery.rEndDate}
             </if>
+            <if test=" poReceiptQuery.receiptType != null and  poReceiptQuery.receiptType != '' ">
+                AND  (case when charindex('TW',pr.OrderRef1) >0 then '维修入库' else '采购接收' end) =  #{ poReceiptQuery.receiptType}
+            </if>
+
         </where>
 
         ORDER BY pr.receive_date DESC
diff --git a/src/main/resources/static/js/pda/publicMenu.js b/src/main/resources/static/js/pda/publicMenu.js
index 2aed945..29fb40c 100644
--- a/src/main/resources/static/js/pda/publicMenu.js
+++ b/src/main/resources/static/js/pda/publicMenu.js
@@ -84,7 +84,7 @@ function processMenuTags(authTree){
 	authTag += '<div data-v-45aee492="" class="ivu-col ivu-col-span-13 ivu-col-offset-5" style="width: 105%;margin-left: -7px;">';
 	authTag += '<a data-v-45aee492="" type="button" id="'+id+'" href="'+url+'"';
 	authTag += 'class="ivu-btn ivu-btn-primary ivu-btn-long" >';  //style = "border-color: #FF7F24;"
-	authTag += '<span style="font-size: 18px">'+name+'</span>';
+	authTag += '<span style="font-size: 20px">'+name+'</span>';
 	authTag += '</a></div></div>';
 	return authTag;
 }
diff --git a/src/main/resources/static/js/pda_base.js b/src/main/resources/static/js/pda_base.js
index cde38b9..326fe30 100644
--- a/src/main/resources/static/js/pda_base.js
+++ b/src/main/resources/static/js/pda_base.js
@@ -135,7 +135,7 @@ function processMenuTags(authTree){
 	authTag += '<div data-v-45aee492="" class="ivu-col ivu-col-span-13 ivu-col-offset-5" style="width: 105%;margin-left: -7px;">';
 	authTag += '<a data-v-45aee492="" type="button" id="'+id+'" href="'+url+'"';
 	authTag += 'class="ivu-btn ivu-btn-primary ivu-btn-long" >';  //style = "border-color: #FF7F24;"
-	authTag += '<span style="font-size: 18px">'+name+'</span>';
+	authTag += '<span style="font-size: 20px">'+name+'</span>';
 	authTag += '</a></div></div>';
 	return authTag;
 }
\ No newline at end of file