From 297aaba86ef2c39dc6b8e9160365b8d3c026d5b8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 01 六月 2023 13:16:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 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 5759c5b..c17bc8b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2029,7 +2029,7 @@
case 3://娴嬭瘯瀹屾垚
olsStatus = 4;//娴嬭瘯瀹屾垚
newStatus = 4;//娴嬭瘯瀹屾垚
- newSingle = 4;//娴嬭瘯瀹屾垚锛屽瘎瀛樺櫒鍦板潃锛�3===>>4
+ newSingle = 4;//锛圢G:4\OK:41锛夋祴璇曞畬鎴愶紝瀵勫瓨鍣ㄥ湴鍧�锛�3===>>4\41
break;
case 5://NG娴嬭瘯淇″彿
case 6://瀹屾垚娴嬭瘯淇″彿
@@ -2063,8 +2063,8 @@
newSingle = 0;//澶嶄綅锛屽瘎瀛樺櫒鍦板潃锛�12===>>0
break;
default:
- log.error("璇诲彇娴嬭瘯搴撲綅淇″彿鍑洪敊");
- break;
+ log.info("璇诲彇閫氶亾"+(i+1)+"娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�"+devpThread.startSignal[i][0]);
+ continue;
}
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
@@ -2073,11 +2073,26 @@
boolean sign=false;
switch (devpThread.startSignal[i][0]){
case 0:
+ if (!Cools.isEmpty(testMast)){
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
+ if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
+ sign=true;
+ }
+ }
+ break;
case 3:
if (!Cools.isEmpty(testMast)){
locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
sign=true;
+ if (locMast.getPackStatus()==3){
+ newSingle=41;
+ }else if (locMast.getPackStatus()==4){
+ newSingle=4;
+ }else {
+ log.info("璇诲彇閫氶亾"+(i+1)+"娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�"+devpThread.startSignal[i][0]+"閫氶亾搴撲綅pack鐘舵�佷俊鎭紓甯�"+locMast.getPackStatus());
+ sign=false;
+ }
}
}
break;
@@ -2182,7 +2197,7 @@
sign=true;
break;
default:
- log.error("璇诲彇娴嬭瘯搴撲綅淇″彿鍑洪敊");
+ log.info("璇诲彇閫氶亾"+(i+1)+"娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�"+devpThread.startSignal[i][0]);
continue;
}
if (sign){
@@ -2192,6 +2207,12 @@
} else {
devpThread.startSignal[i][0] = newSingle;
}
+ }
+ try{
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
+ messageQueueOffer2(i,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
+ }catch (Exception e){
+ log.error("鐏 ===>> 缁欒緭閫佺嚎鍙戦�佽鎶ュけ璐�,閫氶亾鍙凤細", i+1);
}
}
@@ -2211,6 +2232,14 @@
staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧�
staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,8==>0
return MessageQueue.offer(devp, id, new Task(3, staProtocol));
+ }
+
+ public boolean messageQueueOffer2(int i ,short newSingle,SlaveType devp,Integer id){
+ //澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
+ StaProtocol staProtocol = new StaProtocol();
+ staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧�
+ staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,8==>0
+ return MessageQueue.offer(devp, id, new Task(5, staProtocol));
}
/**
@@ -2255,7 +2284,7 @@
if (Cools.isEmpty(basDevp)){
log.error("103绔欑偣鏌ヨ澶辫触-MainServiceImpl.java-2255琛�");
}
- if (basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()>0 && basDevp.getLoading().equals("Y") && basDevp.getInEnable().equals("Y")){
+ if (basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()>0 && basDevp.getLoading().equals("Y") ){
WrkDetl wrkDetl = wrkDetlService.devpPackNo(basDevp.getWrkNo());
if (Cools.isEmpty(wrkDetl)){
log.error("103绔欑偣鏌ヨ澶辫触-MainServiceImpl.java-2255琛�");
--
Gitblit v1.9.1