From 1ca78d9eebf459a417ea1339d0bcfd32837b517d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 31 十月 2023 15:02:47 +0800
Subject: [PATCH] 移库优化
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 +++++++++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 3 +++
src/main/resources/mapper/WrkMastMapper.xml | 6 +++++-
3 files changed, 19 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 8a4dc4e..7e804f0 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -49,6 +49,9 @@
// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no")
WrkMast selectLocMove(@Param("crnNo")Integer crnNo);
+ //鏀堕泦鎵�鏈夌Щ搴撲换鍔�
+ List<WrkMast> selectLocMoves(@Param("crnNo")Integer crnNo);
+
WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
WrkMast selectWorking(@Param("crnNo")Integer crnNo);
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 bf0cfc9..a81df0c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1103,11 +1103,22 @@
* 搴撲綅绉昏浆
*/
public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
+ //鑾峰彇鎵�鏈夌Щ搴撲换鍔�
+ List<WrkMast> wrkMasts=wrkMastMapper.selectLocMoves(slave.getId());
// 鑾峰彇宸ヤ綔妗ｄ俊鎭�
WrkMast wrkMast = wrkMastMapper.selectLocMove(slave.getId());
+ if(Cools.isEmpty(wrkMasts)){
+ return;
+ }
if (null == wrkMast) {
return;
}
+ for (WrkMast wm: wrkMasts) {
+ if(wm.getMk().equals('Y')){
+ wrkMast=wm;
+ break;
+ }
+ }
// 鑾峰彇婧愬簱浣嶄俊鎭�
LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
if (null == sourceSta) {
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 89a3b35..89141d7 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -108,7 +108,11 @@
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} and mk = 'Y' order by io_pri desc,io_time ASC,wrk_no ASC
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_pri desc,io_time ASC,wrk_no ASC
+ </select>
+
+ <select id="selectLocMoves" resultMap="BaseResultMap">
+ select from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_pri desc,io_time ASC,wrk_no ASC
</select>
<select id="selectLocMoving" resultMap="BaseResultMap">
--
Gitblit v1.9.1