From 1d3924d3cea0a2195f0a178bc12f6da774d82788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Sun, 15 Mar 2026 15:41:50 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E6=8B=A3=E8=B4=A7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/StockOutTaskOrderDomainService.java   | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutTaskOrder/service/StockOutTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutTaskOrder/service/StockOutTaskOrderDomainService.java
index 4a841264d..0d40f47a2 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutTaskOrder/service/StockOutTaskOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutTaskOrder/service/StockOutTaskOrderDomainService.java
@@ -260,19 +260,12 @@ public class StockOutTaskOrderDomainService {
             if (quantityAll.compareTo(BigDecimal.ZERO) > 0 && pickingQuantityAll.compareTo(quantityAll) >= 0){
                 totalPickingMaterialQuantity += 1;
             }
-            // 过滤掉已拣货完成的明细，只展示待拣货的
-            List<TaskPickingMaterialDetailPO> incompleteList = taskPickingMaterialDetailPOListByStorage.stream()
-                    .filter(d -> d.getQuantity() != null && (d.getPickingQuantity() == null || d.getPickingQuantity().compareTo(d.getQuantity()) < 0))
-                    .collect(Collectors.toList());
-            if (CollectionUtil.isEmpty(incompleteList)){
-                continue;
-            }
             TaskStoragePO taskStoragePO = new TaskStoragePO();
-            BeanUtils.copyProperties(incompleteList.get(0), taskStoragePO);
+            BeanUtils.copyProperties(taskPickingMaterialDetailPOListByStorage.get(0), taskStoragePO);
             BigDecimal quantity = BigDecimal.ZERO;
             BigDecimal pickingQuantity = BigDecimal.ZERO;
             BigDecimal waitPickingQuantity = BigDecimal.ZERO;
-            for (TaskPickingMaterialDetailPO taskPickingMaterialDetailPO : incompleteList) {
+            for (TaskPickingMaterialDetailPO taskPickingMaterialDetailPO : taskPickingMaterialDetailPOListByStorage) {
                 quantity = quantity.add(taskPickingMaterialDetailPO.getQuantity());
                 pickingQuantity = pickingQuantity.add(taskPickingMaterialDetailPO.getPickingQuantity() != null ? taskPickingMaterialDetailPO.getPickingQuantity() : BigDecimal.ZERO);
                 waitPickingQuantity = waitPickingQuantity.add(taskPickingMaterialDetailPO.getWaitPickingQuantity() != null ? taskPickingMaterialDetailPO.getWaitPickingQuantity() : BigDecimal.ZERO);
@@ -284,12 +277,12 @@ public class StockOutTaskOrderDomainService {
             Integer pickingStatus = judgePickingQuantity(pickingQuantity, quantity);
             taskStoragePO.setPickingStatus(pickingStatus);
             // actualQuantity 为输入框字段，默认等于待拣货数量，供 PDA 表单默认展示
-            for (TaskPickingMaterialDetailPO d : incompleteList) {
+            for (TaskPickingMaterialDetailPO d : taskPickingMaterialDetailPOListByStorage) {
                 if (d.getWaitPickingQuantity() != null) {
                     d.setActualQuantity(d.getWaitPickingQuantity());
                 }
             }
-            taskStoragePO.setTaskPickingMaterialDetailList(incompleteList);
+            taskStoragePO.setTaskPickingMaterialDetailList(taskPickingMaterialDetailPOListByStorage);
             taskStoragePOList.add(taskStoragePO);
         }
         // 拣货进度：已完成数/拣货明细总数（按库位分组，几种库位就几种明细）