From 0213556a2ec8d77bb012dca635e4581e0791cb2b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 20 五月 2024 16:52:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 126 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 121 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 c3db2df..73a5e0a 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -5,10 +5,7 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.service.AgvLocDetlService;
-import com.zy.asrs.service.AgvLocMastService;
-import com.zy.asrs.service.AgvWrkDetlService;
-import com.zy.asrs.service.AgvWrkMastService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.service.AgvCommonService;
@@ -35,6 +32,8 @@
private AgvLocDetlService agvLocDetlService;
@Autowired
private AgvWrkDetlService agvWrkDetlService;
+ @Autowired
+ AgvBasDevpService agvBasDevpService;
public ReturnT<String> start(AgvLocMast agvLocMast) {
// locType 1. 鑷姩锛� 2. 鎵嬪姩
@@ -43,6 +42,17 @@
} else if (agvLocMast.getLocType().equals("2")) {
return doHandMove(agvLocMast);
}
+ return SUCCESS;
+ }
+
+ public ReturnT<String> start2(AgvWrkMast agvWrkMast) {
+ // locType 1. 鑷姩锛� 2. 鎵嬪姩
+ doAutoMove2(agvWrkMast);
+ return SUCCESS;
+ }
+ public ReturnT<String> start3(AgvWrkMast agvWrkMast) {
+ // locType 1. 鑷姩锛� 2. 鎵嬪姩
+ doHandMove2(agvWrkMast);
return SUCCESS;
}
@@ -107,15 +117,117 @@
}
private ReturnT<String> doHandMove(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());
+ // 妫�绱gv鎺ラ┏浣�
+ AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1);
+ //鐢熸垚宸ヤ綔妗�
+ AgvWrkMast mast = new AgvWrkMast();
+ //宸ヤ綔鐘舵��
+ mast.setWrkSts(21L);
+ //鍏ュ嚭搴撶被鍨�
+ mast.setIoType(111);
+ mast.setIoTime(now);
+ //浼樺厛绾�
+ mast.setIoPri(300.0);
+ //婧愮珯鐐�
+ mast.setSourceLocNo(agvLocMast.getLocNo());
+ //鐩爣绔欑偣
+ mast.setLocNo(devpNo.getDevNo());
+ //瀹瑰櫒缂栫爜
+ mast.setBarcode(agvLocMast.getBarcode());
+ //瀹瑰櫒绫诲瀷
+ mast.setWhsType(30);
+ // 鐩爣妤煎眰
+ mast.setPauseMk(agvLocMast.getLocType3().toString());
+
+ mast.setAppeUser(9527L);
+ mast.setAppeTime(now);
+ mast.setModiUser(9527L);
+ mast.setModiTime(now);
+ if (!agvWrkMastService.insertByIncrease(mast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ AgvWrkMast mast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devpNo.getDevNo()).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");
+ updateAgvBasDevp(devpNo,"S",null,agvLocMast.getBarcode());
return SUCCESS;
}
+ private ReturnT<String> doAutoMove2(AgvWrkMast agvWrkMast) {
+ Date now = new Date();
+ //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+ AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo());
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException("鏆傛棤搴撲綅");
+ }
+ agvWrkMast.setWrkSts(201L);
+ agvWrkMast.setLocNo(locMast.getLocNo());
+ agvWrkMastService.updateById(agvWrkMast);
+ //鏇存柊鐩爣搴撲綅鐘舵��
+ updateAgvLocMast(locMast,"S");
+
+ return SUCCESS;
+ }
+ private ReturnT<String> doHandMove2(AgvWrkMast agvWrkMast) {
+ Date now = new Date();
+ AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1);
+ if (Cools.isEmpty(devpNo)) {
+ throw new CoolException("鏆傛棤绌洪棽鎺ラ┏浣�");
+ }
+ agvWrkMast.setWrkSts(201L);
+ agvWrkMast.setLocNo(devpNo.getDevNo());
+ agvWrkMastService.updateById(agvWrkMast);
+ updateAgvBasDevp(devpNo,"S",null,agvWrkMast.getBarcode());
+ return SUCCESS;
+ }
/*
鏇存柊鐩爣搴撲綅淇℃伅
*/
private void updateAgvLocMast(AgvLocMast locMast, String locSts){
locMast.setLocSts(locSts);
agvLocMastService.updateById(locMast);
+ }
+ /*
+ 鏇存柊婧愮珯鐐逛俊鎭�
+ */
+ private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts){
+ if(!Cools.isEmpty(agvBasDevp)){
+ agvBasDevp.setLocSts(locSts);
+ agvBasDevpService.updateById(agvBasDevp);
+ }
+ }
+ private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode){
+ if(!Cools.isEmpty(agvBasDevp)){
+ agvBasDevp.setLocSts(locSts);
+ agvBasDevp.setBarcode(containerCode);
+ agvBasDevpService.updateById(agvBasDevp);
+ }
}
public ReturnT<String> autoEmptyBack(AgvLocMast agvLocMast) {
@@ -126,7 +238,7 @@
throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
}
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast LocMast = agvCommonService.getLocNo(3,agvLocMast.getLocType3());
+ AgvLocMast LocMast = agvCommonService.getLocNo(3,1);
//鐢熸垚宸ヤ綔妗�
AgvWrkMast mast = new AgvWrkMast();
//宸ヤ綔鐘舵��
@@ -152,6 +264,10 @@
if (!agvWrkMastService.insertByIncrease(mast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
+
+ //鏇存柊鐩爣搴撲綅鐘舵��
+ updateAgvLocMast(agvLocMast,"R");
+ updateAgvLocMast(LocMast,"S");
return SUCCESS;
}
}
--
Gitblit v1.9.1