From 288e45a990a5abf4ab50f820ed4e870e8314468e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 21 六月 2025 15:14:10 +0800
Subject: [PATCH] 完善
---
src/main/java/com/zy/common/web/WcsController.java | 53 +++++++++++++++++++++++++----------------------------
1 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index cb82577..d1c0b90 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -68,9 +68,7 @@
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌�");
- }
+
Date now = new Date();
List<WaitPakin> waitPakins = null;
if (param.getIoType() == 1) {
@@ -78,22 +76,33 @@
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(waitPakins) || waitPakins.size() !=1) {
+ List<WaitPakin> beBatch = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("be_batch", 1));
+ if(beBatch.size() > 1){
+ return R.error("缁勬墭妗ｄ腑鏈夊鏉℃惉杩愪换鍔�");
+ }else if(Cools.isEmpty(beBatch)){
+ return R.error("缁勬墭妗ｄ腑娌℃湁鎼繍浠诲姟");
+ }
+ if (Cools.isEmpty(waitPakins)) {
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
- if (wrkMast != null || waitPakins.size() !=1) {
+ if (wrkMast != null) {
return R.parse("600-閲嶅缁勬墭");
}
- return R.parse(CodeRes.NO_COMB_700);
- }
- int countWait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode())
- .eq("io_status", "Y"));
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
- if (countLoc > 0 || countWrk > 0 || countWait > 0) {
- if (!Cools.isEmpty(waitPakins.get(0).getDeadWarn()) && waitPakins.get(0).getDeadWarn()!=0){
- return R.error(CodeRes.EXIST_500);
+ for (WaitPakin waitPakin : beBatch) {
+ waitPakin.setZpallet(param.getBarcode());
+ waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("be_batch",1));
+ }
+ }else {
+ int countWait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode())
+ .eq("io_status", "Y"));
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ if (countLoc > 0 || countWrk > 0 || countWait > 0) {
+ if (!Cools.isEmpty(waitPakins.get(0).getDeadWarn()) && waitPakins.get(0).getDeadWarn()!=0){
+ return R.error(CodeRes.EXIST_500);
+ }
}
}
+
}
if (Cools.isEmpty(param.getLocType1())){
param.setLocType1((short)1);
@@ -102,7 +111,6 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
sourceStaNo.setLocType1(param.getLocType1());
-// sourceStaNo.setLocType1((short)1);
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
@@ -175,7 +183,8 @@
}
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("barcode", wrkDetl.getMatnr()));//pack鐮�
+ .eq("barcode", wrkDetl.getMatnr())
+ .eq("user_id",wrkDetl.getZpallet()));//pack鐮�
if (Cools.isEmpty(testMast)){
//鐢熸垚娴嬭瘯妗�
testMast=new TestMast();
@@ -230,18 +239,6 @@
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)){
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
- }else{
- if (locMast.getRow1()<2){
- //1.鎵爜涓婃姤
- CombParam combParam = new CombParam();
- combParam.setPackNo(waitPakins.get(0).getMatnr());
- combParam.setBarcode(wrkMast.getBarcode());
- combParam.setLocNo(wrkMast.getLocNo());
- combParam.setPackSts(0);
- combParam.setStepSts(1);
- combParam.setRequestTime(DateUtils.convert(now));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
- }
}
} else {
throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
--
Gitblit v1.9.1