From f52627e8432451f13bad65a5a6a0c165e16b0193 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 01 四月 2025 10:06:20 +0800
Subject: [PATCH] 电视机新增图号显示
---
src/main/java/com/zy/common/web/WcsController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 6f16d15..c74b117 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -87,6 +87,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 +109,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 +119,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 +134,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 +166,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();
@@ -187,7 +198,7 @@
int type=Cools.isEmpty(waitPakins.get(0).getBeBatch())?1:waitPakins.get(0).getBeBatch();
// 妫�绱㈠簱浣�
locMast1 =commonService.getLocNo2(waitPakins.get(0),arr,0,type,1);
-
+ int mbz=devpNo*10+Integer.valueOf(locMast1.getLocNo().substring(6));
//姝ｅ父鍏ュ簱
workNo = commonService.getWorkNo(0);
Date now = new Date();
@@ -199,6 +210,7 @@
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setSourceStaNo(devpNo);
+ wrkMast.setStaNo(mbz);
wrkMast.setLocNo(locMast1.getLocNo());
wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
@@ -212,6 +224,8 @@
wrkMast.setModiTime(now);
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
+ basDevp.setArea("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ basDevpService.updateById(basDevp);
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
@@ -223,6 +237,8 @@
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
if (!wrkDetlService.insert(wrkDetl)) {
+ basDevp.setArea("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ basDevpService.updateById(basDevp);
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
});
@@ -234,6 +250,8 @@
setParam.setIoStatus("Y");
setParam.setModiTime(now);
if (!waitPakinService.update(setParam, wrapper)) {
+ basDevp.setArea("鏇存柊閫氱煡妗ｅけ璐�");
+ basDevpService.updateById(basDevp);
throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
}
}
@@ -243,9 +261,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