From b13b6baf03a0860d0aa7fe7536bf2313588bf8ae Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 02 三月 2025 16:54:53 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 2754add..2aae096 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -15,6 +15,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.service.AgvCommonService;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -115,6 +116,9 @@
@Autowired
private ReportDataService reportDataService;
+ @Autowired
+ private AgvCommonService agvCommonService;
+
@Transactional
public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {
@@ -153,7 +157,7 @@
if (pltType != null) {
agvWrkMast.setPltType(pltType);
}
- log.info("宸ヤ綔鍙�--{},浠撳簱缂栫爜锛歿}", agvWrkMast.getWrkNo(), agvWrkMast.getPltType());
+ //log.info("宸ヤ綔鍙�--{},浠撳簱缂栫爜锛歿}", agvWrkMast.getWrkNo(), agvWrkMast.getPltType());
}
agvWrkMast.setModiTime(new Date());
//淇敼宸ヤ綔妗ｇ姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
@@ -171,7 +175,7 @@
switch (agvWrkMast.getIoType()) {
case 1:
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue(), agvWrkMast.getCtnNo());
//鏇存柊鐩爣搴撲綅鏄庣粏
log.info("鏇存柊鐩爣搴撲綅鏄庣粏 agvWrkMast.getLocNo(): " + agvWrkMast.getLocNo() + ", wrkNo: " + wrkNo);
agvLocDetlService.addLocDetlInfo(agvWrkMast.getLocNo(), wrkNo);
@@ -191,7 +195,7 @@
//鏇存柊搴撳瓨鏄庣粏
agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
//淇敼婧愬簱浣嶇姸鎬佷负O
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null);
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null, "");
break;
case 53:
//淇敼宸ヤ綔鍏氭槑缁�
@@ -254,7 +258,7 @@
});
// 鏇存柊绔欑偣 + 搴撲綅鐘舵�� 婧愬簱浣嶆槸绔欑偣
agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue(), agvWrkMast.getCtnNo());
break;
case 58:
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
@@ -421,10 +425,27 @@
wrkMast.setIoTime(now);
//浼樺厛绾�
wrkMast.setIoPri(300.0);
+
//婧愮珯鐐�
wrkMast.setSourceLocNo(agvWrkMast.getLocNo());
+
//鐩爣绔欑偣
- wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+ if (agvWrkMast.getLocNo().startsWith("QO") && agvWrkMast.getLocNo().endsWith("F4") && Integer.valueOf(agvWrkMast.getBarcode().substring(0, 2)) == 30) {
+ if (!agvWrkMast.getSourceLocNo().endsWith("02F1")) {
+ AgvLocMast locByFloor = agvCommonService.getLocByFloor(3, 1);
+ if (locByFloor != null) {
+ wrkMast.setLocNo(locByFloor.getLocNo());
+ } else {
+ wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+ }
+ } else {
+ wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+ }
+ } else {
+ wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+ }
+
+
//璐ф灦缂栫爜
wrkMast.setBarcode(agvWrkMast.getBarcode());
//璐ф灦绫诲瀷
@@ -573,7 +594,7 @@
return SUCCESS;
} catch (Exception e) {
//TODO
- log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y,{}", e.getMessage());
+ //log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y,{}", e.getMessage());
}
return FAIL;
}
--
Gitblit v1.9.1