From 8b3c2e0bc9b61f947347b3789b12aabe71703ffd Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 11:35:08 +0800
Subject: [PATCH] # 自动回流-直接找库位
---
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 4 ++++
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index a0623aa..785ce16 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -535,6 +535,10 @@
public String doBack(AgvMobileStartPakin param, Long userId) {
Date now = new Date();
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", param.getDevNo()));
+ AgvWrkMast agvWrkMastSource = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", param.getDevNo()));
+ if (!Cools.isEmpty(agvWrkMastSource)) {
+ throw new CoolException("褰撳墠绔欑偣宸叉湁閫�搴撲换鍔�");
+ }
Integer oldWrkNo = agvWrkMast.getWrkNo();
if (!agvWrkMast.getBarcode().equals(param.getBarcode())) {
throw new CoolException("鍥為��浠诲姟鐨勮揣鏋剁爜涓庡綋鍓嶈揣鏋剁爜涓嶄竴鑷�!");
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index b66bb7d..6b30542 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -77,7 +77,7 @@
}
// 绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐�
- @Scheduled(cron = "0/2 * * * * ? ")
+ //@Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack(){
// 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
@@ -93,7 +93,7 @@
}
}
// 绌烘澘鑷姩鍥炲簱 鎺ラ┏鐐� - 1妤煎簱浣�
- @Scheduled(cron = "0/2 * * * * ? ")
+ //@Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack3(){
// 宸ヤ綔妗ｄ负201 涓� 鍏ュ嚭搴撶被鍨嬩负109
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
@@ -110,7 +110,7 @@
}
// 绌烘澘鑷姩鍥炲簱
- //@Scheduled(cron = "0/2 * * * * ? ")
+ @Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack2(){
// 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
--
Gitblit v1.9.1