From e86267955cdfb66abd8e807f0a9cd76d61680a84 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 10 十二月 2025 14:13:58 +0800
Subject: [PATCH] 库存明细统计导出
---
src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
index f1b9202..c2f21f6 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
@@ -24,6 +24,8 @@
@Autowired
private BasAgvMastService basAgvMastService;
@Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
private BasAgvLocDetlService basAgvLocDetlService;
@Autowired
private BasAgvWrkDetlService basAgvWrkDetlService;
@@ -35,13 +37,17 @@
private OpenService openService;
- public ReturnT<String> start(BasAgvMast basAgvMast) {
+ public ReturnT<String> start(BasAgvMast basAgvMast) {
try {
Date now = new Date();
switch (basAgvMast.getIoType()){
case 0:
LocMast sourceLoc0 = locMastService.selectById(basAgvMast.getSourceLocNo());
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", sourceLoc0.getLocNo()));
+ if(basAgvMast.getFloorNo() == 4){
+ basAgvMast.setBarcode(sourceLoc0.getBarcode());
+ basAgvMastService.updateById(basAgvMast);
+ }
sourceLoc0.setLocSts("O");
sourceLoc0.setBarcode("");
sourceLoc0.setModiTime(now);
@@ -51,7 +57,6 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [TaskNo=" + basAgvMast.getTaskNo() + "],[locNo=" + basAgvMast.getSourceLocNo() + "]");
}
-
basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getSourceLocNo()));
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvMast.setStatus(3);
@@ -67,6 +72,7 @@
}
// 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
locMast1.setLocSts("F");
+ locMast1.setBarcode(sourceLoc1.getBarcode());
locMast1.setIoTime(now);
locMast1.setModiTime(now);
if (!locMastService.updateById(locMast1)) {
@@ -74,21 +80,12 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [TaskNo=" + basAgvMast.getTaskNo() + "],[locNo=" + basAgvMast.getLocNo() + "]");
}
-
-
try{
// 杞Щ搴撳瓨鏄庣粏鏁版嵁: 搴撳瓨鍙� 鐢卞伐浣滄。婧愬簱浣嶅彉涓虹洰鏍囧簱浣�
locDetlService.updateLocNo(basAgvMast.getLocNo(), basAgvMast.getSourceLocNo());
-// if (!) {
-// exceptionHandle("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触锛沎婧愬簱浣�={0}],[鐩爣搴撲綅={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-// return FAIL.setMsg("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
-// }
} catch (Exception e) {
-
+ return FAIL.setMsg(e.getMessage());
}
-
-
if (null != sourceLoc1) {
sourceLoc1.setBarcode("");
sourceLoc1.setLocSts("O");
@@ -104,9 +101,9 @@
basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getSourceLocNo()));
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
- basAgvMast.setStatus(3);
+ basAgvMast.setStatus(4);
basAgvMastService.updateById(basAgvMast);
- openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
+// openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
break;
case 2:
List<LocDetl> locDetls2 = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", basAgvMast.getLocNo()));
@@ -189,7 +186,7 @@
basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvMast.setStatus(3);
- if(basAgvMast.getIoType() == 2 && basAgvMast.getFloorNo() == 2){
+ if(basAgvMast.getFloorNo() == 2 || basAgvMast.getFloorNo() == 3){
basAgvMast.setStatus(4);
}
basAgvMastService.updateById(basAgvMast);
--
Gitblit v1.9.1