From 98ff94c52485dd502e10c061ae267bf24e5d1814 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 17 十一月 2023 08:26:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 5524d58..b50cb8c 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -301,7 +301,7 @@
throw new CoolException(CodeRes.NONE_DETL_900);
}
// 妫�绱㈠簱浣�
- List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMaktx).distinct().collect(Collectors.toList());
+ List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
}
@@ -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宸ヤ綔妗ｄ换鍔�
- 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