From 3c0129480a0493bd87bf38273b23eae3099c3f3d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 21 十月 2025 15:03:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 ea48733..c1638cd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -5,8 +5,10 @@
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 org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service("wrkMastService")
@@ -29,6 +31,29 @@
@Override
public int getOutToStn182(Integer devpNo) {
- return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).eq("wrk_sts",12));
+ return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).in("wrk_sts",11,12));
+ }
+
+ @Override
+ public List<WrkMast> selectLaneWrkMast(Integer lane, Boolean pakIn) {
+ List<WrkMast> list = new ArrayList<>();
+
+ List<WrkMast> wrkMasts = null;
+ if (pakIn) {
+ wrkMasts = this.baseMapper.selectLaneWrkMastIn();
+ }else {
+ wrkMasts = this.baseMapper.selectLaneWrkMastOut();
+ }
+
+ if (wrkMasts == null) {
+ return list;
+ }
+
+ for (WrkMast wrkMast : wrkMasts) {
+ if (Utils.getLaneByLocNo(wrkMast.getIoType() > 100 ? wrkMast.getSourceLocNo() : wrkMast.getLocNo()) == lane) {
+ list.add(wrkMast);
+ }
+ }
+ return list;
}
}
--
Gitblit v1.9.1