2024-05-14

功能优化

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;
 }

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);
         // 根据符号区分是 入库,还是出库

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">

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>