From 8687f74a7e45949d6fc451e151a00b18f9dd0ca7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 02 八月 2025 08:09:59 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 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 98168b2..217b51e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -205,7 +205,7 @@
//杩囨护鍒ゆ柇锛岄槻姝㈡嫞鏂欏啀鍏ュ簱璐х墿锛岀粡杩囧叆搴撶珯鍐嶅叆搴撴椂锛岃閫�鍥炲埌閫�搴撶珯
WrkMast wrkMast1 = wrkMastMapper.selectPakInStepBarcode(barcode);
if (wrkMast1 !=null){
- if (wrkMast1.getIoType()==103 || wrkMast1.getIoType()==107 || wrkMast1.getIoType()==104){
+ if (wrkMast1.getIoType()==103 || wrkMast1.getIoType() == 53 || wrkMast1.getIoType()==107 || wrkMast1.getIoType()== 57 || wrkMast1.getIoType()==104){
continue;
}
}
@@ -445,6 +445,8 @@
stnNo =204;
}else if(wrkMast.getCrnNo() == 3) {
stnNo = 304;
+ }else if(wrkMast.getCrnNo() == 4) {
+ stnNo = 311;
}
} else if(wrkMast.getIoType() == 107){ //鐩樼偣鍑哄簱
if(wrkMast.getCrnNo() == 1) {
@@ -453,6 +455,8 @@
stnNo =201;
}else if(wrkMast.getCrnNo() == 3) {
stnNo = 301;
+ }else if(wrkMast.getCrnNo() == 4) {
+ stnNo = 314;
}
}
if (stnNo == 0) {
@@ -1558,7 +1562,13 @@
&& staProtocol.isLoading()
) {
News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛岋細绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�");
-
+ // 鍒ゆ柇涓婁竴涓┖鎵樺叆搴撳啓鍏ュ悗锛岀嚎绋嬭繕璇诲彇鍒帮紝閫犳垚閲嶅璇锋眰
+ List<WrkMast> wrkMastList = wrkMastMapper.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts",2)
+ .eq("io_type",10).eq("source_sta_no",emptyInSta.getStaNo()));
+ if(!wrkMastList.isEmpty()) {
+ log.warn("鏌ヨ鍒颁竴涓湪璁惧涓婅蛋浠诲姟锛歿}",wrkMastList.get(0).getWrkNo());
+ continue;
+ }
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -1585,7 +1595,6 @@
News.errorNoLog(""+mark+" - 1"+" - 鏇存柊plc绔欑偣淇℃伅澶辫触");
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
-
if (ledThread != null) {
// 鍛戒护闆嗗悎
List<LedCommand> commands = new ArrayList<>();
@@ -1610,7 +1619,7 @@
}
// ledThread.errorReset();
}
- Thread.sleep(500);
+ Thread.sleep(1000);
} else {
staProtocol.setWorkNo((short)9991);
staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
--
Gitblit v1.9.1