From 0defc709881f76d12e4b96ac331fb30bdef12b0b Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Sat, 22 Feb 2025 10:25:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor(warehouse):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 processType1Receipt 方法，用于处理类型 1 的仓库收发存单
- 在该方法中清空出库单的供应商信息
- 优化了代码结构，提高了出库单处理的可读性和可维护性
---
 .../service/WarehouseReceiptService.java      | 56 ++++++++++++-------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java
index 7268f24f..a664fe3b 100644
--- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java
+++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java
@@ -76,6 +76,8 @@ public class WarehouseReceiptService
 
         processDetail(entity);
 
+        processType1Receipt(entity);
+
         this.repository.save(entity);
 
         if (request.getReceiptType().equals("2")) {
@@ -86,6 +88,23 @@ public class WarehouseReceiptService
         return getById(entity.getId());
     }
 
+    /**
+     * 出库单清空供应商
+     *
+     * @param entity
+     */
+    private void processType1Receipt(WarehouseReceiptEntity entity) {
+
+        if (entity.getReceiptType().equals("1")) {
+
+            if (CollectionUtils.isNotEmpty(entity.getDetail())) {
+
+                entity.getDetail()
+                        .forEach(item -> {item.setSupplier(null);});
+            }
+        }
+    }
+
     /**
      * 处理盘库单
      *
@@ -581,7 +600,7 @@ public class WarehouseReceiptService
                                                                                                               gc.code  as category_code,
                                                                                                               gc.name  as category_name,
                                                                                                               gs.enable_low_stock_warning as enable_low_stock_warning,
-                                                                                                              gs.low_stock_warning_number as low_stock_warning_number, 
+                                                                                                              gs.low_stock_warning_number as low_stock_warning_number,
 
                                                                                                               <#if shelveSummary>
                                                                                                                 ws.id as shelve_id,
@@ -839,25 +858,24 @@ from (
                                                     x instanceof Map
                                                             && ((Map) x).get("uid").equals(uid))
                                     .findFirst()
-                                    .orElseGet(() -> {
+                                    .orElseGet(
+                                            () -> {
+                                                HashMap<Object, Object> map = new HashMap<>();
 
-                                        HashMap<Object, Object> map = new HashMap<>();
-
-
-                                        map.put("prevNumber", 0.0);
-                                        map.put("prevAmount", 0.0);
-                                        map.put("prevPrice", 0.0);
-                                        map.put("currNumber", 0.0);
-                                        map.put("currAmount", 0.0);
-                                        map.put("currPrice", 0.0);
-                                        map.put("type0Number", 0.0);
-                                        map.put("type1Number", 0.0);
-                                        map.put("type0Amount", 0.0);
-                                        map.put("type1Amount", 0.0);
-                                        map.put("type0Price", 0.0);
-                                        map.put("type1Price", 0.0);
-                                        return map;
-                                    });
+                                                map.put("prevNumber", 0.0);
+                                                map.put("prevAmount", 0.0);
+                                                map.put("prevPrice", 0.0);
+                                                map.put("currNumber", 0.0);
+                                                map.put("currAmount", 0.0);
+                                                map.put("currPrice", 0.0);
+                                                map.put("type0Number", 0.0);
+                                                map.put("type1Number", 0.0);
+                                                map.put("type0Amount", 0.0);
+                                                map.put("type1Amount", 0.0);
+                                                map.put("type0Price", 0.0);
+                                                map.put("type1Price", 0.0);
+                                                return map;
+                                            });
 
             Double prevType0Number = NumberUtil.parseDouble(prevMap.get("type0Number") + "", 0.0);
             Double prevType1Number = NumberUtil.parseDouble(prevMap.get("type1Number") + "", 0.0);