From a77530a0e917f8d2dca1bae55a3730471c8e10a2 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期三, 02 七月 2025 09:22:32 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 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 e20adc7..c58511a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1884,6 +1884,11 @@
return null;
}
// 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
+ if (!staProtocol.isPakMkTask()) {
+ devpThread.setErrorDev(staProtocol.getSiteId(), "浠诲姟宸蹭笅鍙戠瓑寰呭皬杞﹀彇");
+ return null;
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
if (staProtocol.isAutoing()
// && staProtocol.isLoading()
// && staProtocol.isStaOk()
@@ -1892,7 +1897,6 @@
if (taskWrk != null) {
Integer stano = staProtocol.getStaNo();
if (staProtocol.getSiteId() == 1004 || staProtocol.getSiteId()==1020){
- // 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
if (!staProtocol.isPakMkRun()) {
devpThread.setErrorDev(staProtocol.getSiteId(), "寮傚父鍥為��鏍囪锛岄渶瑕佸洖閫�");
return null;
@@ -1982,6 +1986,7 @@
staProtocol.setStaNo(staProtocol.getStaNo()+1);
devpThread.setPakMk(staProtocol.getSiteId(), false);
devpThread.setPakMkRun(staProtocol.getSiteId(), false);
+ devpThread.setPakMkTask(staProtocol.getSiteId(), false);
devpThread.setErrorDev(staProtocol.getSiteId(), errMsg);
MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
try{
@@ -2449,6 +2454,7 @@
try {
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
TaskProtocolCache taskProtocolCache = rgvThread.getTaskProtocolCache();
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, rgvStn.getDevpPlcId());
TaskProtocol issuedTake = new TaskProtocol();
TaskProtocol issuedPut = new TaskProtocol();
@@ -2471,6 +2477,12 @@
return false;
}
}
+ try{
+ devpThread.setPakMkTask(rgvStn.getStaNo(), false);
+ } catch (Exception e2){
+ RgvErrCache.updateRgvErr(rgvSlave.getId(),rgvStn.getStaNo()+"灏忚溅浠诲姟涓嬪彂鏍囪鏇存柊澶辫触");
+ }
+
BasDevpPosition basDevpPositionSou = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", rgvStn.getStaNo()));
BasDevpPosition basDevpPositionEnd = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", targetPointConvert));
--
Gitblit v1.9.1