diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java index 772a587c0..d88c63dfc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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; @@ -102,6 +103,9 @@ public class SlitterDownTrussTask extends AbstractAcsTask { point1 = cutpointivtService.getPintByUpOrDownCode(pointCode2, false); point2 = bcutpointivtService.getPintByTrussCode(pointCode1, false); } + // 点位数据更新 + point1.setUp_qzzno(point2.getQzz_no1()); + point1.setDown_qzzno(point2.getQzz_no2()); log.info("起点数据：{}", point1); log.info("终点数据：{}", point2); String tmpUpQzzNo = point1.getUp_qzzno(); @@ -124,12 +128,28 @@ public class SlitterDownTrussTask extends AbstractAcsTask { .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); log.info("即将上卷的气胀轴编码数据：{}", upQzzNos); if (upQzzNos.size() > 0) { - slittingproductionplanService.update(p, new LambdaQueryWrapper() - .in(PdmBiSlittingproductionplan::getQzzno, upQzzNos)); + List plans = slittingproductionplanService.getByQzzNos(upQzzNos); + PdmBiSlittingproductionplan pp = plans.get(0); + if (pp.getContainer_name().contains("虚拟")) { + // 如果是虚拟卷，需要执行删除标记，并且清空数据 + // 将分切计划删除，设备禁用 + plans.forEach(p1 -> { + p1.setIs_delete("1"); + p1.setQzzno(""); + p1.setUpdate_time(DateUtil.now()); + p1.setUpdate_optname(SecurityUtils.getCurrentNickName()); + p1.setUpdate_optid(SecurityUtils.getCurrentUserId()); + }); + slittingproductionplanService.updateBatchById(plans); + // 设备禁用 + point1.setIs_used("0"); + point1.setUp_qzzno(""); + point1.setDown_qzzno(""); + } else { + slittingproductionplanService.update(p, new LambdaQueryWrapper() + .in(PdmBiSlittingproductionplan::getQzzno, upQzzNos)); + } } - // 点位数据更新 - point1.setUp_qzzno(point2.getQzz_no1()); - point1.setDown_qzzno(point2.getQzz_no2()); point1.setUpdate_optid(3L); point1.setUpdate_optname("ACS"); point1.setUpdate_time(DateUtil.now()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussTask.java index b7d1fef6d..4226e685a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussTask.java @@ -107,20 +107,39 @@ public class UpShaftTrussTask extends AbstractAcsTask { point2.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); point2.setUpdate_optname(SecurityUtils.getCurrentUsername()); point2.setUpdate_time(DateUtil.now()); + // 分切计划修改状态04->05 + List collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2()) + .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); + List plans = slittingproductionplanService.getByQzzNos(collect); + PdmBiSlittingproductionplan pp = plans.get(0); + if (pp.getContainer_name().contains("虚拟")) { + // 如果是虚拟卷，需要执行删除标记，并且清空数据 + // 将分切计划删除，设备禁用 + plans.forEach(p1 -> { + p1.setIs_delete("1"); + p1.setQzzno(""); + p1.setUpdate_time(DateUtil.now()); + p1.setUpdate_optname(SecurityUtils.getCurrentNickName()); + p1.setUpdate_optid(SecurityUtils.getCurrentUserId()); + }); + slittingproductionplanService.updateBatchById(plans); + // 设备禁用 + point2.setIs_used("0"); + point2.setUp_qzzno(""); + point2.setDown_qzzno(""); + } else { + PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan(); + p.setStatus("05"); + TaskUtils.updateOptMessageBySlitterPlan(p); + slittingproductionplanService.update(p, new LambdaQueryWrapper() + .in(PdmBiSlittingproductionplan::getQzzno, collect)); + } cutpointivtService.updateById(point2); point1.setQzz_no1(""); point1.setQzz_no2(""); point1.setPoint_status("1"); TaskUtils.updateOptMessageByBCutPoint(point1); bcutpointivtService.updateById(point1); - // 分切计划修改状态04->05 - List collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2()) - .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); - PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan(); - p.setStatus("05"); - TaskUtils.updateOptMessageBySlitterPlan(p); - slittingproductionplanService.update(p, new LambdaQueryWrapper() - .in(PdmBiSlittingproductionplan::getQzzno, collect)); } // 取消 if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index 2be75a772..b76358d32 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -1945,7 +1945,8 @@ public class SlitterServiceImpl implements SlitterService { plan.setContainer_name(containerName); plan.setProduct_name("220890200000001"); plan.setDescription("虚拟卷"); - plan.setParent_container_name(deviceCode); + plan.setParent_container_name("虚拟-" + deviceCode); + plan.setRestruct_container_name(""); plan.setWare_house("1"); plan.setResource_name(deviceCode); plan.setSplit_group("A"); @@ -2005,6 +2006,11 @@ public class SlitterServiceImpl implements SlitterService { } plan.setUp_or_down("1"); plan.setLeft_or_right("2"); + if (upRightSizeK.contains("3英寸") || upRightSizeK.contains("3.12英寸")) { + plan.setQzz_generation("4"); + } else { + plan.setQzz_generation("5"); + } } if (i==2 && ObjectUtil.isNotEmpty(downLeftSizeK)) { // 下左 @@ -2022,6 +2028,11 @@ public class SlitterServiceImpl implements SlitterService { } plan.setUp_or_down("2"); plan.setLeft_or_right("1"); + if (downLeftSizeK.contains("3英寸") || downLeftSizeK.contains("3.12英寸")) { + plan.setQzz_generation("4"); + } else { + plan.setQzz_generation("5"); + } } if (i==4 && ObjectUtil.isNotEmpty(downRightSizeK)) { // 下右 @@ -2039,6 +2050,11 @@ public class SlitterServiceImpl implements SlitterService { } plan.setUp_or_down("2"); plan.setLeft_or_right("2"); + if (downRightSizeK.contains("3英寸") || downRightSizeK.contains("3.12英寸")) { + plan.setQzz_generation("4"); + } else { + plan.setQzz_generation("5"); + } } if (i==0 && ObjectUtil.isEmpty(upLeftSizeK)) { plan.setIs_delete("1");