From fd69e79dd9861681e31893d7941b39571f49dca4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 15 十二月 2023 16:24:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 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..6c2cc0d 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,11 @@
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 javax.rmi.CORBA.Util;
+import java.util.ArrayList;
import java.util.List;
@Service("wrkMastService")
@@ -29,6 +32,34 @@
@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 WrkMast selectpj(Integer staNo, String barcode) {
+ return this.baseMapper.selectpj(staNo,barcode);
+ }
+
+ @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.getLocNo()) == lane) {
+ list.add(wrkMast);
+ }
+ }
+ return list;
}
}
--
Gitblit v1.9.1