From d5e8cbc39a363ec8a6cdc80360e2112fb3b2a9c0 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 十一月 2026 11:25:42 +0800
Subject: [PATCH] fix: 生产订单领料台账和详情调整

---
 src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickServiceImpl.java |  127 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 126 insertions(+), 1 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 598ae6b..cc5d8f5 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.math.RoundingMode;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -189,9 +190,108 @@
             return Collections.emptyList();
         }
         List<ProductionOrderPickVo> detailList = baseMapper.listPickedDetailByOrderId(productionOrderId);
+        fillStockQuantity(detailList);
         fillBatchNoList(detailList);
         fillSelectableBatchNoList(detailList);
         return detailList;
+    }
+
+    @Override
+    public List<ProductionOrderPickVo> listPickedRecordDetail(Long productionOrderId) {
+        // 棰嗘枡璇︽儏锛氭寜 production_order_pick_record 涓�鏉′竴琛岋紝灞曠ず姣忔棰嗗彇閲忥紝鑰屼笉鏄富鍗曟眹鎬汇��
+        if (productionOrderId == null) {
+            return Collections.emptyList();
+        }
+        List<ProductionOrderPickVo> detailList =
+                productionOrderPickRecordMapper.listPickedDetailByOrderId(productionOrderId);
+        allocateRecordReturnQuantity(detailList);
+        fillStockQuantity(detailList);
+        return detailList;
+    }
+
+    private void allocateRecordReturnQuantity(List<ProductionOrderPickVo> detailList) {
+        // 閫�鏂欐暟閲忔寜棰嗘枡涓诲崟姹囨�诲瓨鍌紝璇︽儏鎸夋祦姘存媶鍒嗗睍绀烘椂鎸夐鍙栭噺鍒嗘憡鍒版瘡鏉℃祦姘达紝
+        // 淇濊瘉鈥滃疄闄呮暟閲� = 棰嗗彇鏁伴噺 - 鍒嗘憡閫�鏂欌�濅笖鍚屼竴涓诲崟鍚勬祦姘村悎璁′笌涓诲崟涓�鑷淬��
+        if (detailList == null || detailList.isEmpty()) {
+            return;
+        }
+        Map<Long, List<ProductionOrderPickVo>> pickGroupMap = new LinkedHashMap<>();
+        for (ProductionOrderPickVo detail : detailList) {
+            if (detail == null || detail.getId() == null) {
+                continue;
+            }
+            pickGroupMap.computeIfAbsent(detail.getId(), key -> new ArrayList<>()).add(detail);
+        }
+        for (List<ProductionOrderPickVo> pickGroup : pickGroupMap.values()) {
+            BigDecimal totalReturnQty = BigDecimal.ZERO;
+            BigDecimal totalRecordQuantity = BigDecimal.ZERO;
+            for (ProductionOrderPickVo detail : pickGroup) {
+                totalReturnQty = defaultDecimal(detail.getReturnQty());
+                totalRecordQuantity = totalRecordQuantity.add(recordQuantity(detail));
+            }
+            if (totalRecordQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+                for (ProductionOrderPickVo detail : pickGroup) {
+                    detail.setReturnQty(BigDecimal.ZERO);
+                    detail.setActualQty(BigDecimal.ZERO);
+                }
+                continue;
+            }
+            BigDecimal effectiveReturnQty = totalReturnQty.min(totalRecordQuantity);
+            BigDecimal allocatedReturnQty = BigDecimal.ZERO;
+            for (int i = 0; i < pickGroup.size(); i++) {
+                ProductionOrderPickVo detail = pickGroup.get(i);
+                BigDecimal rowQuantity = recordQuantity(detail);
+                BigDecimal returnQty;
+                if (i == pickGroup.size() - 1) {
+                    returnQty = effectiveReturnQty.subtract(allocatedReturnQty);
+                } else {
+                    returnQty = effectiveReturnQty.multiply(rowQuantity)
+                            .divide(totalRecordQuantity, 4, RoundingMode.HALF_UP)
+                            .setScale(2, RoundingMode.HALF_UP);
+                }
+                if (returnQty.compareTo(rowQuantity) > 0) {
+                    returnQty = rowQuantity;
+                }
+                if (returnQty.compareTo(BigDecimal.ZERO) < 0) {
+                    returnQty = BigDecimal.ZERO;
+                }
+                detail.setReturnQty(returnQty);
+                detail.setActualQty(rowQuantity.subtract(returnQty));
+                allocatedReturnQty = allocatedReturnQty.add(returnQty);
+            }
+        }
+    }
+
+    private BigDecimal recordQuantity(ProductionOrderPickVo detail) {
+        return defaultDecimal(detail.getPickQuantity()).add(defaultDecimal(detail.getFeedingQty()));
+    }
+
+    private void fillStockQuantity(List<ProductionOrderPickVo> detailList) {
+        // 鎵归噺鏌ヨ鏄庣粏涓秹鍙婅鏍肩殑褰撳墠搴撳瓨鏁伴噺锛屼緵鍓嶇棰嗘枡鍙拌处灞曠ず銆�
+        if (detailList == null || detailList.isEmpty()) {
+            return;
+        }
+        Set<Long> productModelIdSet = detailList.stream()
+                .map(ProductionOrderPickVo::getProductModelId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+        if (productModelIdSet.isEmpty()) {
+            return;
+        }
+        List<StockInventory> stockList = stockInventoryMapper.selectList(
+                Wrappers.<StockInventory>lambdaQuery()
+                        .in(StockInventory::getProductModelId, productModelIdSet));
+        Map<Long, BigDecimal> stockQuantityMap = new HashMap<>();
+        for (StockInventory stockItem : stockList) {
+            if (stockItem == null || stockItem.getProductModelId() == null) {
+                continue;
+            }
+            stockQuantityMap.merge(stockItem.getProductModelId(),
+                    defaultDecimal(stockItem.getQualitity()), BigDecimal::add);
+        }
+        for (ProductionOrderPickVo detail : detailList) {
+            detail.setStockQuantity(stockQuantityMap.getOrDefault(detail.getProductModelId(), BigDecimal.ZERO));
+        }
     }
 
     private void processDeletePickIds(ProductionOrderPickDto rootDto,
@@ -430,7 +530,7 @@
         BigDecimal totalReturnQty = oldReturnQty.add(currentReturnQty);
         if (currentReturnQty.compareTo(BigDecimal.ZERO) > 0) {
             String returnBatchNo = resolveInventoryBatchNoFromStored(oldPick.getBatchNo());
-            addInventory(oldPick.getId(), oldPick.getProductModelId(), returnBatchNo, currentReturnQty, FEED_RETURN_IN_RECORD_TYPE);
+            addInventoryRecordOnly(oldPick.getId(), oldPick.getProductModelId(), returnBatchNo, currentReturnQty, FEED_RETURN_IN_RECORD_TYPE);
         }
 
         BigDecimal actualQty = defaultDecimal(oldPick.getQuantity())
@@ -737,6 +837,31 @@
         }
     }
 
+    private void addInventoryRecordOnly(Long recordId,
+                                        Long productModelId,
+                                        String batchNo,
+                                        BigDecimal quantity,
+                                        String stockInRecordType) {
+        // 浠呰褰曞叆搴撶敵璇凤紝涓嶅仛瀹℃牳閫氳繃銆�
+        BigDecimal addQuantity = defaultDecimal(quantity);
+        if (addQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+            return;
+        }
+        try {
+            StockInventoryDto stockInventoryDto = new StockInventoryDto();
+            stockInventoryDto.setProductModelId(productModelId);
+            stockInventoryDto.setBatchNo(batchNo);
+            stockInventoryDto.setQualitity(addQuantity);
+            stockInventoryDto.setRecordType(stockInRecordType);
+            stockInventoryDto.setRecordId(recordId == null ? 0L : recordId);
+            stockInventoryService.addStockInRecordOnly(stockInventoryDto);
+        } catch (ServiceException ex) {
+            throw ex;
+        } catch (Exception ex) {
+            throw new ServiceException("閫�鏂欏叆搴撹褰曚繚瀛樺け璐ワ細" + ex.getMessage());
+        }
+    }
+
     private List<ProductionOrderPickDto> resolvePickItems(ProductionOrderPickDto dto) {
         // 瑙f瀽鏂板鍦烘櫙鐨勯鏂欐槑缁嗛泦鍚堛��
         if (dto == null) {

--
Gitblit v1.9.3