From f78cdcd32b1b872efce68e6a45aba7181df1f9fb Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 29 五月 2024 10:30:53 +0800
Subject: [PATCH] # 组托入库取消任务回退入库单作业数量，更新作业站点为空接驳位
---
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 6 +++++-
1 files changed, 5 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 8fd6638..59a0fdd 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -238,7 +238,7 @@
throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
}
//妫�绱㈢┖闂叉帴椹充綅锛岄�夋嫨鍚堥�傜殑鎺ラ┏浣�
- AgvBasDevp devpNo = agvCommonService.getDevpNoisAuto(3, agvLocMast.getFloor(),"Y");
+ AgvBasDevp devpNo = agvCommonService.getDevpNo(3, agvLocMast.getFloor());
//鐢熸垚宸ヤ綔妗�
AgvWrkMast mast = new AgvWrkMast();
//宸ヤ綔鐘舵��
@@ -272,6 +272,10 @@
}
public ReturnT<String> autoEmptyBack3(AgvWrkMast agvWrkMast) {
Date now = new Date();
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
+ if (agvBasDevp.getAutoing() == "N") {
+ throw new CoolException("褰撳墠绔欑偣涓烘墜鍔�");
+ }
//妫�绱㈢┖闂叉帴椹充綅锛岄�夋嫨鍚堥�傜殑鎺ラ┏浣�
AgvLocMast locMast = agvCommonService.getLocNo(3, 1);
//鐩爣绔欑偣
--
Gitblit v1.9.1