From 6fd6fd0b4e90a816989632506934bdfdb431f47f Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 30 七月 2025 22:38:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/java/com/zy/common/web/WcsController.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 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 f6e5cce..55b590e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -177,10 +177,23 @@
return R.parse(CodeRes.NO_COMB_700);
}
+ boolean checkTimeout = false;
for (WaitPakin waitPakin : waitPakins) {
Mat mat = matService.selectByMatnr(waitPakin.getMatnr());
mat.setWeight(waitPakin.getAnfme());
mats.add(mat);
+
+ Date appeTime = waitPakin.getAppeTime();
+ Date now = new Date();
+ long diffTime = now.getTime() - appeTime.getTime();
+ if (diffTime >= 1000 * 60 * 60 * 4) {
+ checkTimeout = true;
+ break;
+ }
+ }
+
+ if (checkTimeout) {
+ return R.error("鎵樼洏缁勬墭瓒呮椂锛屽垹闄ゅ悗閲嶆柊缁勬墭");
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
@@ -278,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);
@@ -319,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)) {
@@ -385,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)) {
@@ -428,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)) {
@@ -467,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;
@@ -483,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)) {
@@ -726,6 +745,17 @@
}
}
};
+ if (agvWrkMast.getIoType() == 103){
+ List<AgvLocDetl> suppCodes = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", agvWrkMast.getBarcode()));
+ if (!Cools.isEmpty(suppCodes)){
+ for (AgvLocDetl agvLocDetl : suppCodes){
+ AgvWrkDetl agvWrkDetl = new AgvWrkDetl(agvLocDetl.getSuppCode(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getSpecs(), agvLocDetl.getAnfme());
+ agvWrkDetlList.add(agvWrkDetl);
+ }
+
+ }
+ }
+
agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
agvBasDevpDto.setAgvWrkMast(agvWrkMast);
--
Gitblit v1.9.1