From 87006927ee0c219e61aac3411a680255297e349b Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 02 七月 2025 14:25:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 28 +++++++++++++++++++++++++++-
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 3 ---
src/main/resources/mapper/WrkMastMapper.xml | 7 -------
3 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 983cb84..fb466b9 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -28,9 +28,6 @@
List<WrkMast> selectBy2125();
- //鏌ヨ鎸囧畾妤煎眰浠诲姟
- List<WrkMast> selectWrkByLev(String lev);
-
List<WrkMast> selectShuttleWrkByLev(String lev);
List<WrkMast> selectShuttleOutWrkByLev(String lev);
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 6280cd9..0422e92 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -3,12 +3,16 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.utils.Utils;
+import com.zy.core.enums.WrkIoType;
import com.zy.core.enums.WrkStsType;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service("wrkMastService")
@@ -45,7 +49,29 @@
@Override
public List<WrkMast> selectWrkByLev(Integer lev) {
- return this.baseMapper.selectWrkByLev("%" + lev);
+ ArrayList<WrkMast> currentLevList = new ArrayList<>();
+ List<WrkMast> wrkMasts = this.baseMapper.selectList(new EntityWrapper<WrkMast>());
+ for (WrkMast wrkMast : wrkMasts) {
+ int wrkLev;
+ if (wrkMast.getIoType() == WrkIoType.IN.id) {
+ wrkLev = Utils.getLev(wrkMast.getLocNo());
+ } else if (wrkMast.getIoType() == WrkIoType.OUT.id) {
+ wrkLev = Utils.getLev(wrkMast.getSourceLocNo());
+ } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_MOVE.id) {
+ wrkLev = Utils.getLev(wrkMast.getLocNo());
+ } else if (wrkMast.getIoType() == WrkIoType.LOC_MOVE.id) {
+ wrkLev = Utils.getLev(wrkMast.getLocNo());
+ } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_CHARGE.id) {
+ wrkLev = Utils.getLev(wrkMast.getLocNo());
+ } else {
+ throw new CoolException("鏈煡浠诲姟绫诲瀷");
+ }
+
+ if (wrkLev == lev) {
+ currentLevList.add(wrkMast);
+ }
+ }
+ return currentLevList;
}
@Override
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 424ef07..0187fbe 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -73,13 +73,6 @@
order by io_pri desc,wrk_sts desc
</select>
- <select id="selectWrkByLev" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where 1=1
- and ((loc_no like #{lev}) or (source_loc_no like #{lev}))
- order by io_pri desc,wrk_sts desc
- </select>
-
<select id="selectShuttleWrkByLev" resultMap="BaseResultMap">
select * from asr_wrk_mast
where shuttle_no is not null
--
Gitblit v1.9.1