From 752d3a39d4fdc2da9edaedf4bec265d0311f9c88 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 13 十一月 2023 20:54:01 +0800
Subject: [PATCH] 库位移转优化
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 ++---------
1 files changed, 2 insertions(+), 9 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 8d7fccf..ff8904b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1074,7 +1074,8 @@
return;
}
for (WrkMast wm: wrkMasts) {
- if(wm.getMk().equals('Y')){
+ LocMast sourceSta1 = locMastService.selectById(wm.getSourceLocNo());
+ if(sourceSta1.getCtnKind()==1){
wrkMast=wm;
break;
}
@@ -2430,14 +2431,6 @@
//閫氶亾鍚姩鎸夐挳鐘舵�侊紝1:鍙互鍚姩鍑哄簱鎴栬�呯Щ搴擄紝0:涓嶈兘鍚姩鍑哄簱鎴栬�呯Щ搴�
locMast.setCtnKind(devpThread.startSignal[i][2]);
if(devpThread.startSignal[i][2]==1){
- WrkMast wrkMast=wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
- if(!Cools.isEmpty(wrkMast)){
- wrkMast.setMk("Y");
- if(!wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>()
- .eq("source_loc_no",locMast.getLocNo()))){
- log.error("淇敼浠诲姟妗ｅ惎鍔ㄦ寜閽姸鎬侊紝浠诲姟妗ｇ姸鎬佸け璐�"+wrkMast.getSourceLocNo(),wrkMast);
- }
- }
if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
.eq("loc_sts","R")
.eq("channel",i+1))){
--
Gitblit v1.9.1