From 1da002910c1d9d44cd195bd24d951b4942a4e29c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:58:02 +0800
Subject: [PATCH] 优化定时任务间隔及字段命名，调整环境配置
---
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 256 +++++++++++++++++++++++++++------------------------
1 files changed, 135 insertions(+), 121 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 8653c4c..8f165ed 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -35,15 +35,15 @@
@Autowired
AgvBasDevpService agvBasDevpService;
- public ReturnT<String> start(AgvLocMast agvLocMast) {
- // locType 1. 鑷姩锛� 2. 鎵嬪姩
- if (agvLocMast.getLocType().equals("1")) {
- return doAutoMove(agvLocMast);
- } else if (agvLocMast.getLocType().equals("2")) {
- return doHandMove(agvLocMast);
- }
- return SUCCESS;
- }
+// public ReturnT<String> start(AgvLocMast agvLocMast) {
+// // locType 1. 鑷姩锛� 2. 鎵嬪姩
+// if (agvLocMast.getLocType().equals("1")) {
+// return doAutoMove(agvLocMast);
+// } else if (agvLocMast.getLocType().equals("2")) {
+// return doHandMove(agvLocMast);
+// }
+// return SUCCESS;
+// }
public ReturnT<String> start2(AgvWrkMast agvWrkMast) {
// locType 1. 鑷姩锛� 2. 鎵嬪姩
@@ -62,66 +62,66 @@
return SUCCESS;
}
//鏍规嵁搴撲綅鐨刲octype鍊煎彂閫佷换鍔�--寮冪敤
- private ReturnT<String> doAutoMove(AgvLocMast agvLocMast) {
- Date now = new Date();
- //鏌ヨ宸ヤ綔妗�
- AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
- if(!Cools.isEmpty(agvWrkMast)){
- throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
- }
- //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast LocMast = agvCommonService.getLocNo(3,agvLocMast.getLocType3(),false,true);
- //鐢熸垚宸ヤ綔妗�
- AgvWrkMast mast = new AgvWrkMast();
- //宸ヤ綔鐘舵��
- mast.setWrkSts(201L);
- //鍏ュ嚭搴撶被鍨�
- mast.setIoType(108);
- mast.setIoTime(now);
- //浼樺厛绾�
- mast.setIoPri(300.0);
- //婧愮珯鐐�
- mast.setSourceLocNo(agvLocMast.getLocNo());
- //鐩爣绔欑偣
- mast.setLocNo(LocMast.getLocNo());
- //璐ф灦缂栫爜
- mast.setBarcode(agvLocMast.getBarcode());
- //璐ф灦绫诲瀷
- mast.setWhsType(30);
-
- mast.setAppeUser(9527L);
- mast.setAppeTime(now);
- mast.setModiUser(9527L);
- mast.setModiTime(now);
- mast.setLogErrMemo("doAutoMove");
- if (!agvWrkMastService.insertByIncrease(mast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
-
- AgvWrkMast mast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", LocMast.getLocNo()).eq("source_loc_no",agvLocMast.getLocNo()));
- //鐢熸垚宸ヤ綔妗ｆ槑缁�
- List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
- agvLocDetls.forEach(agvLocDetl -> {
- AgvWrkDetl wrkDetl = new AgvWrkDetl();
- wrkDetl.setWrkNo(mast1.getWrkNo());
- wrkDetl.sync(agvLocDetl);
- wrkDetl.setSpecs("1-" + agvLocMast.getLocType3());
- wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
- wrkDetl.setIoTime(now);
- wrkDetl.setAppeUser(9527L);
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiUser(9527L);
- wrkDetl.setModiTime(now);
- if (!agvWrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- });
- //鏇存柊鐩爣搴撲綅鐘舵��
- updateAgvLocMast(agvLocMast,"R");
- updateAgvLocMast(LocMast,"S");
-
- return SUCCESS;
- }
+// private ReturnT<String> doAutoMove(AgvLocMast agvLocMast) {
+// Date now = new Date();
+// //鏌ヨ宸ヤ綔妗�
+// AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
+// if(!Cools.isEmpty(agvWrkMast)){
+// throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
+// }
+// //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+// AgvLocMast LocMast = agvCommonService.getLocNo(3,agvLocMast.getLocType3(),false,true);
+// //鐢熸垚宸ヤ綔妗�
+// AgvWrkMast mast = new AgvWrkMast();
+// //宸ヤ綔鐘舵��
+// mast.setWrkSts(201L);
+// //鍏ュ嚭搴撶被鍨�
+// mast.setIoType(108);
+// mast.setIoTime(now);
+// //浼樺厛绾�
+// mast.setIoPri(300.0);
+// //婧愮珯鐐�
+// mast.setSourceLocNo(agvLocMast.getLocNo());
+// //鐩爣绔欑偣
+// mast.setLocNo(LocMast.getLocNo());
+// //璐ф灦缂栫爜
+// mast.setBarcode(agvLocMast.getBarcode());
+// //璐ф灦绫诲瀷
+// mast.setWhsType(30);
+//
+// mast.setAppeUser(9527L);
+// mast.setAppeTime(now);
+// mast.setModiUser(9527L);
+// mast.setModiTime(now);
+// mast.setLogErrMemo("doAutoMove");
+// if (!agvWrkMastService.insertByIncrease(mast)) {
+// throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+// }
+//
+// AgvWrkMast mast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", LocMast.getLocNo()).eq("source_loc_no",agvLocMast.getLocNo()));
+// //鐢熸垚宸ヤ綔妗ｆ槑缁�
+// List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
+// agvLocDetls.forEach(agvLocDetl -> {
+// AgvWrkDetl wrkDetl = new AgvWrkDetl();
+// wrkDetl.setWrkNo(mast1.getWrkNo());
+// wrkDetl.sync(agvLocDetl);
+// wrkDetl.setSpecs("1-" + agvLocMast.getLocType3());
+// wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
+// wrkDetl.setIoTime(now);
+// wrkDetl.setAppeUser(9527L);
+// wrkDetl.setAppeTime(now);
+// wrkDetl.setModiUser(9527L);
+// wrkDetl.setModiTime(now);
+// if (!agvWrkDetlService.insert(wrkDetl)) {
+// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+// }
+// });
+// //鏇存柊鐩爣搴撲綅鐘舵��
+// updateAgvLocMast(agvLocMast,"R");
+// updateAgvLocMast(LocMast,"S");
+//
+// return SUCCESS;
+// }
private ReturnT<String> doHandMove(AgvLocMast agvLocMast) {
Date now = new Date();
@@ -189,13 +189,17 @@
private ReturnT<String> doAutoMove2(AgvWrkMast agvWrkMast) {
Date now = new Date();
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,true);
+ AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,true,null);
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());
@@ -213,9 +217,11 @@
private ReturnT<String> doAutoMove3(AgvWrkMast agvWrkMast) {
Date now = new Date();
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,false);
+ AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,false,null);
if (Cools.isEmpty(locMast)) {
- throw new CoolException("鏆傛棤搴撲綅");
+ log.info("鏆傛棤搴撲綅");
+ return FAIL;
+ //throw new CoolException("鏆傛棤搴撲綅");
}
agvWrkMast.setWrkSts(201L);
agvWrkMast.setLocNo(locMast.getLocNo());
@@ -239,7 +245,9 @@
}
if (Cools.isEmpty(devpNo)) {
- throw new CoolException("鏆傛棤绌洪棽鎺ラ┏浣�");
+ log.info("鏆傛棤绌洪棽鎺ラ┏浣�");
+ return FAIL;
+ //throw new CoolException("鏆傛棤绌洪棽鎺ラ┏浣�");
}
agvWrkMast.setWrkSts(201L);
agvWrkMast.setLocNo(devpNo.getDevNo());
@@ -320,7 +328,7 @@
Date now = new Date();
AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
//妫�绱㈢┖闂叉帴椹充綅锛岄�夋嫨鍚堥�傜殑鎺ラ┏浣�
- AgvLocMast locMast = agvCommonService.getLocNo(3, 1,true,true);
+ AgvLocMast locMast = agvCommonService.getLocNo(3, 1,true,true,null);
if (Cools.isEmpty(locMast)) {
throw new CoolException("1妤兼殏鏃犵┖搴撲綅");
}
@@ -339,47 +347,47 @@
return SUCCESS;
}
- public ReturnT<String> autoEmptyBack2(AgvLocMast agvLocMast) {
- Date now = new Date();
- //鏌ヨ宸ヤ綔妗�
- AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
- if(!Cools.isEmpty(agvWrkMast)){
- throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
- }
- //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast LocMast = agvCommonService.getLocNo(3,1,true,true);
- //鐢熸垚宸ヤ綔妗�
- AgvWrkMast mast = new AgvWrkMast();
- //宸ヤ綔鐘舵��
- mast.setWrkSts(201L);
- //鍏ュ嚭搴撶被鍨�
- mast.setIoType(109);
- mast.setIoTime(now);
- //浼樺厛绾�
- mast.setIoPri(300.0);
- //婧愮珯鐐�
- mast.setSourceLocNo(agvLocMast.getLocNo());
- //鐩爣绔欑偣
- mast.setLocNo(LocMast.getLocNo());
- //璐ф灦缂栫爜
- mast.setBarcode(agvLocMast.getBarcode());
- //璐ф灦绫诲瀷
- mast.setWhsType(30);
-
- mast.setAppeUser(9527L);
- mast.setAppeTime(now);
- mast.setModiUser(9527L);
- mast.setModiTime(now);
- mast.setLogErrMemo("autoEmptyBack2");
- if (!agvWrkMastService.insertByIncrease(mast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
-
- //鏇存柊鐩爣搴撲綅鐘舵��
- updateAgvLocMast(agvLocMast,"R");
- updateAgvLocMast(LocMast,"S");
- return SUCCESS;
- }
+// public ReturnT<String> autoEmptyBack2(AgvLocMast agvLocMast) {
+// Date now = new Date();
+// //鏌ヨ宸ヤ綔妗�
+// AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
+// if(!Cools.isEmpty(agvWrkMast)){
+// throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
+// }
+// //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+// AgvLocMast LocMast = agvCommonService.getLocNo(3,1,true,true);
+// //鐢熸垚宸ヤ綔妗�
+// AgvWrkMast mast = new AgvWrkMast();
+// //宸ヤ綔鐘舵��
+// mast.setWrkSts(201L);
+// //鍏ュ嚭搴撶被鍨�
+// mast.setIoType(109);
+// mast.setIoTime(now);
+// //浼樺厛绾�
+// mast.setIoPri(300.0);
+// //婧愮珯鐐�
+// mast.setSourceLocNo(agvLocMast.getLocNo());
+// //鐩爣绔欑偣
+// mast.setLocNo(LocMast.getLocNo());
+// //璐ф灦缂栫爜
+// mast.setBarcode(agvLocMast.getBarcode());
+// //璐ф灦绫诲瀷
+// mast.setWhsType(30);
+//
+// mast.setAppeUser(9527L);
+// mast.setAppeTime(now);
+// mast.setModiUser(9527L);
+// mast.setModiTime(now);
+// mast.setLogErrMemo("autoEmptyBack2");
+// if (!agvWrkMastService.insertByIncrease(mast)) {
+// throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+// }
+//
+// //鏇存柊鐩爣搴撲綅鐘舵��
+// updateAgvLocMast(agvLocMast,"R");
+// updateAgvLocMast(LocMast,"S");
+// return SUCCESS;
+// }
public ReturnT<String> autoEmptyBack4(AgvLocMast agvLocMast) {
Date now = new Date();
@@ -400,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");
@@ -410,7 +420,7 @@
ioType = 109;
} else {
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- locMast = agvCommonService.getLocNo(3,1,true,true);
+ locMast = agvCommonService.getLocNo(3,1,true,true,null);
locNo = locMast.getLocNo();
wrkSts = 201L;
ioType = 109;
@@ -485,7 +495,7 @@
//鍏ュ嚭搴撶被鍨�
mast.setIoType(109);
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast locMast = agvCommonService.getLocNo(3,1,true,true);
+ AgvLocMast locMast = agvCommonService.getLocNo(3,1,true,true,null);
mast.setLocNo(locMast.getLocNo());
updateAgvLocMast(locMast,"S");
} else {
@@ -559,10 +569,14 @@
throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
}
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast LocMast = agvCommonService.getLocNo(3,1,false,false);
+ AgvLocMast LocMast = agvCommonService.getLocNo(3,1,false,false,null);
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