2025-12-12

过站采集-》车间工作平台->材料清单新增【材料拼卷】优化

src/main/java/com/gaotao/modules/pms/service/Impl/YieldReportCommonsServiceImpl.java

@@ -75,7 +75,7 @@ public class YieldReportCommonsServiceImpl implements YieldReportCommonsService
     }
 
     /**
-     * @Description 材料接卷
+     * @Description 材料拼卷
      * @DateTime 2025/12/11
      * @Param [inData]
      * @return java.util.Map<java.lang.String, java.lang.Object>
@@ -87,14 +87,14 @@ public class YieldReportCommonsServiceImpl implements YieldReportCommonsService
         String orderNo = inData.getOrderNo();
         Integer itemNo = inData.getItemNo();
         String seqNo = inData.getSeqNo();
-        String rollNo = inData.getRollNo();
-        Float returnQty = inData.getReturnQty();
-        int histSeqNo = inData.getHistSeqNo();
-        String operatorId = inData.getOperatorId();
-        String remark = inData.getRemark();
+        String rollNo = inData.getRollNo(); // 选中行标签
+        int histSeqNo = inData.getHistSeqNo(); // 选中行序号
+        String newRollNo = inData.getNewRollNo(); // 扫描标签
+        String operatorId = inData.getOperatorId(); // 操作员
+        String scanType = inData.getScanType(); // 扫描类型：I=添加、D=删除
 
-        // 存储过程  执行材料接卷
-        Map<String, Object> resultMap = this.callMaterialProcessRollUp(site, orderNo, itemNo, seqNo, rollNo, returnQty, histSeqNo, operatorId, remark);
+        // 存储过程  执行材料拼卷
+        Map<String, Object> resultMap = this.callMaterialProcessRollUp(site, orderNo, itemNo, seqNo, rollNo, histSeqNo, newRollNo, operatorId, scanType);
         // 判断结果是否成功
         String resultCode = String.valueOf(resultMap.get("Code"));
         if ("400".equalsIgnoreCase(resultCode)) {
@@ -106,22 +106,22 @@ public class YieldReportCommonsServiceImpl implements YieldReportCommonsService
     }
 
     /**
-     * @Description 调用材料接卷存储过程
+     * @Description 调用材料拼卷存储过程
      * @DateTime 2025/12/11
-     * @Param [site, orderNo, itemNo, seqNo, rollNo, returnQty, histSeqNo, operatorId, remark]
+     * @Param [site, orderNo, itemNo, seqNo, rollNo, histSeqNo, newRollNo, operatorId, scanType]
      * @return java.util.Map<java.lang.String, java.lang.Object>
      **/
-    private Map<String, Object> callMaterialProcessRollUp(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float returnQty, int histSeqNo, String operatorId, String remark) {
+    private Map<String, Object> callMaterialProcessRollUp(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, int histSeqNo, String newRollNo, String operatorId, String scanType) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
         params.add(itemNo);
         params.add(seqNo);
-        params.add(rollNo);
-        params.add(returnQty);
-        params.add(histSeqNo);
-        params.add(operatorId);
-        params.add(remark);
+        params.add(rollNo);       // 选中行标签
+        params.add(histSeqNo);    // 选中行序号
+        params.add(newRollNo);    // 扫描标签
+        params.add(operatorId);   // 操作员
+        params.add(scanType);     // 扫描类型：I=添加、D=删除
         // 调用存储过程
         List<Map<String, Object>> resultList = procedureMapper.getProcedureData("MaterialProcessRollUp", params);
         // 处理返回的结果

src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java

@@ -108,6 +108,7 @@ public class SearchScheduleData extends BaseData {
     private Float returnQty;//退料数量（异常下机）
     private String oriRollNo;//原始卷号
     private String newRollNo;//新切换的卷号
+    private String scanType;//扫描类型：I=添加、D=删除
     private Float newRollQty;//新卷的数量
     private Float rollQty;//当前卷的良品数量
     private Integer rollNums;//当前卷的数量
@@ -904,6 +905,14 @@ public class SearchScheduleData extends BaseData {
         this.newRollNo = newRollNo;
     }
 
+    public String getScanType() {
+        return scanType;
+    }
+
+    public void setScanType(String scanType) {
+        this.scanType = scanType;
+    }
+
     public Float getRollQty() {
         return rollQty;
     }

src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml

@@ -156,7 +156,7 @@
             a.issue_method as issueMethod,
             a.outbound_warehouse_id as outboundWarehouseId
         from SOBOM a
-        where a.Site = #{site} and a.OrderNo = #{orderno}
+        where a.Site = #{site} and a.OrderNo = #{orderno} and a.issue_method <![CDATA[<>]]> '入库倒冲'
           and a.ComponentPartNo is not null
     </select>