From 77c5a9937bd6a2ffbb2a45c10fa5d65d66015397 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 27 十月 2023 14:33:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 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 04895d3..bf0cfc9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2418,7 +2418,9 @@
locMast.setPackStatus(2);
testMast.setModiTime(new Date());
//NG杞琌K闇�瑕佽繕鍘熸簮搴撲綅鍜岀洰鏍囧簱浣嶇姸鎬侊紝OK杞琋G 鍒犻櫎浠诲姟妗�
- WrkMast wrkMast=wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
+ WrkMast wrkMast=wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("source_loc_no",locMast.getLocNo())
+ .eq("wrk_sts",11));
if(!Cools.isEmpty(wrkMast)){
if(wrkMast.getWrkSts()==11){
if(wrkMast.getIoType()==11){
@@ -2426,9 +2428,11 @@
locMast1.setLocSts("O");
locMastService.update(locMast1,new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
}
- wrkMastMapper.delete(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
+ wrkMastMapper.delete(new EntityWrapper<WrkMast>()
+ .eq("wrk_sts",11)
+ .eq("source_loc_no",locMast.getLocNo()));
locMast.setLocSts("F");
- wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet",locMast.getBarcode()));
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet",wrkMast.getBarcode()));
if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
.eq("channel",i+1))){
log.error("淇敼娴嬭瘯搴撲綅鐘舵�佸け璐�"+locMast.getLocNo(),locMast);
@@ -2456,6 +2460,14 @@
//閫氶亾鍚姩鎸夐挳鐘舵�侊紝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