From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 d5b6da9..07f81ef 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")
@@ -37,4 +40,40 @@
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;
+ }
+
+ @Override
+ public WrkMast selectByworkNo(Short workNo) {
+ return this.baseMapper.selectByWrkNo(Integer.valueOf(workNo));
+ }
+ @Override
+ public WrkMast selectByworkNo(Integer workNo) {
+ return this.baseMapper.selectByWrkNo(workNo);
+ }
+
+ @Override
+ public WrkMast getLastWrkMast105() {
+ return this.baseMapper.getLastWrkMast105();
+ }
}
--
Gitblit v1.9.1