From 9c75abec22f0d4695f676fcb0e00dc832701c80c Mon Sep 17 00:00:00 2001 From: Administrator <pjb> Date: 星期五, 11 七月 2025 10:04:00 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/OpenController.java | 6 +++--- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 20 ++++++++++---------- src/main/java/com/zy/core/thread/SiemensDevpThread.java | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 9959018..961d675 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -96,9 +96,9 @@ .eq("loc_sts", "F") .eq("loc_no", locNo) .eq("barcode", param.getBarcode())); -// if (Cools.isEmpty(locMast)) { -// return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢" + param.getTargetPoint()); -// } + if (Cools.isEmpty(locMast)) { + return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢" + param.getTargetPoint()); + } if (!locNoList.contains(locMast.getLocNo())) { locNoList.add(locMast.getLocNo()); paramList.add(param); diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index f377bb2..f1ddf5f 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -360,16 +360,16 @@ continue; } -// LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint()); -// if (!locMast.getLocSts().equals("O")) { -// if (taskWrk.getWrkSts() == 2) { -// log.error("鍏ュ簱WMS鍒嗛厤搴撲綅{}鏈夎锛屽簱浣嶇姸鎬佷负{}", locMast.getLocNo(), locMast.getLocSts()); -// taskWrk.setWrkSts(5); -// taskWrk.setMemo("WMS鍒嗛厤搴撲綅鏈夎"); -// taskWrkService.updateById(taskWrk); -// } -// continue; -// } + LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint()); + if (!locMast.getLocSts().equals("O")) { + if (taskWrk.getWrkSts() == 2) { + log.error("鍏ュ簱WMS鍒嗛厤搴撲綅{}鏈夎锛屽簱浣嶇姸鎬佷负{}", locMast.getLocNo(), locMast.getLocSts()); + taskWrk.setWrkSts(5); + taskWrk.setMemo("WMS鍒嗛厤搴撲綅鏈夎"); + taskWrkService.updateById(taskWrk); + } + continue; + } // 鍫嗗灈鏈烘帶鍒惰繃婊� if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) { diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index ff764dd..2c70193 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -778,19 +778,19 @@ if (slave.getId() == 1 && this.ioModeOf2F1 != null) { if (!siemensS7Net.Write("DB105.10", this.ioModeOf2F1.id).IsSuccess) { - OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId())); + OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId())); log.error("鍐欏叆杈撻�佺嚎2F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId()); } } if (slave.getId() == 1 && this.ioModeOf2F2 != null) { if (!siemensS7Net.Write("DB105.12", this.ioModeOf2F2.id).IsSuccess) { - OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎3F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId())); + OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId())); log.error("鍐欏叆杈撻�佺嚎2F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId()); } } if (slave.getId() == 1 && this.ioModeOf2F3 != null) { if (!siemensS7Net.Write("DB105.14", this.ioModeOf2F3.id).IsSuccess) { - OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎3F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId())); + OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F3鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId())); log.error("鍐欏叆杈撻�佺嚎2F3鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId()); } } -- Gitblit v1.9.1