From b450c1a8ac90c04f64c150db6ef687e706e6eb66 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 01 四月 2025 09:43:41 +0800
Subject: [PATCH] 更新电视机异常退回显示
---
src/main/java/com/zy/asrs/entity/BasDevp.java | 9 +++++++--
src/main/java/com/zy/common/web/WcsController.java | 21 +++++++++++++++++++++
src/main/java/com/zy/asrs/controller/TVController.java | 16 +++++++++++++++-
3 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index da568cd..246de60 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -291,7 +291,21 @@
*/
@GetMapping("/led/error")
public R monitorLedError(@RequestParam("ledId") Integer ledId) {
- return R.ok();
+ BasDevp basDevp =basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",ledId));
+ if(Cools.isEmpty(basDevp)){
+ return R.ok();
+ }
+ if(Cools.isEmpty(basDevp.getArea())){
+ return R.ok();
+ }
+ if(basDevp.getLoading().equals("N")){
+ basDevp.setArea("");
+ basDevpService.updateById(basDevp);
+ return R.ok();
+ }
+ String errorMsg = basDevp.getArea();
+
+ return R.ok().add(errorMsg);
}
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 78ca14c..3466c5d 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -80,6 +80,12 @@
*/
@ApiModelProperty(value= "鑳藉嚭")
private String canouting;
+ /**
+ *绔欑偣閿欒
+ */
+ @ApiModelProperty(value= "绔欑偣閿欒")
+ private String area;
+
@ApiModelProperty(value= "")
private String fronting;
@@ -140,8 +146,7 @@
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
- private String area;
+
@ApiModelProperty(value= "")
@TableField("in_ok")
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 7ca162d..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();
@@ -213,6 +224,8 @@
wrkMast.setModiTime(now);
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
+ basDevp.setArea("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ basDevpService.updateById(basDevp);
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
@@ -224,6 +237,8 @@
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
if (!wrkDetlService.insert(wrkDetl)) {
+ basDevp.setArea("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ basDevpService.updateById(basDevp);
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
});
@@ -235,6 +250,8 @@
setParam.setIoStatus("Y");
setParam.setModiTime(now);
if (!waitPakinService.update(setParam, wrapper)) {
+ basDevp.setArea("鏇存柊閫氱煡妗ｅけ璐�");
+ basDevpService.updateById(basDevp);
throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
}
}
@@ -244,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