From 1a0bdd8df58435ec37e9d8345e67cd092902b5e4 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期六, 04 四月 2026 00:27:18 +0800
Subject: [PATCH] 序号控制
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 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 63e7cd2..82374e7 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -2,15 +2,26 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
+import com.zy.asrs.mapper.WrkMastLogMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.WrkMastService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
+@Slf4j
@Service("wrkMastService")
public class WrkMastServiceImpl extends ServiceImpl<WrkMastMapper, WrkMast> implements WrkMastService {
+
+ @Autowired
+ private WrkMastLogMapper wrkMastLogMapper;
@Override
public int getWorkingMast(Integer devpNo) {
@@ -27,4 +38,61 @@
return this.baseMapper.selectToBeHistoryData();
}
+ @Override
+ public WrkMast selectByBarcode(String barcode) {
+ List<WrkMast> wrkMasts = this.selectList(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+ if (Cools.isEmpty(wrkMasts)) {
+ return null;
+ }
+ return wrkMasts.get(0);
+ }
+
+ @Override
+ public int getStoreCount(Integer crnNo) {
+ return selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo)
+ .last(" and (wrk_sts in (1,2) or (wrk_sts=3 and wrk_no in (select wrk_no from asr_bas_devp)))"));
+ }
+
+ @Override
+ public int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo) {
+ return this.baseMapper.selectWrkMastBareBoardStaNo(ioType,staNo);
+ }
+
+ @Override
+ public List<WrkMast> selectWrkMastWrkDetl(Integer ioType, FindLocNoAttributeVo findLocNoAttributeVo, Integer crnNo) {
+ return this.baseMapper.selectWrkMastWrkDetl(ioType,findLocNoAttributeVo.getMatnr(),findLocNoAttributeVo.getBatch(),findLocNoAttributeVo.getBrand()
+ ,findLocNoAttributeVo.getStandby1(),findLocNoAttributeVo.getStandby2(),findLocNoAttributeVo.getStandby3()
+ ,findLocNoAttributeVo.getBoxType1(),findLocNoAttributeVo.getBoxType2(),findLocNoAttributeVo.getBoxType3()
+ ,crnNo);
+ }
+
+ @Override
+ public WrkMast selectWrkMast(Integer workNo, String barcode) {
+ return this.baseMapper.selectWrkMast(workNo, barcode);
+ }
+
+ @Override
+ public int outboundSeqMaxContiguousPlt(String userNo) {
+ List<Integer> fromMast = baseMapper.listOutboundPltTypesByUserNo(userNo);
+ List<Integer> fromLog = wrkMastLogMapper.listOutboundPltTypesByUserNo(userNo);
+ Set<Integer> filled = new HashSet<>();
+ addPositivePlt(fromMast, filled);
+ addPositivePlt(fromLog, filled);
+ int h = 0;
+ while (filled.contains(h + 1)) {
+ h++;
+ }
+ return h;
+ }
+
+ private static void addPositivePlt(List<Integer> list, Set<Integer> target) {
+ if (list == null) {
+ return;
+ }
+ for (Integer p : list) {
+ if (p != null && p > 0) {
+ target.add(p);
+ }
+ }
+ }
}
--
Gitblit v1.9.1