From a3606d53403475ee05664058b343310c57249d2e Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 21:54:11 +0800
Subject: [PATCH] 999
---
src/main/java/com/zy/asrs/service/WrkMastService.java | 3 +++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++-----
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 10 ++++++++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 3 +++
src/main/resources/mapper/WrkMastMapper.xml | 16 +++++++++++++++-
5 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index f4b320f..328b9da 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -66,4 +66,7 @@
WrkMast selectChargeWorkingByChargeSta(Integer chargeSta);
+ WrkMast selectWorkingPakout(Integer staNo);
+
+ WrkMast selectWorkingPakin(Integer staNo);
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 37197a5..ff34a8d 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -42,4 +42,7 @@
WrkMast selectLiftWrkMastAndWrkNo(Integer liftNo, Integer wrkNo, Integer wrkNo2);
+ WrkMast selectWorkingPakout(Integer staNo);
+
+ WrkMast selectWorkingPakin(Integer staNo);
}
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 7dd60f7..906941c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2112,15 +2112,15 @@
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- WrkMast pakout = wrkMastMapper.selectWorkingPakout(1032);
+ WrkMast pakout = wrkMastService.selectWorkingPakout(1032);
if (pakout != null) {
if (devpThread.ioModeOf2_5 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf2_5 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(1032);
- if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
- && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
+ WrkMast pakin = wrkMastService.selectWorkingPakin(1032);
+ if (pakin == null && !devpThread.getStation().get(1032).isLoading()
+ && !devpThread.getStation().get(1032).isLoading()
+ && devpThread.getStation().get(1032).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf2_5 = IoModeType.PAKOUT_MODE;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 157030e..c15a98d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -145,4 +145,14 @@
public WrkMast selectLiftWrkMastAndWrkNo(Integer liftNo, Integer wrkNo, Integer manWrkNo) {
return this.baseMapper.selectLiftWrkMastAndWrkNo(liftNo, wrkNo, manWrkNo);
}
+
+ @Override
+ public WrkMast selectWorkingPakout(Integer staNo) {
+ return this.baseMapper.selectWorkingPakout(staNo);
+ }
+
+ @Override
+ public WrkMast selectWorkingPakin(Integer staNo) {
+ return this.baseMapper.selectWorkingPakin(staNo);
+ }
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index e8f6cfa..51f1693 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -193,7 +193,7 @@
select *
from asr_wrk_mast
where 1 = 1
- and shuttle_no = #{shuttleNo}
+ and shuttle_no = #{shuttleNo}
<if test="wrkNo !=null">
and wrk_no != #{wrkNo}
</if>
@@ -237,4 +237,18 @@
order by io_pri desc, io_time, wrk_no asc
</select>
+ <select id="selectWorkingPakout" resultMap="BaseResultMap">
+ select *
+ from asr_wrk_mast
+ where io_type = 101
+ and sta_no = #{staNo} limit 0,1
+ </select>
+
+ <select id="selectWorkingPakin" resultMap="BaseResultMap">
+ select *
+ from asr_wrk_mast
+ where io_type = 1
+ and source_sta_no = #{staNo} limit 0,1
+ </select>
+
</mapper>
--
Gitblit v1.9.1