From 495b677051e2cbb6a26c0f1e55d9b7f85c5cb9f3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 10 七月 2023 17:06:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    3 +++
 src/main/java/com/zy/asrs/mapper/BasDevpMapper.java         |    1 +
 src/main/resources/mapper/BasDevpMapper.xml                 |    7 +++++++
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |    7 +++++++
 4 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
index 35c19c1..9a288bd 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -19,4 +19,5 @@
     List<BasDevp> getLoading(@Param("sour") Integer sour);
 
     BasDevp selectByWrkNo(Integer wrkNo);
+    BasDevp selectByDevNo(Integer devNo);
 }
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 62cd994..c693737 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -387,6 +387,9 @@
                     staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                     staProtocol.setStaNo(staNo);
                     devpThread.setPakMk(staProtocol.getSiteId(), false);
+                    BasDevp basDevp = basDevpMapper.selectByDevNo(300);
+                    basDevp.setWrkNo1(wrkMast.getWrkNo());
+                    basDevpService.selectById(basDevp);
                     boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                     if (!result) {
                         News.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 5978508..1a2bfc5 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,6 +9,7 @@
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
 import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.mapper.BasDevpMapper;
 import com.zy.asrs.service.BasDevpService;
 import com.zy.common.utils.News;
 import com.zy.core.DevpThread;
@@ -176,6 +177,12 @@
 
                 if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                     staProtocol.setPakMk(true);
+                }else if (staProtocol.getSiteId().equals(300)){
+                    BasDevpMapper basDevpMapper = SpringUtils.getBean(BasDevpMapper.class);
+                    BasDevp basDevp = basDevpMapper.selectByDevNo(300);
+                    if (!basDevp.getWrkNo().equals(basDevp.getWrkNo1())){
+                        staProtocol.setPakMk(true);
+                    }
                 }
             }
         }
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index ba12642..1ff07a3 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -84,4 +84,11 @@
         </if>
     </select>
 
+    <select id="selectByDevNo" resultMap="BaseResultMap">
+        select top 1 *
+        from asr_bas_devp
+        where 1=1
+        and dev_no = #{devNo}
+    </select>
+
 </mapper>

--
Gitblit v1.9.1