diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index 8ebbc0840..c6c33e6ce 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -143,7 +143,7 @@ public class AutoCallAirShaftTask { param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>穿拔轴位")); param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); param.put("qzz_size", needPlan.getQzz_size()); - // 纸管规格 + // 所需的纸管规格 for (PdmBiSlittingproductionplan plan : needPlans) { if (SlitterConstant.SLITTER_SUB_VOLUME_LEFT.equals(plan.getLeft_or_right())) { if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) { @@ -159,6 +159,33 @@ public class AutoCallAirShaftTask { } } } + // 当前纸管的规格信息 + String oldQzzNo = ObjectUtil.isNotEmpty(startPoint.getQzz_no1()) + ? startPoint.getQzz_no1() : startPoint.getQzz_no2(); + if (oldQzzNo == null) { + throw new BadRequestException("当前气胀轴的编码为空!"); + } + // 最多两条 + List oldPlans = slittingproductionplanService.getByQzzNo(oldQzzNo); + for (PdmBiSlittingproductionplan plan : oldPlans) { + if (SlitterConstant.SLITTER_SUB_VOLUME_LEFT.equals(plan.getLeft_or_right())) { + if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) { + param.put("currentLeft", plan.getPaper_tube_model()); + } else { + param.put("currentLeft", plan.getFRP_model()); + } + } else { + if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) { + param.put("currentRight", plan.getPaper_tube_model()); + } else { + param.put("currentRight", plan.getFRP_model()); + } + } + } + // 套管数量 + param.put("casingCount", needPlans.size()); + // 拔管数量 + param.put("pullCount", oldPlans.size()); trussCallAirShaftTask.createTask(param); // 将分切计划is_paper_ok 1(纸管已经准备好) -> 2(已经套轴) needPlans.forEach(p -> {