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 | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 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 fe5086a..01d8c90 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -46,6 +46,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import springfox.documentation.spring.web.json.Json;
import java.util.ArrayList;
import java.util.Date;
@@ -117,7 +118,7 @@
String barcode = barcodeThread.getBarcode();
// barcode="ILY0127 0001";
if(!Cools.isEmpty(barcode)) {
- News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
+ log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
continue;
}
@@ -286,6 +287,7 @@
// }
} catch (Exception e) {
+ News.error("鎵爜鍏ュ簱鎶ラ敊锛岄敊璇俊鎭�",e);
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
@@ -1077,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;
@@ -1093,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) {
@@ -2332,7 +2346,6 @@
if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, 0))) {
News.error("鐏 ===>> 缁欏爢鍨涙満娓呴浂澶嶄綅鎶ヨ淇″彿澶辫触");
}
- News.warn("鐏 ===>> 缁欏爢鍨涙満鍙戦�佹姤璀︿俊鍙锋垚鍔�");
}
}
} catch (Exception e) {
@@ -2403,41 +2416,41 @@
//testMast.setStatus
//"鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍� 3:娴嬭瘯涓� 4:瀹屾垚 5:绉诲簱 6:鐏"
if(devpThread.startSignal[i][0]==8){
- News.info("2390琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 1銆佺敵璇蜂腑锛屽紑濮嬩慨鏀瑰墠锛�"+testMast);
+ News.info("2390琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 1銆佺敵璇蜂腑锛屽紑濮嬩慨鏀瑰墠锛�"+ JSON.toJSONString(testMast));
testMast.setStatus(1);
locMast.setPackStatus(1);
testMast.setModiTime(new Date());
- log.info("2394琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 1銆佺敵璇蜂腑,淇敼鏁版嵁鍚庛�佹湭鏇存柊"+testMast);
+ log.info("2394琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 1銆佺敵璇蜂腑,淇敼鏁版嵁鍚庛�佹湭鏇存柊"+JSON.toJSONString(testMast));
}else if(devpThread.startSignal[i][0]==2 && locMast.getPackStatus()!=2){
- News.info("2396琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 3銆佹祴璇曚腑锛屽紑濮嬩慨鏀瑰墠锛�"+testMast);
+ News.info("2396琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 3銆佹祴璇曚腑锛屽紑濮嬩慨鏀瑰墠锛�"+JSON.toJSONString(testMast));
testMast.setStatus(3);
locMast.setPackStatus(2);
testMast.setModiTime(new Date());
- log.info("2400锛屼慨鏀规祴璇曟。鐘舵�佷负 3銆佹祴璇曚腑,淇敼鏁版嵁鍚庛�佹湭鏇存柊"+testMast);
+ log.info("2400锛屼慨鏀规祴璇曟。鐘舵�佷负 3銆佹祴璇曚腑,淇敼鏁版嵁鍚庛�佹湭鏇存柊"+JSON.toJSONString(testMast));
//NG杞琌K闇�瑕佽繕鍘熸簮搴撲綅鍜岀洰鏍囧簱浣嶇姸鎬侊紝OK杞琋G 鍒犻櫎浠诲姟妗�
WrkMast wrkMast=wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("source_loc_no",locMast.getLocNo())
.eq("wrk_sts",11));
- News.info("2405锛屾煡璇㈢姸鎬佷负鐢熸垚鍑哄簱id鐨勬祴璇曞畬鎴愶紙NG鎴朞K锛変换鍔℃。锛�"+wrkMast);
+ News.info("2405锛屾煡璇㈢姸鎬佷负鐢熸垚鍑哄簱id鐨勬祴璇曞畬鎴愶紙NG鎴朞K锛変换鍔℃。锛�"+JSON.toJSONString(wrkMast));
if(!Cools.isEmpty(wrkMast)){
if(wrkMast.getWrkSts()==11){
if(wrkMast.getIoType()==11){
- log.info("2409锛屽垹闄や换鍔℃。涓虹Щ搴撶殑锛�"+wrkMast);
+ log.info("2409锛屽垹闄や换鍔℃。涓虹Щ搴撶殑锛�"+JSON.toJSONString(wrkMast));
LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
locMast1.setLocSts("O");
locMastService.update(locMast1,new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
}
wrkMastMapper.deleteById(wrkMast);
- log.info("2415锛屽垹闄ゅ伐浣滄。"+wrkMast);
+ log.info("2415锛屽垹闄ゅ伐浣滄。"+JSON.toJSONString(wrkMast)+JSON.toJSONString(locMast));
locMast.setLocSts("F");
- log.info("2417锛屽垹闄ゅ伐浣滄。"+wrkMast);
+ log.info("2417锛屽垹闄ゅ伐浣滄。"+JSON.toJSONString(wrkMast)+JSON.toJSONString(locMast));
wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo()));
log.info("2419锛屽垹闄ゅ伐浣滄槑缁�"+wrkMast.getWrkNo());
if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
.eq("channel",i+1))){
- log.error("2422淇敼娴嬭瘯搴撲綅鐘舵�佸け璐�"+locMast.getLocNo(),locMast);
+ log.error("2422淇敼娴嬭瘯搴撲綅鐘舵�佸け璐�"+locMast.getLocNo()+JSON.toJSONString(locMast));
}else{
- log.error("2424"+locMast.getLocNo(),locMast);
+ log.error("2424淇敼娴嬭瘯搴撲綅鐘舵�佹垚鍔�"+locMast.getLocNo()+JSON.toJSONString(locMast));
fig=true;
}
}
--
Gitblit v1.9.1