From 28dacc09ae4a3da06a1115b278bff76c78a51cac Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 21 六月 2023 08:04:26 +0800
Subject: [PATCH] #可删除 用于审计数据筛选
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 4 ++++
src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java | 6 +++++-
src/main/resources/mapper/LocMastMapper.xml | 9 +++++++++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 1 +
src/main/java/com/zy/asrs/service/LocMastService.java | 1 +
5 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 8b095a0..f509034 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -24,4 +24,5 @@
List<LocMast> queryShallowLocFMast(@Param("crnNo") Integer crnNo);
LocMast queryNeedMoveShallLoc(Integer crnNo);
+ LocMast queryNeedMoveShallLocD(Integer crnNo);
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 49e8f2e..426ba41 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -39,5 +39,6 @@
List<LocMast> queryShallowLocFMast(Integer crnNo);
public LocMast queryNeedMoveShallLoc(Integer crnNo);
+ public LocMast queryNeedMoveShallLocD(Integer crnNo);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 5d3166a..ce25f4c 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -57,4 +57,8 @@
public LocMast queryNeedMoveShallLoc(Integer crnNo) {
return this.baseMapper.queryNeedMoveShallLoc(crnNo);
}
+ @Override
+ public LocMast queryNeedMoveShallLocD(Integer crnNo) {
+ return this.baseMapper.queryNeedMoveShallLocD(crnNo);
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
index 23ae539..03174ca 100644
--- a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
@@ -57,8 +57,12 @@
if(!Cools.isEmpty(crnp) && !Cools.isEmpty(crnp.getTankQty()) && crnp.getTankQty()==0){
continue;
}
-
LocMast locMast = locMastService.queryNeedMoveShallLoc(crnNo);
+ if (crnNo==2 || crnNo == 4){
+ locMast=locMastService.queryNeedMoveShallLocD(crnNo);
+ }
+
+
// LocMast targetLoc = locMastService.queryEmptyDeepLoc(crnNo);
if (!Cools.isEmpty(locMast)) {
workService.locMove(locMast.getLocNo(), 1L);
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index ef20262..65929ce 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -85,4 +85,13 @@
crn_no = #{crnNo} AND (loc_sts = 'F' OR loc_sts = 'D') and inv_wh = '0'
order by bay1,lev1
</select>
+ <select id="queryNeedMoveShallLocD" resultMap="BaseResultMap">
+ SELECT
+ TOP 1 *
+ FROM
+ asr_loc_mast
+ WHERE
+ crn_no = #{crnNo} AND (loc_sts = 'F' OR loc_sts = 'D') and inv_wh = '0'
+ order by bay1,lev1 Desc
+ </select>
</mapper>
--
Gitblit v1.9.1