From 5ded08f9ec1b7cef4e57a4d7334f0dc191e2dbb5 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期五, 24 十一月 2023 11:07:41 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++++- src/main/resources/mapper/TaskWrkMapper.xml | 4 +++- 2 files changed, 8 insertions(+), 2 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 7302374..25d9bca 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -259,11 +259,15 @@ * 2022-06-09 TQS淇敼锛屾煡璇㈠伐浣滄。LIST锛岄亶鍘嗕笅鍙戯紝闃叉绗竴涓换鍔″牭濉炲嚭搴� */ public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){ + List<TaskWrk> taskWrksInitial = taskWrkMapper.selectPakOut(slave.getId(), null); + if (taskWrksInitial.size()==0){ + return; + } for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) { List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", slave.getId()).eq("crn_stn", crnStn.getStaNo())); for (StaDesc staDesc : staDescs){ // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗� - List<TaskWrk> taskWrks = taskWrkMapper.selectPakOut(slave.getId(), staDesc.getStnNo().toString()); + List<TaskWrk> taskWrks = taskWrkMapper.selectPakOut(slave.getId(),staDesc.getStnNo().toString()); for (TaskWrk taskWrk : taskWrks){ if (taskWrk == null) { continue; diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml index c318b92..103e228 100644 --- a/src/main/resources/mapper/TaskWrkMapper.xml +++ b/src/main/resources/mapper/TaskWrkMapper.xml @@ -81,7 +81,9 @@ <select id="selectPakOut" resultMap="BaseResultMap"> select * from dbo.wcs_task_wrk where crn_no=#{crnNo} - and target_point=#{targetPoint} + <if test="targetPoint!=null and targetPoint!='' "> + and target_point=#{targetPoint} + </if> and wrk_sts=11 and io_type = 2 order by io_pri desc,create_time,wrk_no ASC -- Gitblit v1.9.1