From 29f77fe00441b26d009ab55a9dd05702163cccdd Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期一, 21 四月 2025 17:55:17 +0800
Subject: [PATCH] 12
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++-----
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 +-
3 files changed, 7 insertions(+), 7 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 b73c974..6edfd0d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -734,14 +734,14 @@
*/
public synchronized void toSxk(Integer mark) {
- for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+ for (DevpSlave devpSlave : slaveProperties.getDevp()) {
// 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
- for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
- if (crnStn.getStaNo() != 1035) {
+ for (DevpSlave.Sta crnStn : devpSlave.getOutSta()) {
+ if (crnStn.getStaNo() != 1135) {
continue;
}
// 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devpSlave.getId());
StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
if (staProtocol == null) {
continue;
@@ -762,7 +762,7 @@
// 涓嬪彂绔欑偣淇℃伅
staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
staProtocol.setStaNo(RouteUtils.CrnStaEnd(1031, 1135));
- if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
+ if (!MessageQueue.offer(SlaveType.Devp, devpSlave.getId(), new Task(2, staProtocol))) {
log.info(staProtocol.getWorkNo() + "," + staProtocol.getStaNo() + "杈撻�佺嚎鍑哄簱鍛戒护涓嬪彂澶辫触222");
continue;
} else {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d807363..cea58c7 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -57,7 +57,7 @@
}};
public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
- add(1112);add(1114);add(1122);add(1124);add(1131);
+ add(1112);add(1114);add(1122);add(1124);add(1131);add(1135);
}};
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index a7ad088..a31717b 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -115,7 +115,7 @@
</select>
<select id="selectPakOutStep3" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=107 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+ select top 1 * from dbo.asr_wrk_mast where sta_no=#{sourceStaNo} and wrk_sts=107 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
--
Gitblit v1.9.1