From e3ac6e0be187f4eb63cf9707c7a5bead854305f1 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 14 十二月 2023 09:58:58 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/java/com/zy/common/web/WcsController.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 444b81e..2760459 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -431,12 +431,12 @@
log.error("{}浠诲姟銆恑oType = {}銆戝凡杩囨湡!!!", wrkNo, ioType);
throw new CoolException(CodeRes.NONE_MAST_800);
}
- List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (Cools.isEmpty(wrkDetls)) {
- throw new CoolException(CodeRes.NONE_DETL_900);
+ List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
+ if (locDetls.isEmpty()) {
+ throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦�");
}
// 妫�绱㈠簱浣�
- List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
+ List<String> matnrList = locDetls.stream().map(LocDetl::getMatnr).distinct().collect(Collectors.toList());
if (ioType == 103) {//鎷ｆ枡浠诲姟
if (devpNo == 325 || devpNo == 331 || devpNo == 333 || devpNo == 339) {
devpNo = 341;
@@ -456,10 +456,6 @@
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
- List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
- if (locDetls.isEmpty()) {
- throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦�");
- }
Date now = new Date();
for (LocDetl locDetl : locDetls) {
locDetl.setLocNo(dto.getLocNo());//淇敼鐩爣搴撲綅
--
Gitblit v1.9.1