From be8a12f3c9c5c0b9db9f8144ab644fcb20c1af5e Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 01 七月 2025 16:58:32 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 1 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 +++++
src/main/java/com/zy/core/DevpThread.java | 1 +
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 11 +++++++++++
4 files changed, 18 insertions(+), 0 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 93b0d30..226c054 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1892,6 +1892,10 @@
Integer stano = staProtocol.getStaNo();
if (staProtocol.getSiteId() == 1004 || staProtocol.getSiteId()==1020){
// 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
+ if (!staProtocol.isPakMkRun()) {
+ devpThread.setErrorDev(staProtocol.getSiteId(), "寮傚父鍥為��鏍囪锛岄渶瑕佸洖閫�");
+ return null;
+ }
if (!staProtocol.isLoading()) {
devpThread.setErrorDev(staProtocol.getSiteId(), "鏃犵墿");
return null;
@@ -1976,6 +1980,7 @@
staProtocol.setWorkNo(9999);
staProtocol.setStaNo(staProtocol.getStaNo()+1);
devpThread.setPakMk(staProtocol.getSiteId(), false);
+ devpThread.setPakMkRun(staProtocol.getSiteId(), false);
devpThread.setErrorDev(staProtocol.getSiteId(), errMsg);
MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
try{
diff --git a/src/main/java/com/zy/core/DevpThread.java b/src/main/java/com/zy/core/DevpThread.java
index 5e9e167..13a8e7a 100644
--- a/src/main/java/com/zy/core/DevpThread.java
+++ b/src/main/java/com/zy/core/DevpThread.java
@@ -9,6 +9,7 @@
Map<Integer, StaProtocol> getStation();
void setPakMk(Integer siteId, boolean pakMk);
+ void setPakMkRun(Integer siteId, boolean pakMk);
void setPakMkWalk(Integer siteId, boolean pakMkWalk);
void setGrossWt(Integer siteId, Double grossWt);
void setErrorDev(Integer siteId, String msgErr);
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 82a2e67..df9f887 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -52,6 +52,7 @@
// 閿佸畾鏍囪
private boolean pakMk = true;
+ private boolean pakMkRun = true;
private boolean pakMkWalk = true;
// 鍏ュ簱鏆傚瓨鏁�
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1975c34..44f90d9 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -616,6 +616,17 @@
}
}
+
+ /**
+ * 璁剧疆鍏ュ簱鏍囪
+ */
+ @Override
+ public void setPakMkRun(Integer siteId, boolean pakMk) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null != staProtocol) {
+ staProtocol.setPakMkRun(pakMk);
+ }
+ }
/**
* 璁剧疆鍏ュ簱鏍囪
*/
--
Gitblit v1.9.1