From fb57e7836338304b16c09fec4fb5c68fb688c39e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 四月 2026 14:03:24 +0800
Subject: [PATCH] 1.新增分区查询 2.任务档新增分区字段
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 149 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 149 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 ab394ec..114a7cc 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -3,17 +3,44 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.zy.asrs.entity.LocMast;
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.InboundCameraCaptureService;
+import com.zy.asrs.service.LocMastService;
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.Date;
+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;
+
+ @Autowired
+ private LocMastService locMastService;
+
+ @Override
+ public boolean insert(WrkMast entity) {
+ fillAreaId(entity);
+ return super.insert(entity);
+ }
+
+ @Override
+ public boolean updateById(WrkMast entity) {
+ fillAreaId(entity);
+ return super.updateById(entity);
+ }
@Override
public int getWorkingMast(Integer devpNo) {
@@ -31,6 +58,18 @@
}
@Override
+ public List<WrkMast> selectPendingInboundCameraCapture() {
+ return this.baseMapper.selectPendingInboundCameraCapture(
+ InboundCameraCaptureService.CAPTURE_PENDING,
+ InboundCameraCaptureService.CAPTURE_RUNNING);
+ }
+
+ @Override
+ public boolean updateMemoIfCurrent(Integer wrkNo, String current, String next) {
+ return this.baseMapper.updateMemoIfCurrent(wrkNo, current, next) > 0;
+ }
+
+ @Override
public WrkMast selectByBarcode(String barcode) {
List<WrkMast> wrkMasts = this.selectList(new EntityWrapper<WrkMast>().eq("barcode", barcode));
if (Cools.isEmpty(wrkMasts)) {
@@ -45,4 +84,114 @@
.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, String batchSeq) {
+ List<Integer> fromMast = baseMapper.listOutboundPltTypesByUserNo(userNo, batchSeq);
+ List<Integer> fromLog = wrkMastLogMapper.listOutboundPltTypesByUserNo(userNo, batchSeq);
+ Set<Integer> filled = new HashSet<>();
+ addPositivePlt(fromMast, filled);
+ addPositivePlt(fromLog, filled);
+ int h = 0;
+ while (filled.contains(h + 1)) {
+ h++;
+ }
+ return h;
+ }
+
+ @Override
+ public Date firstInboundCreateTimeByTrainNo(String trainNo) {
+ if (Cools.isEmpty(trainNo)) {
+ return null;
+ }
+ Date fromMast = baseMapper.selectFirstInboundCreateTimeByTrainNo(trainNo);
+ Date fromLog = wrkMastLogMapper.selectFirstInboundCreateTimeByTrainNo(trainNo);
+ if (fromMast == null) {
+ return fromLog;
+ }
+ if (fromLog == null) {
+ return fromMast;
+ }
+ return fromMast.before(fromLog) ? fromMast : fromLog;
+ }
+
+ @Override
+ public int finishedInboundPalletCountByTrainNo(String trainNo) {
+ if (Cools.isEmpty(trainNo)) {
+ return 0;
+ }
+ Set<Integer> wrkNos = new HashSet<>();
+ addPositiveWrkNos(baseMapper.listFinishedInboundWrkNosByTrainNo(trainNo), wrkNos);
+ addPositiveWrkNos(wrkMastLogMapper.listFinishedInboundWrkNosByTrainNo(trainNo), wrkNos);
+ return wrkNos.size();
+ }
+
+ 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);
+ }
+ }
+ }
+
+ private static void addPositiveWrkNos(List<Integer> list, Set<Integer> target) {
+ if (list == null) {
+ return;
+ }
+ for (Integer wrkNo : list) {
+ if (wrkNo != null && wrkNo > 0) {
+ target.add(wrkNo);
+ }
+ }
+ }
+
+ private void fillAreaId(WrkMast wrkMast) {
+ if (wrkMast == null) {
+ return;
+ }
+ LocMast locMast = resolveAreaLocMast(wrkMast);
+ if (locMast != null) {
+ wrkMast.setAreaId(locMast.getAreaId());
+ }
+ }
+
+ private LocMast resolveAreaLocMast(WrkMast wrkMast) {
+ boolean outbound = wrkMast.getIoType() != null && wrkMast.getIoType() >= 100;
+ LocMast primary = outbound
+ ? selectLocMast(wrkMast.getSourceLocNo())
+ : selectLocMast(wrkMast.getLocNo());
+ if (primary != null) {
+ return primary;
+ }
+ return outbound
+ ? selectLocMast(wrkMast.getLocNo())
+ : selectLocMast(wrkMast.getSourceLocNo());
+ }
+
+ private LocMast selectLocMast(String locNo) {
+ if (Cools.isEmpty(locNo)) {
+ return null;
+ }
+ return locMastService.selectById(locNo);
+ }
}
--
Gitblit v1.9.1