From 6779a9d49d15b109f3ed4246b41dd8eae98a2350 Mon Sep 17 00:00:00 2001 From: tqs <56479841@qq.com> Date: 星期五, 03 二月 2023 08:24:27 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 9 +++++++++ src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 1 + src/main/resources/mapper/WrkMastMapper.xml | 13 ++++++++++++- 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java index 7937184..787a46f 100644 --- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java @@ -116,6 +116,7 @@ List<WrkMast> selectWrkStsAndIoType(@Param("sour")Integer sour); List<WrkMast> selectWrkStsAndIoType0(@Param("sour")Integer sour); + List<WrkMast> selectWrkStsAndIoType1(@Param("sour")Integer sour); WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo); WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo); 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 8eb15b4..008e2cc 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -1076,6 +1076,15 @@ continue; } } + + if (wrkMast.getWrkSts() == 11 && wrkMast.getIoType() == 101){ + Integer sour = wrkMast.getSourceStaNo(); + List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType1(sour); + if (wrkMasts.size() > 0){ + News.error("MainServiceImpl 1028琛�"+"204瀛樺湪鍏ㄦ澘鍑哄簱涓揣鐗╋紝2鍙峰爢鍨涙満鏆傛椂绂佹鍏ㄦ澘鍑哄簱锛侊紒锛�"); + continue; + } + } } // 鍒ゆ柇鏄惁宸插瓨鍦ㄥ皬杞︾粦瀹氫换鍔� diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml index b7e6a71..caf77ad 100644 --- a/src/main/resources/mapper/WrkMastMapper.xml +++ b/src/main/resources/mapper/WrkMastMapper.xml @@ -201,7 +201,18 @@ </select> <select id="selectWrkStsAndIoType0" resultMap="BaseResultMap"> select * from dbo.asr_wrk_mast where 1=1 and wrk_sts>11 and io_type!=11 --- and (io_type=103 or io_type=107) + 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> + + <select id="selectWrkStsAndIoType1" resultMap="BaseResultMap"> + select * from dbo.asr_wrk_mast where 1=1 and wrk_sts>11 and io_type=101 <if test="sour > 200"> and source_sta_no > 200 </if> -- Gitblit v1.9.1