From 2d90ffa46399dce01b9a70e03fba282ef794cb92 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 09 七月 2025 11:11:53 +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 ++++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 961d675..9959018 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 230fdc4..4f9e135 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -359,16 +359,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) {
--
Gitblit v1.9.1