From 9b36259270078e99c7665a818fff90bbcde8ef7d Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 18 三月 2026 09:23:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/java/com/zy/common/web/WcsController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index c748620..55b590e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -291,6 +291,8 @@
WrkDetl wrkDetl = new WrkDetl();
BeanUtils.copyProperties(waitPakin, wrkDetl);
wrkDetl.setZpallet(barcode);
+ wrkDetl.setProddate(waitPakin.getProddate());
+ wrkDetl.setDeadline(waitPakin.getDeadline());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
@@ -332,6 +334,7 @@
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("O")) {
+ log.warn("Flag - 25,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "S");
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
@@ -398,6 +401,7 @@
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("O")) {
+ log.warn("Flag - 26,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "S");
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)) {
@@ -441,6 +445,7 @@
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("O")) {
+ log.warn("Flag - 27,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "S");
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)) {
@@ -480,12 +485,12 @@
log.error("{}浠诲姟銆恑oType = {}銆戝凡杩囨湡!!!", wrkNo, ioType);
throw new CoolException(CodeRes.NONE_MAST_800);
}
- List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
- if (locDetls.isEmpty()) {
- throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦�");
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (Cools.isEmpty(wrkDetls)) {
+ throw new CoolException(CodeRes.NONE_DETL_900);
}
// 妫�绱㈠簱浣�
- List<String> matnrList = locDetls.stream().map(LocDetl::getMatnr).distinct().collect(Collectors.toList());
+ List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
if (ioType == 103) {//鎷ｆ枡浠诲姟
if (devpNo == 325 || devpNo == 331 || devpNo == 333 || devpNo == 339) {
devpNo = 341;
@@ -496,6 +501,7 @@
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("O")) {
+ log.warn("Flag - 28,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "Q");
locMast.setLocSts("Q"); // Q.鎷ｆ枡鍐嶅叆搴�
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)) {
--
Gitblit v1.9.1