From ca0565e53494417b3779759f8d3898e07bfd5929 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 14:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 90e4b07..303335c 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -87,6 +87,7 @@
private final InvoiceLedgerMapper invoiceLedgerMapper;
private final SalesLedgerSchedulingMapper salesLedgerSchedulingMapper;
+ private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
private final SalesLedgerWorkMapper salesLedgerWorkMapper;
@@ -750,12 +751,10 @@
ProductWorkOrder productWorkOrder = new ProductWorkOrder();
productStructureDtos.stream().forEach(productStructureDto -> {
if (productStructureDto.getProductModelId().equals(productProcessRouteItem.getProductModelId())){
- productWorkOrder.setQuantity(productStructureDto.getUnitQuantity().multiply(salesLedgerProduct.getQuantity()));
- productWorkOrder.setPlanQuantity(productWorkOrder.getQuantity());
+ productWorkOrder.setPlanQuantity(productWorkOrder.getPlanQuantity());
}
});
if (Objects.equals(productProcessRouteItem.getProductModelId(), salesLedgerProduct.getProductModelId())) {
- productWorkOrder.setQuantity(salesLedgerProduct.getQuantity());
productWorkOrder.setPlanQuantity(salesLedgerProduct.getQuantity());
}
productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
--
Gitblit v1.9.3