From 83def9d705c2883cc3a50f7ffeff5596b43fe437 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 二月 2025 14:08:17 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++++++-
1 files changed, 9 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 bd7f25e..0fa9d7e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4662,14 +4662,19 @@
staProtocol = staProtocol.clone();
}
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() == 0){
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() == 0 && staProtocol.isPakMk()){
RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("armNo"+staNo);
if (!Cools.isEmpty(rgvOneSign) && rgvOneSign.getRgvOneSign() == 1){
int workNo = commonService.getWorkNo(6);
+
StaProtocol staProtocolnew = new StaProtocol();
staProtocolnew.setSiteId(staNo);
staProtocolnew.setWorkNo(workNo);
staProtocolnew.setStaNo(staNo==215? 217:221);
+ boolean result1 = MessageQueue.offer(SlaveType.Devp, 2, new Task(3, staProtocolnew));
+
+ devpThread.setPakMk(staProtocolnew.getSiteId(), false);
+
boolean result2 = MessageQueue.offer(SlaveType.Devp, 2, new Task(2, staProtocolnew));
if (!result2) {
log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", 2);
@@ -4677,6 +4682,9 @@
if (!staProtocol.isLoading()){
updateRgvOneSign("armNo"+staNo,0);
}
+
+
+ boolean result3 = MessageQueue.offer(SlaveType.Devp, 2, new Task(4, staProtocolnew));
}
}
}catch (Exception e){
--
Gitblit v1.9.1