fix: 分切下卷气胀轴编码丢失

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java

@@ -17,6 +17,7 @@ import org.nl.b_lms.sch.point.dao.StIvtCutpointivt;
 import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
+import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
 import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.utils.SecurityUtils;
@@ -121,16 +122,53 @@ public class SlitterDownTrussTask extends AbstractAcsTask {
             log.info("即将下卷的上下轴的子卷号数据2：{}", downPlans);
             SlitterTaskUtil.setPaperWeightStr(point1.getRemark(), downPlans);
             log.info("即将下卷的上下轴的子卷号数据3：{}", downPlans);
-            downPlans.forEach(downPlan -> {
+            List<PdmBiSlittingproductionplan> needUpdates = new ArrayList<>();
-                downPlan.setStatus("09");
+            // 绑定气胀轴编码（可能没有气胀轴编码）
-                downPlan.setEnd_time(DateUtil.now());
+            List<PdmBiSlittingproductionplan> deviceUpPlans = downPlans.stream().filter(p -> SlitterConstant.SLITTER_SHAFT_UP.equals(p.getUp_or_down())).collect(Collectors.toList());
-                TaskUtils.updateOptMessageBySlitterPlan(downPlan);
+            List<PdmBiSlittingproductionplan> deviceDownPlans = downPlans.stream().filter(p -> SlitterConstant.SLITTER_SHAFT_DOWN.equals(p.getUp_or_down())).collect(Collectors.toList());
-            });
+            if (deviceUpPlans.size() > 0) {
-            log.info("即将下卷的上下轴的子卷号数据4：{}", downPlans);
+                PdmBiSlittingproductionplan upDemoPlan = deviceUpPlans.get(0);
+                String resourceName = upDemoPlan.getResource_name();
+                String qzzNO = resourceName.substring(0, 2)
+                        + resourceName.substring(resourceName.length() - 2)
+                        + upDemoPlan.getSplit_group()
+                        + TaskUtils.getDateTime("yyMMddHHmmss") + "-"
+                        + upDemoPlan.getUp_or_down();
+                for (PdmBiSlittingproductionplan deviceUpPlan : deviceUpPlans) {
+                    deviceUpPlan.setQzzno(qzzNO);
+                    deviceUpPlan.setStatus("09");
+                    deviceUpPlan.setEnd_time(DateUtil.now());
+                    TaskUtils.updateOptMessageBySlitterPlan(deviceUpPlan);
+                    needUpdates.add(deviceUpPlan);
+                }
+            }
+            if (deviceDownPlans.size() > 0) {
+                PdmBiSlittingproductionplan downDemoPlan = deviceDownPlans.get(0);
+                String resourceName = downDemoPlan.getResource_name();
+                String qzzNO = resourceName.substring(0, 2)
+                        + resourceName.substring(resourceName.length() - 2)
+                        + downDemoPlan.getSplit_group()
+                        + TaskUtils.getDateTime("yyMMddHHmmss") + "-"
+                        + downDemoPlan.getUp_or_down();
+                for (PdmBiSlittingproductionplan deviceDownPlan : deviceDownPlans) {
+                    deviceDownPlan.setQzzno(qzzNO);
+                    deviceDownPlan.setStatus("09");
+                    deviceDownPlan.setEnd_time(DateUtil.now());
+                    TaskUtils.updateOptMessageBySlitterPlan(deviceDownPlan);
+                    needUpdates.add(deviceDownPlan);
+                }
+            }
+
+//            downPlans.forEach(downPlan -> {
+//                downPlan.setStatus("09");
+//                downPlan.setEnd_time(DateUtil.now());
+//                TaskUtils.updateOptMessageBySlitterPlan(downPlan);
+//            });
+            log.info("即将下卷的上下轴的子卷号数据4-需要更新的新数组：{}", needUpdates);
 //            slittingproductionplanService.updateBatchById(downPlans);
-            for (int i = 0; i < downPlans.size(); i++) {
+            for (int i = 0; i < needUpdates.size(); i++) {
-                boolean flag = slittingproductionplanService.updateById(downPlans.get(i));
+                boolean flag = slittingproductionplanService.updateById(needUpdates.get(i));
-                log.info(flag+"即将下卷的上下轴的子卷号数据5：{}", downPlans);
+                log.info(flag+"即将下卷的上下轴的子卷号数据5：{}", needUpdates);
             }
             // 获取气胀轴编码
             // 筛选上下轴各一条