From efbd157c0d810c39d04cd86752e769a3f3a1a1fc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 11 九月 2025 16:57:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
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..bf2033e 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
@@ -97,8 +123,9 @@
, WrkStsType.NEW_CHARGE.sts
, WrkStsType.CHARGE_SHUTTLE_RUN.sts
- , WrkStsType.CHARGE_SHUTTLE_WORKING.sts
- , WrkStsType.CHARGE_SHUTTLE_COMPLETE.sts
+ , WrkStsType.CHARGE_SHUTTLE_RUN_COMPLETE.sts
+ , WrkStsType.CHARGE_SHUTTLE_CHARGING.sts
+ , WrkStsType.CHARGE_SHUTTLE_CHARGING_COMPLETE.sts
).eq("shuttle_no", shuttleNo));
if (Cools.isEmpty(wrkMasts)) {
return false;
--
Gitblit v1.9.1