From 1d3fdb2bf289396fb5d20aa48783c02b55f2d95d Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 13 七月 2025 16:55:28 +0800
Subject: [PATCH] 增加空托出库条件(堆垛机自动+无报警码)

---
 src/main/java/com/zy/common/web/WcsController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 43c26de..0f37693 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -450,7 +450,7 @@
         WrkMast wrkMast = wrkMastService.selectById(wrkNo);
         if (wrkMast == null) {
             throw new CoolException("寮傚父鍙ｅ叆搴撲换鍔″彿鏃犱换鍔★細" + wrkNo);
-        } else if (wrkMast.getLocNo() != null) {
+        } else if (wrkMast.getLocNo() != null && wrkMast.getLocNo().length() == 7) {
             throw new CoolException("寮傚父鍙ｅ叆搴撳簱浣嶅凡鍒嗛厤锛�" + wrkMast.getLocNo());
         }
 
@@ -709,7 +709,7 @@
         }
 
         if (locMast == null) {
-            return R.error("搴撳瓨娌℃湁"+type+"绫诲瀷绌烘墭鐩�");
+            return R.error("搴撳瓨娌℃湁"+type+"绫诲瀷绌烘墭鐩樻垨鏃犲彲鐢ㄥ爢鍨涙満");
         }
 
         String locNo = locMast.getLocNo();

--
Gitblit v1.9.1