From ebb56a4c6052481e17c0b58de1b39286417fbad9 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 04 十一月 2023 11:16:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 5769bbd..8d7fccf 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -575,7 +575,6 @@
&& crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
// 搴撲綅绉昏浆
this.stnToStn(crn, crnProtocol);
- this.locToLoc(crn, crnProtocol);
// 濡傛灉鏈�杩戜竴娆℃槸鍏ュ簱妯″紡
if (crnProtocol.getLastIo().equals("I")) {
if (basCrnp.getInEnable().equals("Y")) {
@@ -598,6 +597,7 @@
}
}
// 搴撲綅绉昏浆
+ this.locToLoc(crn, crnProtocol);
// this.crnRebackHp(crnProtocol, crnThread);
}
@@ -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());
@@ -2378,7 +2389,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){
@@ -2386,9 +2399,10 @@
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_no",wrkMast.getWrkNo()));
locMast.setLocSts("F");
- wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet",locMast.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);
@@ -2416,6 +2430,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