From ec7342d38bb1ca9f5b4e08f4901aa10a3b8d7265 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 07 十月 2023 11:55:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 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 5cd4bcd..7566df9 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -98,6 +98,9 @@
default:
break;
}
+ if (!Cools.isEmpty(dto) && param.getIoType()<11 && dto.getCrnNo().equals(0) && dto.getWorkNo().equals(9999) && dto.getStaNo().equals(1000)){
+ return R.parse(CodeRes.NONE_DETL_1000);
+ }
log.info("/pakin/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode());
return R.ok().add(dto);
}
@@ -112,7 +115,13 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto);
+ if ((dto.getSourceStaNo().equals(103) && dto.getCrnNo().equals(3)) || (dto.getSourceStaNo().equals(203) && dto.getCrnNo().equals(1))){
+ dto.setWorkNo(9999);
+ dto.setStaNo(1000);
+ dto.setCrnNo(0);
+ return dto;
+ }
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -138,12 +147,19 @@
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+
+ if(waitPakins.size()>0) {
+ WaitPakin one = waitPakins.get(0);
+ wrkMast.setFrozen(one.getFrozen());
+ wrkMast.setMemo(one.getMemo());
+ }
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
waitPakins.forEach(waitPakin -> {
+ waitPakin.setBatch("");
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
@@ -188,7 +204,13 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto);
+ if ((dto.getSourceStaNo().equals(103) && dto.getCrnNo().equals(3)) || (dto.getSourceStaNo().equals(203) && dto.getCrnNo().equals(1))){
+ dto.setWorkNo(9999);
+ dto.setStaNo(1000);
+ dto.setCrnNo(0);
+ return dto;
+ }
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -251,7 +273,7 @@
}
// 妫�绱㈠簱浣�
List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
- return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
+ return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
}
}
--
Gitblit v1.9.1