From 5b00928c8570a3ba21a1170b4642ef88635d90da Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 21 四月 2026 22:45:22 +0800
Subject: [PATCH] 1.对入库拍照功能解耦
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 82374e7..4a867e7 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -7,6 +7,7 @@
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.WrkMastService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,18 @@
@Override
public List<WrkMast> selectToBeHistoryData() {
return this.baseMapper.selectToBeHistoryData();
+ }
+
+ @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
@@ -72,9 +85,9 @@
}
@Override
- public int outboundSeqMaxContiguousPlt(String userNo) {
- List<Integer> fromMast = baseMapper.listOutboundPltTypesByUserNo(userNo);
- List<Integer> fromLog = wrkMastLogMapper.listOutboundPltTypesByUserNo(userNo);
+ 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);
--
Gitblit v1.9.1