feat: 分切业务任务取消逻辑

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

@@ -134,7 +134,31 @@ public class SlitterDownTrussTask extends AbstractAcsTask {
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
             task.setTask_status(TaskStatusEnum.FINISHED.getCode());
-            // todo: 分切计划回退？
+            // 分切计划回退
+            // 下来：06 -> 05  上去：04 -> 03
+            String pointCode1 = task.getPoint_code1();
+            StIvtCutpointivt point1 = cutpointivtService.getPintByUpOrDownCode(pointCode1, false);
+            String pointCode2 = task.getPoint_code2();
+            BstIvtCutpointivt point2 = bcutpointivtService.getPintByTrussCode(pointCode2, false);
+            String tmpUpQzzNo = point1.getUp_qzzno();
+            String tmpDownQzzNo = point1.getDown_qzzno();
+            // 更新分切计划
+            // 下来的分切计划状态：06 -> 05
+            PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan();
+            p.setStatus("05");
+            TaskUtils.updateOptMessageBySlitterPlan(p);
+            List<String> downQzzNos = Stream.of(tmpUpQzzNo, tmpDownQzzNo)
+                    .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
+            slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
+                    .in(PdmBiSlittingproductionplan::getQzzno, downQzzNos));
+            // 上去的分切计划状态：04 -> 03
+            p.setStatus("03");
+            List<String> upQzzNos = Stream.of(point2.getQzz_no1(), point2.getQzz_no2())
+                    .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
+            if (upQzzNos.size() > 0) {
+                slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
+                        .in(PdmBiSlittingproductionplan::getQzzno, upQzzNos));
+            }
         }
         task.setUpdate_time(DateUtil.now());
         taskService.updateById(task);

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

@@ -8,6 +8,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
@@ -113,6 +115,24 @@ public class TrussCallAirShaftTask extends AbstractAcsTask {
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
             task.setTask_status(TaskStatusEnum.FINISHED.getCode());
+            // 将分切计划is_paper_ok --- 2 -> 1
+            String requestParam = task.getRequest_param();
+            JSONObject jsonObject = JSONObject.parseObject(requestParam);
+            if (ObjectUtil.isEmpty(requestParam)) {
+                throw new BadRequestException("任务 code = " + task.getTask_code() + " 参数错误");
+            }
+            JSONObject needPlan = jsonObject.getJSONObject("needPlan");
+            if (ObjectUtil.isNotEmpty(needPlan)) {
+                // 回退
+                LambdaUpdateWrapper<PdmBiSlittingproductionplan> updateWrapper = new LambdaUpdateWrapper<PdmBiSlittingproductionplan>();
+                updateWrapper.set(PdmBiSlittingproductionplan::getIs_paper_ok, "1")
+                        .eq(PdmBiSlittingproductionplan::getParent_container_name, needPlan.getString("parent_container_name"))
+                        .eq(PdmBiSlittingproductionplan::getResource_name, needPlan.getString("resource_name"))
+                        .eq(PdmBiSlittingproductionplan::getSplit_group, needPlan.getString("split_group"))
+                        .eq(PdmBiSlittingproductionplan::getUp_or_down, needPlan.getString("up_or_down"))
+                        .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO);
+                slittingproductionplanService.update(updateWrapper);
+            }
         }
         task.setUpdate_time(DateUtil.now());
         taskService.updateById(task);

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

@@ -121,7 +121,7 @@ public class TrussSendAirShaftTask extends AbstractAcsTask {
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
             task.setTask_status(TaskStatusEnum.FINISHED.getCode());
-            // 是否需要回退分切计划套轴完成
+            // 回退分切计划套轴完成
             List<String> collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2())
                     .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
             PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan();

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

@@ -126,7 +126,7 @@ public class UpShaftTrussTask extends AbstractAcsTask {
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
             task.setTask_status(TaskStatusEnum.FINISHED.getCode());
 
-            // 分切计划修改状态回退03
+            // 分切计划修改状态回退04 -> 03
             List<String> collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2())
                     .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
             PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan();