From 560061f07be81dd4436f940b26a4cb26941a4201 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 12 六月 2024 17:12:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 9c46105..dc7ce58 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -55,7 +55,7 @@
doHandMove2(agvWrkMast);
return SUCCESS;
}
-
+ //鏍规嵁搴撲綅鐨刲octype鍊煎彂閫佷换鍔�--寮冪敤
private ReturnT<String> doAutoMove(AgvLocMast agvLocMast) {
Date now = new Date();
//鏌ヨ宸ヤ綔妗�
@@ -64,7 +64,7 @@
throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
}
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast LocMast = agvCommonService.getLocNo(3,agvLocMast.getLocType3());
+ AgvLocMast LocMast = agvCommonService.getLocNo(3,agvLocMast.getLocType3(),false,true);
//鐢熸垚宸ヤ綔妗�
AgvWrkMast mast = new AgvWrkMast();
//宸ヤ綔鐘舵��
@@ -182,7 +182,7 @@
private ReturnT<String> doAutoMove2(AgvWrkMast agvWrkMast) {
Date now = new Date();
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo());
+ AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,true);
if (Cools.isEmpty(locMast)) {
throw new CoolException("鏆傛棤搴撲綅");
}
@@ -196,7 +196,14 @@
}
private ReturnT<String> doHandMove2(AgvWrkMast agvWrkMast) {
Date now = new Date();
- AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1);
+ String lev1 = agvWrkMast.getSourceLocNo().substring(agvWrkMast.getSourceLocNo().length() - 4).substring(0, 2);
+ AgvBasDevp devpNo = new AgvBasDevp();
+ if ("01".equals(lev1)) {
+ devpNo = agvCommonService.getDevpNo(3, 1, "Y", "Y");
+ } else {
+ devpNo = agvCommonService.getDevpNo(3, 5, "Y", "Y");
+ }
+
if (Cools.isEmpty(devpNo)) {
throw new CoolException("鏆傛棤绌洪棽鎺ラ┏浣�");
}
@@ -274,7 +281,7 @@
Date now = new Date();
AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
//妫�绱㈢┖闂叉帴椹充綅锛岄�夋嫨鍚堥�傜殑鎺ラ┏浣�
- AgvLocMast locMast = agvCommonService.getLocNo(3, 1);
+ AgvLocMast locMast = agvCommonService.getLocNo(3, 1,true,true);
if (Cools.isEmpty(locMast)) {
throw new CoolException("1妤兼殏鏃犵┖搴撲綅");
}
@@ -299,7 +306,7 @@
throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
}
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast LocMast = agvCommonService.getLocNo(3,1);
+ AgvLocMast LocMast = agvCommonService.getLocNo(3,1,true,true);
//鐢熸垚宸ヤ綔妗�
AgvWrkMast mast = new AgvWrkMast();
//宸ヤ綔鐘舵��
@@ -349,7 +356,7 @@
} else if(agvLocMast.getFloor() == 2) {
floor = "F2";
}
- List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 109).or().eq("io_type", 113).like("source_loc_no", floor));
+ 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("鏆傚仠鍥炴祦");
}
@@ -361,7 +368,7 @@
ioType = 109;
} else {
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- locMast = agvCommonService.getLocNo(3,1);
+ locMast = agvCommonService.getLocNo(3,1,true,true);
locNo = locMast.getLocNo();
wrkSts = 201L;
ioType = 109;
@@ -434,7 +441,7 @@
//鍏ュ嚭搴撶被鍨�
mast.setIoType(109);
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast locMast = agvCommonService.getLocNo(3,1);
+ AgvLocMast locMast = agvCommonService.getLocNo(3,1,true,true);
mast.setLocNo(locMast.getLocNo());
updateAgvLocMast(locMast,"S");
} else {
--
Gitblit v1.9.1