From 9050b1c218f0d3753a8a36edc2a014bf820c466b Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期二, 19 十二月 2023 21:52:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 0dafbdd..4fd13d3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1080,9 +1080,11 @@
}
for (WrkMast wm: wrkMasts) {
LocMast sourceSta1 = locMastService.selectById(wm.getSourceLocNo());
- if(sourceSta1.getCtnKind()==1){
- wrkMast=wm;
- break;
+ if (!Cools.isEmpty(sourceSta1.getCtnKind())){
+ if(sourceSta1.getCtnKind()==1){
+ wrkMast=wm;
+ break;
+ }
}
}
// 鑾峰彇婧愬簱浣嶄俊鎭�
@@ -2370,20 +2372,20 @@
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
if(null != devpThread){
for (int i = 0; i < 48; i++){
- log.info("2367琛岀▼搴忓紑濮嬭繍琛岋紝绗�"+i+"娆�");
+// log.info("2367琛岀▼搴忓紑濮嬭繍琛岋紝绗�"+i+"娆�");
boolean fig=false;
//鏌ヨ鍦ㄥ簱鍜岄绾﹀嚭搴�
LocMast locMast=locMastService.selectztgx("F","R",i);
if(!Cools.isEmpty(locMast)){
- log.info("2372琛岀▼搴忓紑濮嬭繍琛岋紝鏌ヨ娴嬭瘯妗�");
+// log.info("2372琛岀▼搴忓紑濮嬭繍琛岋紝鏌ヨ娴嬭瘯妗�");
TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no",locMast.getLocNo())
.eq("user_id",locMast.getBarcode()));
if(Cools.isEmpty(testMast)){
- log.info("2377琛岀▼搴忓紑濮嬭繍琛岋紝娴嬭瘯妗ｄ负绌猴紝璺宠繃");
+// log.info("2377琛岀▼搴忓紑濮嬭繍琛岋紝娴嬭瘯妗ｄ负绌猴紝璺宠繃");
continue;
}
- log.info("2380琛岀▼搴忓紑濮嬭繍琛岋紝娴嬭瘯妗ｄ笉涓虹┖锛屼笅涓�姝�");
+// log.info("2380琛岀▼搴忓紑濮嬭繍琛岋紝娴嬭瘯妗ｄ笉涓虹┖锛屼笅涓�姝�");
//devpThread.startSignal[i][0]
//0:绌�,1:鍚姩涓�,2:宸ヤ綔涓�,3:鑷姩鏆傚仠,4:姝ｅ父瀹屾垚(OK),5:寮傚父鍋滄(NG),6:鍦ㄧ嚎,7:绂荤嚎,8:绌洪棽
--
Gitblit v1.9.1