From 1621b79516ac72b9933dd2ea950fe4e267d8a3a7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 05 十二月 2023 20:03:41 +0800
Subject: [PATCH] bug修复 1.四项库入库时找到在库库位 2.四项库订单出库时没有匹配容器码导致报错 3.四项库转历史档失败

---
 src/main/java/com/zy/common/web/WcsController.java |    7 +++++--
 1 files changed, 5 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 654b772..b50cb8c 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -349,9 +349,12 @@
         if(Cools.isEmpty(agvBasDevp) || !"O".equals(agvBasDevp.getLocSts())){
             throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦ㄦ垨鑰呯珯鐐逛笉涓虹┖");
         }
+        if(Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
+            throw new CoolException("璇ユ枡绠变綅缁勬墭");
+        }
+
         //鍘绘壘agv宸ヤ綔妗d换鍔�
-        if(!Cools.isEmpty(agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
-                .eq("barcode",containerCode)))){
+        if(!Cools.isEmpty(agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode)))){
             throw new CoolException("璇ユ枡绠辨鍦ㄥ叆搴撲腑");
         }
         //缁戝畾绔欑偣

--
Gitblit v1.9.1