From 194097d02fb098eb158ff5db24929a8f5a7cfa4c Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 31 一月 2023 14:15:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 9 +++++++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2 ++
src/main/resources/mapper/WrkMastMapper.xml | 11 +++++++++++
3 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index ac9ec8e..4212bde 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -113,4 +113,6 @@
* @return
*/
WrkMast selectSteNoData(@Param("steNo")Integer steNo);
+
+ List<WrkMast> selectWrkStsAndIoType(@Param("sour")Integer sour);
}
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 d17ece8..2a294f6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -304,6 +304,7 @@
case 104:
case 108:
staNo = 103;
+
break;
case 204:
case 208:
@@ -987,6 +988,14 @@
continue;
}
+ if (wrkMast.getWrkSts() == 11 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
+ Integer sour = wrkMast.getStaNo();
+ List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType(sour);
+ if (wrkMasts.size()!=0){
+ continue;
+ }
+ }
+
// 鍒ゆ柇鏄惁宸插瓨鍦ㄥ皬杞︾粦瀹氫换鍔�
BasSte basSte = basSteService.findByCrnNo(wrkMast.getCrnNo());
if(basSte == null) continue;
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index f97348f..33873d4 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -188,4 +188,15 @@
<select id="selectSteNoData" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where ste_no=#{steNo} and wrk_sts!=17 and wrk_sts!=18 order by io_pri desc,io_time,wrk_no asc
</select>
+
+ <select id="selectWrkStsAndIoType" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where 1=1 and wrk_sts>11 and (io_type==103 or io_type==107)
+ <if test="sour > 200">
+ and source_sta_no > 200
+ </if>
+ <if test="sour < 200">
+ and source_sta_no < 200
+ </if>
+
+ </select>
</mapper>
--
Gitblit v1.9.1