From 400169d87dee7a40802824875167a4dec4ef3bc0 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 24 四月 2026 15:34:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

---
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 5d27bf2..fb94028 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -608,7 +608,7 @@
                     }
                     lastDate = date;
                     salesLedger.setEntryDate(date);
-                    salesLedger.setContractAmount(importDto.getAmount());
+
                     salesLedger.setEntryPerson(loginUser.getUserId().toString());
                     salesLedger.setTenantId(matchedCustomer.getTenantId());
                     salesLedgerMapper.insert(salesLedger);
@@ -644,6 +644,8 @@
                         Long productModelId = productModelService.productModelAnticlockwise(productModelAnticlockwiseDto);
                         product.setProductModelId(productModelId);
                     }
+                    salesLedger.setContractAmount(product.getTaxInclusiveTotalPrice());
+                    salesLedgerMapper.updateById(salesLedger);
 
                     salesLedgerProductMapper.insert(product);
                     salesLedgerProductServiceImpl.addProductionData(product);

--
Gitblit v1.9.3