From 2feaabd1cc7a9741396410a956ab989e3c8c77fc Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Sat, 19 Apr 2025 17:41:58 +0800 Subject: [PATCH 1/2] opt --- .../iostorInv/impl/StIvtIostorinvOutServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index 75da9d49b..ec0317c8e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -1670,9 +1670,9 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl Date: Sat, 19 Apr 2025 19:27:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=91=BC=E5=8F=ABAGV=E5=89=8D?= =?UTF-8?q?=E7=A7=BB=E3=80=81redis=E7=9A=84key=E5=A2=9E=E5=8A=A0=E5=89=8D?= =?UTF-8?q?=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/auto/AutoCallAirShaftTask.java | 11 ++++++----- .../tasks/slitter/controller/SlitterController.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) 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 ae83d4072..9ee840cee 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 @@ -120,7 +120,7 @@ public class AutoCallAirShaftTask { for (BstIvtShafttubeivt empty : emptyPoints) { stepStr = ""; doCallShaft(empty, isOnlyPulling, tzDay, paramObj); - redisUtils.set(empty.getPoint_code(), stepStr); + redisUtils.set("INFO" + empty.getPoint_code(), stepStr); } } @@ -323,6 +323,10 @@ public class AutoCallAirShaftTask { param.put("qzz_size", needPlan.getQzz_size()); // 所需的纸管规格 SlitterTaskUtil.putNeedPaperSpec(param, needPlans); + if (!toCallAgvMovePaperTube(needPlans, location, empty)) { + log.error("呼叫AGV失败-穿拔轴{}不进行套轴，跳过！", empty.getPoint_code()); + return; + } // 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划 saveCutPlanMessage(empty, needPlans, qzzSize); // 设置是否套轴：1：正常套轴，2：待定（到后面还会申请套轴） @@ -340,10 +344,7 @@ public class AutoCallAirShaftTask { // 拔管数量 param.put("pullCount", oldPlans.size()); param.put("containers", oldPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList())); - if (!toCallAgvMovePaperTube(needPlans, location, empty)) { - log.error("呼叫AGV失败-穿拔轴{}不进行套轴，跳过！", empty.getPoint_code()); - return; - } + stepStr += ",36"; trussCallAirShaftTask.createTask(param); stepStr += ",37"; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java index 635b7f2b1..063b53431 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java @@ -45,6 +45,6 @@ public class SlitterController { @Log("套轴BCP透明链路") @SaIgnore public ResponseEntity tzInfo(@RequestBody JSONObject entity){ - return new ResponseEntity<>(redisUtils.get(entity.getString("device_code")), HttpStatus.CREATED); + return new ResponseEntity<>(redisUtils.get("INFO" + entity.getString("device_code")), HttpStatus.CREATED); } }