From 49dd9ee3dea22203cd1a0cc53745cffb6607122c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 十月 2025 18:28:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpSupplierWarehousingServiceImpl.java |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpSupplierWarehousingServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpSupplierWarehousingServiceImpl.java
index 1ee8e03..8754c39 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpSupplierWarehousingServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpSupplierWarehousingServiceImpl.java
@@ -554,22 +554,25 @@
             tErpSupplierOutboundGoods1.setTotalPrice(multiply);
             arrayList.add(tErpSupplierOutboundGoods1);
             add  = add.add(multiply);
+
+            TErpSupplierOutbound tErpSupplierOutbound = new TErpSupplierOutbound();
+            tErpSupplierOutbound.setOutboundType(dto.getOutboundType());
+            tErpSupplierOutbound.setOutboundReason(dto.getOutboundReason());
+            tErpSupplierOutbound.setWarehouseId(dto.getWarehouseId());
+            tErpSupplierOutbound.setSupplierId(supplierClinicId);
+            tErpSupplierOutbound.setTotalMoney(add);
+            String s = DateUtils.dateTimeNow();
+            tErpSupplierOutbound.setOutboundNumber("G" + s);
+            tErpSupplierOutbound.setGoodsId(tErpSupplierWarehousing.getGoodsId());
+            erpSupplierOutboundMapper.insert(tErpSupplierOutbound);
+
+            for (TErpSupplierOutboundGoods tErpSupplierOutboundGoods2 : arrayList) {
+                tErpSupplierOutboundGoods2.setOutboundId(tErpSupplierOutbound.getId());
+                erpSupplierOutboundGoodsMapper.insert(tErpSupplierOutboundGoods2);
+            }
+
         }
 
-        TErpSupplierOutbound tErpSupplierOutbound = new TErpSupplierOutbound();
-        tErpSupplierOutbound.setOutboundType(dto.getOutboundType());
-        tErpSupplierOutbound.setOutboundReason(dto.getOutboundReason());
-        tErpSupplierOutbound.setWarehouseId(dto.getWarehouseId());
-        tErpSupplierOutbound.setSupplierId(supplierClinicId);
-        tErpSupplierOutbound.setTotalMoney(add);
-        String s = DateUtils.dateTimeNow();
-        tErpSupplierOutbound.setOutboundNumber("G" + s);
-        erpSupplierOutboundMapper.insert(tErpSupplierOutbound);
-
-        for (TErpSupplierOutboundGoods tErpSupplierOutboundGoods : arrayList) {
-            tErpSupplierOutboundGoods.setOutboundId(tErpSupplierOutbound.getId());
-            erpSupplierOutboundGoodsMapper.insert(tErpSupplierOutboundGoods);
-        }
 
 
     }

--
Gitblit v1.7.1