From 61b71a7d6d5e8364554f4ef2cb9f0864137ee6e8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 三月 2024 16:34:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 12738ca..a3f145d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2291,12 +2291,18 @@
BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", staDesc.getCrnStn()));
+ staDesc.getCrnNo();
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("crn_no", staDesc.getCrnNo()).gt("io_type", 100));
+ if (!Cools.isEmpty(wrkMast)){
+ continue;
+ }
+
if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")
&& basDevp.getWrkNo() == 0 && basDevp.getCanining().equals("Y")){
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo((short) 9997);
-// staProtocol.setStaNo(basDevp.getDevNo().shortValue());
- staProtocol.setStaNo((short) 1013);
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+// staProtocol.setStaNo((short) 1013);
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol));
if (!result) {
--
Gitblit v1.9.1