From e15139e4ec5daffb4e4d4a8e48fb1237baeb5fad Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 01 四月 2025 14:02:03 +0800
Subject: [PATCH] 新增电视机显示小车异常异常信息提示
---
src/main/java/com/zy/common/web/WcsController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 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 7ca162d..d293842 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -58,15 +58,19 @@
WrkMast wrkMast =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("wrk_no",param.getTaskNo())
.in("io_type",103,107));
- if (Cools.isEmpty(wrkMast)){
+ WrkMast wrkMast537 =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("wrk_no",param.getTaskNo())
+ .in("io_type",53,57));
+ if (Cools.isEmpty(wrkMast)&&Cools.isEmpty(wrkMast537)){
storageResult.setReturnStatus(1);
storageResult.setErrorMessage("娌℃湁鎵惧埌鐩樼偣鎷ｆ枡浠诲姟---------"+param.getTaskNo());
return storageResult;
}
+
SearchLocParam searchLocParam = new SearchLocParam();
- searchLocParam.setBoxNo(wrkMast.getBarcode());
+ searchLocParam.setBoxNo(Cools.isEmpty(wrkMast)?wrkMast537.getBarcode() : wrkMast.getBarcode());
searchLocParam.setWcsIoType(1);//婊℃澘
- searchLocParam.setWcsSourceStaNo(wrkMast.getStaNo());
+ searchLocParam.setWcsSourceStaNo(Cools.isEmpty(wrkMast)?wrkMast537.getSourceStaNo() : wrkMast.getStaNo());
searchLocParam.setWcsStatus(0);
return getLocNo(searchLocParam);
}
@@ -87,6 +91,7 @@
storageResult.setErrorMessage("婧愮珯缂栧彿涓嶈兘涓虹┖");
return storageResult;
}
+ BasDevp basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",param.getWcsSourceStaNo()));
int ioType = 0;
List<WaitPakin> waitPakins = null;
if (param.getWcsIoType() == 1) {
@@ -108,6 +113,8 @@
if (Cools.isEmpty(param.getBoxNo())) {
storageResult.setReturnStatus(1);
storageResult.setErrorMessage("鏉＄爜涓嶈兘涓虹┖");
+ basDevp.setArea("鏉＄爜涓嶈兘涓虹┖");
+ basDevpService.updateById(basDevp);
return storageResult;
}
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBoxNo()));
@@ -116,10 +123,14 @@
if (wrkMast != null && wrkMast.getIoType() == 103) {
storageResult.setReturnStatus(1);
storageResult.setErrorMessage(CodeRes.PICK_600);
+ basDevp.setArea(CodeRes.PICK_600);
+ basDevpService.updateById(basDevp);
return storageResult;
}
storageResult.setReturnStatus(1);
storageResult.setErrorMessage(CodeRes.NO_COMB_700);
+ basDevp.setArea(CodeRes.NO_COMB_700);
+ basDevpService.updateById(basDevp);
return storageResult;
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBoxNo()));
@@ -127,6 +138,8 @@
if (countLoc > 0 || countWrk > 0) {
storageResult.setReturnStatus(1);
storageResult.setErrorMessage(CodeRes.EXIST_500);
+ basDevp.setArea(CodeRes.NO_COMB_700);
+ basDevpService.updateById(basDevp);
return storageResult;
}
}else {
@@ -157,6 +170,8 @@
*/
@Transactional
public StorageResult startupFullPutStore(Integer devpNo, String barcode, List<WaitPakin> waitPakins,Integer ioType) {
+ BasDevp basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",devpNo));
+
StorageResult storageResult=new StorageResult();
Integer[] arr=arr();
LocMast locMast1=new LocMast();
@@ -213,6 +228,8 @@
wrkMast.setModiTime(now);
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
+ basDevp.setArea("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ basDevpService.updateById(basDevp);
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
@@ -224,6 +241,8 @@
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
if (!wrkDetlService.insert(wrkDetl)) {
+ basDevp.setArea("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ basDevpService.updateById(basDevp);
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
});
@@ -235,6 +254,8 @@
setParam.setIoStatus("Y");
setParam.setModiTime(now);
if (!waitPakinService.update(setParam, wrapper)) {
+ basDevp.setArea("鏇存柊閫氱煡妗ｅけ璐�");
+ basDevpService.updateById(basDevp);
throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
}
}
@@ -244,9 +265,13 @@
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)){
+ basDevp.setArea("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ basDevpService.updateById(basDevp);
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
+ basDevp.setArea(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ basDevpService.updateById(basDevp);
throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
}
--
Gitblit v1.9.1