From 5bb36485c03a6413694bc10e84afbd9a703722e4 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 14 May 2024 11:30:44 +0800
Subject: [PATCH] =?UTF-8?q?2024-05-14=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xujie/sys/modules/pms/data/PartSpareData.java |  9 +++++++++
 .../modules/pms/service/Impl/EamServiceImpl.java  |  5 +++--
 src/main/resources/mapper/pms/EamMapper.xml       |  4 ++--
 src/main/resources/mapper/pms/QcMapper.xml        | 15 +++++++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/PartSpareData.java b/src/main/java/com/xujie/sys/modules/pms/data/PartSpareData.java
index 863740c9..f31d790f 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/PartSpareData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/PartSpareData.java
@@ -189,4 +189,13 @@ public class PartSpareData {
     private String securityFlag;
 
     private String newLocationId;
+
+    // bu
+    private String buNo;
+
+    // 工单号
+    private String orderNo;
+
+    // 出库方式
+    private String outType;
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
index afe477b0..5d91d71f 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
@@ -3008,8 +3008,9 @@ public class EamServiceImpl implements EamService {
             repairTransDetailData.setTransQty(partSpareData.getOutQty());
         }
         repairTransDetailData.setDirection(partSpareData.getDirection());
-        repairTransDetailData.setOrderRef1("");
-        repairTransDetailData.setOrderRef2("");
+        repairTransDetailData.setOrderRef1(partSpareData.getBuNo());
+        repairTransDetailData.setOrderRef2(partSpareData.getOrderNo());
+        repairTransDetailData.setOrderRef3(partSpareData.getOutType());
         repairTransDetailData.setCitemCode("");
         repairTransDetailData.setBatchNo(batchNo);
         // 根据符号区分是 入库,还是出库
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index e2a00538..1d62e2f5 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -2897,9 +2897,9 @@
 
     <insert id="saveRepairTransDetail" parameterType="RepairTransDetailData">
         insert into repair_TransDetail
-            (TransNo, Site, ItemNo, PartNo, LocationID, TransQty, Direction, BatchNo, OrderRef1, OrderRef2, citem_code)
+            (TransNo, Site, ItemNo, PartNo, LocationID, TransQty, Direction, BatchNo, OrderRef1, OrderRef2, OrderRef3, citem_code)
         values
-            (#{transNo}, #{site}, #{itemNo}, #{partNo}, #{locationId}, #{transQty}, #{direction}, #{batchNo}, #{orderRef1}, #{orderRef2}, #{citemCode})
+            (#{transNo}, #{site}, #{itemNo}, #{partNo}, #{locationId}, #{transQty}, #{direction}, #{batchNo}, #{orderRef1}, #{orderRef2}, #{orderRef3}, #{citemCode})
     </insert>
 
     <insert id="saveRepairTransHeader" parameterType="RepairTransHeaderData">
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 4ac8637d..4192b58b 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1608,6 +1608,9 @@
             <if test = "query.orderNo != null and query.orderNo != ''">
                 AND order_no LIKE '%' + #{query.orderNo} + '%'
             </if>
+            <if test = "query.seqNo != null and query.seqNo != ''">
+                AND seq_no LIKE '%' + #{query.seqNo} + '%'
+            </if>
             <if test = "query.operationDesc != null and query.operationDesc != ''">
                 AND operation_desc LIKE '%' + #{query.operationDesc} + '%'
             </if>
@@ -1929,6 +1932,9 @@
             <if test = "query.orderNo != null and query.orderNo != ''">
                 AND order_no LIKE '%' + #{query.orderNo} + '%'
             </if>
+            <if test = "query.seqNo != null and query.seqNo != ''">
+                AND seq_no LIKE '%' + #{query.seqNo} + '%'
+            </if>
             <if test = "query.operationDesc != null and query.operationDesc != ''">
                 AND operation_desc LIKE '%' + #{query.operationDesc} + '%'
             </if>
@@ -2287,6 +2293,12 @@
             <if test="query.endDate2 != null">
                 AND #{query.endDate2} >= create_date
             </if>
+            <if test = "query.poOrderNo != null and query.poOrderNo != ''">
+                AND po_orderNo LIKE '%' + #{query.poOrderNo} + '%'
+            </if>
+            <if test = "query.poItemNo != null and query.poItemNo != ''">
+                AND po_itemNo LIKE '%' + #{query.poItemNo} + '%'
+            </if>
         </where>
         ORDER BY
         CASE WHEN state = '待检验' THEN 1
@@ -2599,6 +2611,9 @@
             <if test = "query.orderNo != null and query.orderNo != ''">
                 AND order_no LIKE '%' + #{query.orderNo} + '%'
             </if>
+            <if test = "query.seqNo != null and query.seqNo != ''">
+                AND seq_no LIKE '%' + #{query.seqNo} + '%'
+            </if>
             <if test = "query.operationDesc != null and query.operationDesc != ''">
                 AND operation_desc LIKE '%' + #{query.operationDesc} + '%'
             </if>