From b93cb985259527c69a29e4bcd665ad3fa00156bb Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 05 三月 2024 17:22:35 +0800
Subject: [PATCH] #XGHYSRJTXC  优化

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    7 +++++++
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java         |    2 ++
 src/main/resources/mapper/WrkMastMapper.xml                 |    4 ++++
 3 files changed, 13 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 32176dd..3c2a10e 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -15,6 +15,8 @@
 
     WrkMast selectByLocNo1(@Param("sourceLocNo") String sourceLocNo);
 
+    WrkMast selectBy122ManQu(@Param("staNo") Integer staNo,@Param("ioType") Integer ioType,@Param("wrkSts") Long wrkSts);
+
 //    @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
     List<WrkMast> selectToBeCompleteData();
 
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 89bc94f..900bc6d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3972,6 +3972,13 @@
                     List<Integer> route = RouteUtils.getRoute(basRgvMap.getStartRoute(), basRgvMap.getEndRoute());
                     basRgvMap.setNowRoute(rgvProtocol.getRgvPosI()); //鏇存柊灏忚溅褰撳墠浣嶇疆绔欑偣鍙�
                     List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectNoInterfereList(route, route);
+                    WrkMast wrkMast = wrkMastMapper.selectBy122ManQu(122,110,15L);
+                    if (!Cools.isEmpty(wrkMast)){
+                        WrkMastSta wrkMastSta = wrkMastStaMapper.selectByWrkNo(wrkMast.getWrkNo().longValue());
+                        if (!Cools.isEmpty(wrkMastSta) && wrkMastSta.getType()==2 && wrkMastSta.getWrkType()==5 ){
+                            wrkMastStaList.add(wrkMastSta);
+                        }
+                    }
                     for (WrkMastSta wrkMastSta : wrkMastStaList){
                         if (wrkMastSta.getType()!=2 || wrkMastSta.getWrkType()!=5){// 2:绌烘澘  || 宸ヤ綔绫诲瀷  1:鍙栵紙鍙犵洏锛�  2锛氭媶鐩�  5锛氭弧鍙�  6锛氭弧鏀�
                             continue;
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index dbe1332..0c2e333 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -73,6 +73,10 @@
         select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} or loc_no = #{sourceLocNo}
     </select>
 
+    <select id="selectBy122ManQu"  resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast where sta_no = #{staNo} and io_type = #{ioType} and wrk_sts = #{wrkSts}
+    </select>
+
     <select id="selectToBeCompleteData" resultMap="BaseResultMap">
         select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
     </select>

--
Gitblit v1.9.1