From 40c2987c083122db0c9f9ea57750abb42d85b642 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 16 七月 2024 13:12:51 +0800
Subject: [PATCH] 完善移库任务自动下发
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 70d8d96..01d8c90 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1079,15 +1079,13 @@
//鑾峰彇鎵�鏈夌Щ搴撲换鍔�
List<WrkMast> wrkMasts=wrkMastMapper.selectLocMoves(slave.getId());
// 鑾峰彇宸ヤ綔妗ｄ俊鎭�
- WrkMast wrkMast = wrkMastMapper.selectLocMove(slave.getId());
+ WrkMast wrkMast =null;
if(Cools.isEmpty(wrkMasts)){
return;
}
- if (null == wrkMast) {
- return;
- }
+ //鍏堟煡娴嬭瘯搴撲綅杞琌K鎴栬�匩G搴撲綅鎸変簡鎸夐挳鐨�
for (WrkMast wm: wrkMasts) {
- LocMast sourceSta1 = locMastService.selectById(wm.getSourceLocNo());
+ LocMast sourceSta1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wm.getSourceLocNo()));
if (!Cools.isEmpty(sourceSta1.getCtnKind())){
if(sourceSta1.getCtnKind()==1){
wrkMast=wm;
@@ -1095,6 +1093,20 @@
}
}
}
+ //鍚庢煡绛夊緟搴撲綅杞祴璇曞簱浣�
+ if(Cools.isEmpty(wrkMast)){
+ for (WrkMast wm: wrkMasts) {
+ LocMast sourceSta1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wm.getSourceLocNo()));
+ if (sourceSta1.getLocType1()==3){
+ wrkMast=wm;
+ }
+ }
+ }
+ //閮芥病鏈夋弧瓒虫潯浠剁殑锛岃烦杩囩Щ搴�
+ if(Cools.isEmpty(wrkMast)){
+ return;
+ }
+
// 鑾峰彇婧愬簱浣嶄俊鎭�
LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
if (null == sourceSta) {
--
Gitblit v1.9.1