From a829dd34332bbc10c6b42ef86635ed48e34c6207 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 10:21:50 +0800
Subject: [PATCH] fix: 原料领料批号按可用库存过滤并实现先进先出

---
 src/main/resources/mapper/basic/ProductModelMapper.xml                              |   17 +++++++-
 src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java |   49 ++++++++++++++++++++++--
 src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java     |   32 ++++++++++++++++
 3 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java
index 554b95e..01187b1 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java
@@ -31,6 +31,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -599,13 +600,53 @@
             batchNoList = Collections.singletonList(null);
         }
 
+        // 鍏堟煡璇㈠悇鎵规搴撳瓨璁板綍锛屽苟鎸夐娆″叆搴撴椂闂村崌搴忔帓鍒楋紙鍏堣繘鍏堝嚭锛夛紝
+        // 涓嶄緷璧栧墠绔嬀閫夐『搴忥紝閬垮厤浜哄伐澶氶�夋椂鎵i敊鎵规銆�
+        Map<String, StockInventory> inventoryMap = new LinkedHashMap<>();
+        for (String currentBatchNo : batchNoList) {
+            inventoryMap.put(currentBatchNo,
+                    stockInventoryMapper.selectOne(buildStockWrapper(productModelId, currentBatchNo)));
+        }
+        // 棣栨鍏ュ簱鏃堕棿浠ュ叆搴撹褰曚负鍑嗭細鍘嗗彶鏁版嵁鎵归噺瀵煎叆鏃� stock_inventory.create_time 鍙兘鐩稿悓锛�
+        // 涓嶈兘鍑嗙‘鍙嶆槧鎵规鍏堝悗銆�
+        Map<String, LocalDateTime> firstInTimeMap = new HashMap<>();
+        List<String> nonNullBatchNoList = batchNoList.stream()
+                .filter(StringUtils::isNotEmpty)
+                .collect(Collectors.toList());
+        if (!nonNullBatchNoList.isEmpty()) {
+            List<StockInRecord> stockInRecords = stockInRecordService.list(
+                    Wrappers.<StockInRecord>lambdaQuery()
+                            .eq(StockInRecord::getProductModelId, productModelId)
+                            .in(StockInRecord::getBatchNo, nonNullBatchNoList));
+            for (StockInRecord stockInRecord : stockInRecords) {
+                if (stockInRecord == null || stockInRecord.getBatchNo() == null
+                        || stockInRecord.getCreateTime() == null) {
+                    continue;
+                }
+                firstInTimeMap.merge(stockInRecord.getBatchNo(), stockInRecord.getCreateTime(),
+                        (a, b) -> a.isBefore(b) ? a : b);
+            }
+        }
+        List<String> fifoBatchNoList = inventoryMap.entrySet().stream()
+                .sorted(Comparator
+                        .comparing((Map.Entry<String, StockInventory> entry) -> firstInTimeMap.get(entry.getKey()),
+                                Comparator.nullsLast(Comparator.naturalOrder()))
+                        .thenComparing(entry -> entry.getValue() == null ? null : entry.getValue().getCreateTime(),
+                                Comparator.nullsLast(Comparator.naturalOrder()))
+                        .thenComparing(entry -> {
+                            StockInventory inventory = entry.getValue();
+                            return inventory == null || inventory.getId() == null
+                                    ? Long.MAX_VALUE : inventory.getId();
+                        }))
+                .map(Map.Entry::getKey)
+                .collect(Collectors.toList());
+
         // 鍏堣绠楀悇鎵规鍙敤閲忥紝閬垮厤杈规墸杈圭畻瀵艰嚧鍒ゆ柇涓嶄竴鑷淬��
         Map<String, BigDecimal> availableQuantityMap = new LinkedHashMap<>();
         BigDecimal totalAvailableQuantity = BigDecimal.ZERO;
-        // 閬嶅巻鎵规锛岃绠楁瘡涓壒娆″彲鐢ㄥ簱瀛樸��
-        for (String currentBatchNo : batchNoList) {
-            // 鏌ヨ褰撳墠瑙勬牸+鎵规鐨勫簱瀛樿褰曘��
-            StockInventory stockInventory = stockInventoryMapper.selectOne(buildStockWrapper(productModelId, currentBatchNo));
+        // 鎸夊厛杩涘厛鍑洪『搴忚绠楁瘡涓壒娆″彲鐢ㄥ簱瀛樸��
+        for (String currentBatchNo : fifoBatchNoList) {
+            StockInventory stockInventory = inventoryMap.get(currentBatchNo);
             BigDecimal availableQuantity = BigDecimal.ZERO;
             if (stockInventory != null) {
                 availableQuantity = defaultDecimal(stockInventory.getQualitity())
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
index f64d44f..451f26e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -34,7 +34,9 @@
 import com.ruoyi.production.service.ProductionOrderService;
 import com.ruoyi.sales.mapper.SalesLedgerMapper;
 import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.stock.mapper.StockInRecordMapper;
 import com.ruoyi.stock.mapper.StockInventoryMapper;
+import com.ruoyi.stock.pojo.StockInRecord;
 import com.ruoyi.stock.pojo.StockInventory;
 import com.ruoyi.technology.mapper.*;
 import com.ruoyi.technology.pojo.*;
@@ -70,6 +72,7 @@
     private final QualityInspectFileMapper qualityInspectFileMapper;
     private final ProductionPlanMapper productionPlanMapper;
     private final StockInventoryMapper stockInventoryMapper;
+    private final StockInRecordMapper stockInRecordMapper;
     private final StorageAttachmentMapper storageAttachmentMapper;
     private final StorageBlobMapper storageBlobMapper;
     private final SalesLedgerMapper salesLedgerMapper;
@@ -1144,12 +1147,41 @@
             List<StockInventory> stockList = stockInventoryMapper.selectList(
                     Wrappers.<StockInventory>lambdaQuery()
                             .in(StockInventory::getProductModelId, productModelIds));
+            // 鍚勬壒娆¢娆″叆搴撴椂闂达紝鐢ㄤ簬鍏堣繘鍏堝嚭鎺掑簭锛堝巻鍙叉暟鎹鍏ユ椂搴撳瓨琛岀殑 create_time 鍙兘鐩稿悓锛�
+            Map<Long, Map<String, LocalDateTime>> firstInTimeMap = new HashMap<>();
+            List<StockInRecord> stockInRecords = stockInRecordMapper.selectList(
+                    Wrappers.<StockInRecord>lambdaQuery()
+                            .in(StockInRecord::getProductModelId, productModelIds)
+                            .isNotNull(StockInRecord::getBatchNo));
+            for (StockInRecord stockInRecord : stockInRecords) {
+                if (stockInRecord == null || stockInRecord.getProductModelId() == null
+                        || stockInRecord.getBatchNo() == null || stockInRecord.getCreateTime() == null) {
+                    continue;
+                }
+                firstInTimeMap.computeIfAbsent(stockInRecord.getProductModelId(), key -> new HashMap<>())
+                        .merge(stockInRecord.getBatchNo(), stockInRecord.getCreateTime(),
+                                (a, b) -> a.isBefore(b) ? a : b);
+            }
+            // 搴撳瓨琛屾寜鎵�灞炴壒娆$殑棣栨鍏ュ簱鏃堕棿鍗囧簭锛屼繚璇侀鏂欎笅鎷夋鏄厛杩涘厛鍑洪『搴�
+            stockList.sort(Comparator
+                    .comparing((StockInventory stockItem) -> {
+                        Map<String, LocalDateTime> modelBatchTimeMap = firstInTimeMap.get(stockItem.getProductModelId());
+                        return modelBatchTimeMap == null ? null : modelBatchTimeMap.get(stockItem.getBatchNo());
+                    }, Comparator.nullsLast(Comparator.naturalOrder()))
+                    .thenComparing(StockInventory::getCreateTime, Comparator.nullsLast(Comparator.naturalOrder()))
+                    .thenComparing(stockItem -> stockItem.getId() == null ? Long.MAX_VALUE : stockItem.getId()));
             for (StockInventory stockItem : stockList) {
                 if (stockItem == null || stockItem.getProductModelId() == null) {
                     continue;
                 }
                 Long productModelId = stockItem.getProductModelId();
                 stockQuantityMap.merge(productModelId, defaultDecimal(stockItem.getQualitity()), BigDecimal::add);
+                // 宸叉棤鍙敤搴撳瓨锛堟暟閲忔墸瀹屾垨琚攣瀹氾級鐨勬壒娆′笉鍐嶅甫鍒伴鏂欎笅鎷夋
+                BigDecimal availableQuantity = defaultDecimal(stockItem.getQualitity())
+                        .subtract(defaultDecimal(stockItem.getLockedQuantity()));
+                if (availableQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+                    continue;
+                }
                 String batchNo = stockItem.getBatchNo();
                 if (batchNo != null && !batchNo.trim().isEmpty()) {
                     stockBatchNoMap.computeIfAbsent(productModelId, key -> new LinkedHashSet<>()).add(batchNo);
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 6270b1d..a78f521 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -54,12 +54,25 @@
     </select>
 
     <select id="selectBatchNoListByProductModelId" resultType="java.lang.String">
-        select distinct si.batch_no
+        select si.batch_no
         from stock_inventory si
+        left join (
+            select sir.batch_no, min(sir.create_time) as first_in_time
+            from stock_in_record sir
+            where sir.product_model_id = #{productModelId}
+              and sir.batch_no is not null
+              and sir.batch_no != ''
+            group by sir.batch_no
+        ) first_in on first_in.batch_no = si.batch_no
         where si.product_model_id = #{productModelId}
           and si.batch_no is not null
           and si.batch_no != ''
-        order by si.batch_no
+          and si.qualitity - IFNULL(si.locked_quantity, 0) > 0
+        group by si.batch_no
+        order by MIN(first_in.first_in_time) is null,
+                 MIN(first_in.first_in_time),
+                 MIN(si.create_time),
+                 MIN(si.batch_no)
     </select>
     <select id="selectLatestRecord" resultType="com.ruoyi.basic.pojo.ProductModel">
             SELECT * FROM product_model

--
Gitblit v1.9.3