From 28d0b310e473c976ce4160330ca6aad822cd4b8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 26 六月 2024 08:24:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 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 dc7ce58..e9a090e 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -55,6 +55,12 @@
doHandMove2(agvWrkMast);
return SUCCESS;
}
+
+ public ReturnT<String> start4(AgvWrkMast agvWrkMast) {
+ // locType 1. 鑷姩锛� 2. 鎵嬪姩
+ doAutoMove3(agvWrkMast);
+ return SUCCESS;
+ }
//鏍规嵁搴撲綅鐨刲octype鍊煎彂閫佷换鍔�--寮冪敤
private ReturnT<String> doAutoMove(AgvLocMast agvLocMast) {
Date now = new Date();
@@ -186,6 +192,28 @@
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.setLocNo(locMast.getLocNo());
+ agvWrkMastService.updateById(agvWrkMast);
+ //鏇存柊鐩爣搴撲綅鐘舵��
+ updateAgvLocMast(locMast,"S");
+ AgvLocMast locMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locMast.getLocNo()));
+ log.info("鑷姩璋冩嫧浠诲姟 ==> 婧愬簱浣嶏細{}锛岀洰鏍囧簱浣嶏細{},搴撲綅鐘舵�亄}",agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo(),locMast1.getLocSts());
+
+ return SUCCESS;
+ }
+
+ private ReturnT<String> doAutoMove3(AgvWrkMast agvWrkMast) {
+ Date now = new Date();
+ //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+ AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,false);
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException("鏆傛棤搴撲綅");
+ }
agvWrkMast.setWrkSts(201L);
agvWrkMast.setLocNo(locMast.getLocNo());
agvWrkMastService.updateById(agvWrkMast);
@@ -194,6 +222,7 @@
return SUCCESS;
}
+
private ReturnT<String> doHandMove2(AgvWrkMast agvWrkMast) {
Date now = new Date();
String lev1 = agvWrkMast.getSourceLocNo().substring(agvWrkMast.getSourceLocNo().length() - 4).substring(0, 2);
@@ -201,7 +230,7 @@
if ("01".equals(lev1)) {
devpNo = agvCommonService.getDevpNo(3, 1, "Y", "Y");
} else {
- devpNo = agvCommonService.getDevpNo(3, 5, "Y", "Y");
+ devpNo = agvCommonService.getDevpNo(3, 4, "Y", "Y");
}
if (Cools.isEmpty(devpNo)) {
--
Gitblit v1.9.1