From 5677fd88b56cd69e416b52144734f3997ef8f8f4 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 28 四月 2026 16:29:12 +0800
Subject: [PATCH] 找库位

---
 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java |  105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 102 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..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,15 +3,19 @@
 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;
@@ -22,6 +26,21 @@
 
     @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) {
@@ -36,6 +55,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 +103,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);
@@ -83,6 +114,33 @@
             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) {
@@ -95,4 +153,45 @@
             }
         }
     }
+
+    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