From aa2d520a06c371e76ef26c78d426a01fca76a2fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 14:56:35 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index 6a10807..eb4747e 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -191,14 +191,20 @@
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,true);
if (Cools.isEmpty(locMast)) {
- throw new CoolException("鏆傛棤搴撲綅");
+ log.info("鏆傛棤搴撲綅");
+ return FAIL;
+ //throw new CoolException("鏆傛棤搴撲綅");
}
AgvWrkMast workingMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locMast.getLocNo()));
if (!Cools.isEmpty(workingMast)) {
- throw new CoolException("褰撳墠搴撲綅姝ｅ湪杩涜鍏ュ簱锛岃繘琛屼笅涓�娆¤疆璇�");
+ log.info("褰撳墠搴撲綅姝ｅ湪杩涜鍏ュ簱锛岃繘琛屼笅涓�娆¤疆璇�");
+ return FAIL;
+ //throw new CoolException("褰撳墠搴撲綅姝ｅ湪杩涜鍏ュ簱锛岃繘琛屼笅涓�娆¤疆璇�");
}
agvWrkMast.setWrkSts(201L);
+ agvWrkMast.setModiTime(new Date());
agvWrkMast.setLocNo(locMast.getLocNo());
+ agvWrkMast.setLogErrMemo("start2-doAutoMove2");
agvWrkMastService.updateById(agvWrkMast);
//鏇存柊鐩爣搴撲綅鐘舵��
updateAgvLocMast(locMast,"S");
@@ -213,11 +219,14 @@
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,false);
if (Cools.isEmpty(locMast)) {
- throw new CoolException("鏆傛棤搴撲綅");
+ log.info("鏆傛棤搴撲綅");
+ return FAIL;
+ //throw new CoolException("鏆傛棤搴撲綅");
}
agvWrkMast.setWrkSts(201L);
agvWrkMast.setLocNo(locMast.getLocNo());
agvWrkMast.setLogErrMemo("start2-doAutoMove2");
+ agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
//鏇存柊鐩爣搴撲綅鐘舵��
updateAgvLocMast(locMast,"S");
@@ -236,12 +245,16 @@
}
if (Cools.isEmpty(devpNo)) {
- throw new CoolException("鏆傛棤绌洪棽鎺ラ┏浣�");
+ log.info("鏆傛棤绌洪棽鎺ラ┏浣�");
+ return FAIL;
+ //throw new CoolException("鏆傛棤绌洪棽鎺ラ┏浣�");
}
agvWrkMast.setWrkSts(201L);
agvWrkMast.setLocNo(devpNo.getDevNo());
+ agvWrkMast.setModiTime(new Date());
agvWrkMast.setLogErrMemo("start3-doHandMove2");
agvWrkMastService.updateById(agvWrkMast);
+ agvWrkMast.setModiTime(new Date());
updateAgvBasDevp(devpNo,"S",null,agvWrkMast.getBarcode());
return SUCCESS;
}
@@ -310,6 +323,7 @@
updateAgvBasDevp(devpNo,"S",agvLocMast.getLocType2(),agvLocMast.getBarcode());
return SUCCESS;
}
+
public ReturnT<String> autoEmptyBack3(AgvWrkMast agvWrkMast) {
Date now = new Date();
AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
@@ -332,6 +346,7 @@
updateAgvBasDevp(agvBasDevp,"R");
return SUCCESS;
}
+
public ReturnT<String> autoEmptyBack2(AgvLocMast agvLocMast) {
Date now = new Date();
//鏌ヨ宸ヤ綔妗�
@@ -393,7 +408,9 @@
}
List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 109).like("source_loc_no", floor).or().eq("io_type", 113));
if (agvWrkMasts.size() >= 5) {
- throw new CoolException("鏆傚仠鍥炴祦");
+ //log.error("鏆傚仠鍥炴祦");
+ return FAIL;
+ //throw new CoolException("鏆傚仠鍥炴祦");
}
//妫�绱㈢┖闂插彲鍏ユ帴椹充綅 娌℃湁绌洪棽鍙叆鎺ラ┏浣� 鐩存帴鎵惧簱浣�
AgvBasDevp devpNo = agvCommonService.getDevpNo(3, agvLocMast.getFloor(),"Y","Y");
@@ -556,6 +573,10 @@
if (LocMast.getLev1() != 2) {
throw new CoolException("鐩爣妤煎眰涓嶆槸鍚稿浜屾ゼ");
}
+ List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1").eq("io_type", 12));
+ if (agvWrkMasts.size() >= maxTansk) {
+ throw new CoolException("鑷姩绉诲簱浠诲姟宸插埌璁惧畾鏈�澶у�硷細" + maxTansk);
+ }
//鐢熸垚宸ヤ綔妗�
AgvWrkMast mast = new AgvWrkMast();
//宸ヤ綔鐘舵��
--
Gitblit v1.9.1