From ad54981b1831bd6e31f45901bb2b08b8d7a3ff68 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 31 五月 2023 15:36:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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..3735667 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2193,6 +2193,12 @@
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 +2217,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 +2269,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