From b7e7a906e649b31b63db677c69301c2c163d21d0 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 15 Mar 2025 01:13:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=E6=9C=AA=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=AF=BC=E8=87=B4=E5=87=BA=E8=BD=B4=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/slitter/auto/AutoCallAirShaftTask.java | 11 ++++++++++- .../sch/tasks/slitter/util/SlitterTaskUtil.java | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) 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 4a2f1d37a..f1955c497 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 @@ -387,13 +387,22 @@ public class AutoCallAirShaftTask { } BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0); JSONArray acsParam = new JSONArray(); + // 出轴的信号 JSONObject acsQzz = new JSONObject(); + // 出轴相对站点的信号 + JSONObject acsQzz2 = new JSONObject(); acsQzz.put("device_code", shafttubeivt.getPoint_code()); acsQzz.put("code", "to_command"); acsQzz.put("value", "1"); acsQzz.put("product_area", SlitterConstant.SLITTER_TASK_AREA); acsParam.add(acsQzz); - log.info("开始给ACS写信号出气胀轴 - {}", acsQzz); + // 对应的相反位置需要设置0,防止出现故障后穿拔轴没有初始化导致的问题 + acsQzz2.put("device_code", SlitterTaskUtil.getQzzkMappedValue(shafttubeivt.getPoint_code())); + acsQzz2.put("code", "to_command"); + acsQzz2.put("value", "0"); + acsQzz2.put("product_area", SlitterConstant.SLITTER_TASK_AREA); + acsParam.add(acsQzz2); + log.info("开始给ACS写信号出气胀轴 - {} , {}", acsQzz, acsQzz2); JSONObject action = wmsToAcsService.action(acsParam); log.info("下发给ACS写信号出气涨轴返回参数:{}", action); } 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 7a97b32e4..5bef2b8d7 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 @@ -433,4 +433,19 @@ public class SlitterTaskUtil { // 4. 拼接结果字符串 return String.join(",", weights); } + + /** + * 固定输入与输出气胀轴库点位 + * @param input + * @return + */ + public static String getQzzkMappedValue(String input) { + switch (input) { + case "B_QZZK01": return "B_QZZK02"; + case "B_QZZK02": return "B_QZZK01"; + case "B_QZZK03": return "B_QZZK04"; + case "B_QZZK04": return "B_QZZK03"; + default: throw new BadRequestException("站点输入错误: " + input); + } + } }