From 2d6cdc6d4a4feac22724b516ffbaec629896255c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 19 九月 2024 20:30:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 88 insertions(+), 1 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 e5b8b03..4488530 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -93,6 +93,7 @@
mast.setAppeTime(now);
mast.setModiUser(9527L);
mast.setModiTime(now);
+ mast.setLogErrMemo("doAutoMove");
if (!agvWrkMastService.insertByIncrease(mast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
@@ -192,12 +193,18 @@
if (Cools.isEmpty(locMast)) {
throw new CoolException("鏆傛棤搴撲綅");
}
+ AgvWrkMast workingMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locMast.getLocNo()));
+ if (!Cools.isEmpty(workingMast)) {
+ throw new CoolException("褰撳墠搴撲綅姝ｅ湪杩涜鍏ュ簱锛岃繘琛屼笅涓�娆¤疆璇�");
+ }
agvWrkMast.setWrkSts(201L);
+ agvWrkMast.setModiTime(new Date());
agvWrkMast.setLocNo(locMast.getLocNo());
agvWrkMastService.updateById(agvWrkMast);
//鏇存柊鐩爣搴撲綅鐘舵��
updateAgvLocMast(locMast,"S");
- log.info("鑷姩鍥炴祦浠诲姟 ==> 婧愬簱浣嶏細{}锛岀洰鏍囧簱浣嶏細{}",agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
+ AgvLocMast locMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locMast.getLocNo()));
+ log.info("鑷姩璋冩嫧浠诲姟 ==> 婧愬簱浣嶏細{}锛岀洰鏍囧簱浣嶏細{},搴撲綅鐘舵�亄}",agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo(),locMast1.getLocSts());
return SUCCESS;
}
@@ -211,6 +218,8 @@
}
agvWrkMast.setWrkSts(201L);
agvWrkMast.setLocNo(locMast.getLocNo());
+ agvWrkMast.setLogErrMemo("start2-doAutoMove2");
+ agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
//鏇存柊鐩爣搴撲綅鐘舵��
updateAgvLocMast(locMast,"S");
@@ -233,7 +242,10 @@
}
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;
}
@@ -292,6 +304,7 @@
mast.setAppeTime(now);
mast.setModiUser(9527L);
mast.setModiTime(now);
+ mast.setLogErrMemo("autoEmptyBack");
if (!agvWrkMastService.insertByIncrease(mast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
@@ -314,6 +327,7 @@
agvWrkMast.setLocNo(locMast.getLocNo());
agvWrkMast.setModiUser(9527L);
agvWrkMast.setModiTime(now);
+ agvWrkMast.setLogErrMemo("autoEmptyBack3");
if (!agvWrkMastService.updateById(agvWrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
@@ -353,6 +367,7 @@
mast.setAppeTime(now);
mast.setModiUser(9527L);
mast.setModiTime(now);
+ mast.setLogErrMemo("autoEmptyBack2");
if (!agvWrkMastService.insertByIncrease(mast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
@@ -420,6 +435,7 @@
mast.setAppeTime(now);
mast.setModiUser(9527L);
mast.setModiTime(now);
+ mast.setLogErrMemo("autoEmptyBack4");
if (!agvWrkMastService.insertByIncrease(mast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
@@ -458,6 +474,7 @@
mast.setAppeTime(now);
mast.setModiUser(9527L);
mast.setModiTime(now);
+ mast.setLogErrMemo("autoEmptyBack5");
// 鍒ゆ柇 鎺ラ┏鐐规槸鍚﹁嚜鍔�
if ("Y".equals(agvBasDevp.getAutoing())) {
//宸ヤ綔鐘舵��
@@ -514,6 +531,7 @@
mast.setAppeTime(now);
mast.setModiUser(9527L);
mast.setModiTime(now);
+ mast.setLogErrMemo("autoEmptyBack6");
if (!agvWrkMastService.insertByIncrease(mast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
@@ -523,4 +541,73 @@
return SUCCESS;
}
+
+ public ReturnT<String> autoTransfers(AgvLocMast agvLocMast,Integer maxTansk) {
+ Date now = new Date();
+ List<AgvLocDetl> locDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
+ locDetls.forEach(agvLocDetl -> {
+ if (agvLocDetl.getProcessSts().equals(1)) {
+ throw new CoolException("褰撳墠搴撲綅鏈夊簱瀛樻湭鍔犲伐");
+ }
+ });
+ //鏌ヨ宸ヤ綔妗�
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
+ if(!Cools.isEmpty(agvWrkMast)){
+ throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
+ }
+ //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+ AgvLocMast LocMast = agvCommonService.getLocNo(3,1,false,false);
+ if (LocMast.getLev1() != 2) {
+ throw new CoolException("鐩爣妤煎眰涓嶆槸鍚稿浜屾ゼ");
+ }
+ //鐢熸垚宸ヤ綔妗�
+ AgvWrkMast mast = new AgvWrkMast();
+ //宸ヤ綔鐘舵��
+ mast.setWrkSts(201L);
+ //鍏ュ嚭搴撶被鍨�
+ mast.setIoType(12);
+ 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.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;
+ }
}
--
Gitblit v1.9.1