From 94e6a3b240b6a972408dcb6719ba2a1df0e7746e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 08 十一月 2023 16:18:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 26cae4d..8d7fccf 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1063,10 +1063,21 @@
* 搴撲綅绉昏浆
*/
public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
+ //鑾峰彇鎵�鏈夌Щ搴撲换鍔�
+ List<WrkMast> wrkMasts=wrkMastMapper.selectLocMoves(slave.getId());
// 鑾峰彇宸ヤ綔妗ｄ俊鎭�
WrkMast wrkMast = wrkMastMapper.selectLocMove(slave.getId());
+ if(Cools.isEmpty(wrkMasts)){
+ return;
+ }
if (null == wrkMast) {
return;
+ }
+ for (WrkMast wm: wrkMasts) {
+ if(wm.getMk().equals('Y')){
+ wrkMast=wm;
+ break;
+ }
}
// 鑾峰彇婧愬簱浣嶄俊鎭�
LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
@@ -2389,10 +2400,9 @@
locMastService.update(locMast1,new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
}
wrkMastMapper.delete(new EntityWrapper<WrkMast>()
- .eq("wrk_sts",11)
- .eq("source_loc_no",locMast.getLocNo()));
+ .eq("wrk_no",wrkMast.getWrkNo()));
locMast.setLocSts("F");
- wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet",wrkMast.getBarcode()));
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo()));
if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
.eq("channel",i+1))){
log.error("淇敼娴嬭瘯搴撲綅鐘舵�佸け璐�"+locMast.getLocNo(),locMast);
--
Gitblit v1.9.1