From fc80e4040d6bf39b8657f94df1f957732bae26fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 四月 2026 22:02:31 +0800
Subject: [PATCH] 电视机入库出库显示耗时、托数功能修改： 1.入库耗时改成当前订单第一托入库任务创建时间到后续入库的创建时间相减转换成分钟 2.出库耗时改成当前订订单任务创建时间减去到达出库口的耗时时间 3.入库托数改成当前入库订单号累计入库数量
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 128 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 127 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 542452e..4fe55fb 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,28 @@
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.InboundCameraCaptureService;
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;
@Override
public int getWorkingMast(Integer devpNo) {
@@ -19,6 +32,119 @@
@Override
public List<WrkMast> selectToBeCompleteData() {
- return this.selectToBeCompleteData();
+ return this.baseMapper.selectToBeCompleteData();
+ }
+
+ @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
+ 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, 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);
+ }
+ }
}
}
--
Gitblit v1.9.1