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 e6453db57..6c6c13e9e 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 @@ -318,6 +318,8 @@ 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()); + // 所需的纸管规格 + SlitterTaskUtil.putNeedPaperSpec(param, needPlans); // 设置是否套轴:1:正常套轴,2:待定(到后面还会申请套轴) setIsSleeveShaft(param); // 最多两条 @@ -332,8 +334,6 @@ public class AutoCallAirShaftTask { bcutpointivtService.updateById(startPoint); return; } - // 所需的纸管规格 - SlitterTaskUtil.putNeedPaperSpec(param, needPlans); // 保存所需要的分切计划数据到点位上(套轴对接位)更新分切计划 saveCutPlanMessage(empty, needPlans, qzzSize); SlitterTaskUtil.putCurrentPaperSpec(param, oldPlans); @@ -361,6 +361,9 @@ public class AutoCallAirShaftTask { * @return */ public boolean havaEmptyShaft(SlitterPlanDistinctDto planD, BstIvtShafttubeivt empty) { + if (true) { + return true; + } String qzzSize = planD.getQzz_size(); String qzzGeneration = planD.getQzz_generation(); String location = empty.getPoint_location(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java index 09efb83d4..72cd2ff49 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java @@ -144,6 +144,7 @@ public class SlitterTaskUtil { * @param needPlans 所需的分切计划 */ public static void putNeedPaperSpec(JSONObject param, List needPlans) { + log.info("正在设置所需的套管纸管信息..."); // 纸制筒管|纸管|6英寸|1300 or 纸制筒管|纸管|3英寸|12|650 for (PdmBiSlittingproductionplan plan : needPlans) { if (SlitterConstant.SLITTER_SUB_VOLUME_LEFT.equals(plan.getLeft_or_right())) {