2026-03-20

1、创建分卷的【产量报告】调用存储过程时增加不良数参数
2、合并卷里的当前卷数量不允许修改

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -3528,7 +3528,8 @@ public class ScheduleServiceImpl implements ScheduleService {
 
         //存储过程 调用存储过程  创建分卷
         String remark = inData.getRemark();
-        Map<String, Object> resultMap = this.workBenchCreateSlittingRollAction(site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, operatorId, remark);
+        Float defectQty = inData.getDefectQty();
+        Map<String, Object> resultMap = this.workBenchCreateSlittingRollAction(site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, operatorId, remark, defectQty);
         //判断结果是否成功
         String resultCode = String.valueOf(resultMap.get("resultCode"));
         if ("400".equalsIgnoreCase(resultCode)) {
@@ -3601,7 +3602,7 @@ public class ScheduleServiceImpl implements ScheduleService {
      * @DateTime 2022/2/17 14:51
      * @Param [site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, operatorId, remark]
      **/
-    public Map<String, Object> workBenchCreateSlittingRollAction(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float rollQty, Integer rollNums, String operatorId, String remark) {
+    public Map<String, Object> workBenchCreateSlittingRollAction(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float rollQty, Integer rollNums, String operatorId, String remark, Float defectQty) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
@@ -3611,7 +3612,8 @@ public class ScheduleServiceImpl implements ScheduleService {
         params.add(rollQty);
         params.add(rollNums);
         params.add(operatorId);
-        params.add(remark);  // 添加备注参数
+        params.add(remark);
+        params.add(defectQty);  // 不良数（每卷所有排的不良数之和）
         //调用存储过程
         List<Map<String, Object>> resultList = procedureMapper.getProcedureData("workbench_createslittingroll_action", params);
         //处理返回的结果