From eb5487981fc08ba0f67378b2fa66e5ca28fabba5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 07 三月 2026 11:28:14 +0800
Subject: [PATCH] 区分工序计时还是计件 调整生产核算工资计算方法
---
src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
index 614fc20..d89119f 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
@@ -326,6 +326,14 @@
if(ObjectUtils.isEmpty(invoiceRegistrationProductDto)){
throw new RuntimeException("浜у搧寮�绁ㄥ彴璐︽煡鎵惧け璐�");
}
+ List<InvoiceRegistrationProduct> invoiceRegistrationProducts = invoiceRegistrationProductMapper.selectList(new LambdaQueryWrapper<InvoiceRegistrationProduct>()
+ .eq(InvoiceRegistrationProduct::getSalesLedgerProductId, invoiceRegistrationProductDto.getSalesLedgerProductId()));
+ if(CollectionUtils.isNotEmpty(invoiceRegistrationProducts)){
+ invoiceRegistrationProductDto.setNoInvoiceNum(invoiceRegistrationProductDto.getQuantity()
+ .subtract(invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getInvoiceNum).reduce(BigDecimal.ZERO, BigDecimal::add)));
+ invoiceRegistrationProductDto.setNoInvoiceAmount(invoiceRegistrationProductDto.getTaxInclusiveTotalPrice()
+ .subtract(invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getInvoiceAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));
+ }
// 鏌ヨ闄勪欢
QueryWrapper<InvoiceLedgerFile> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("invoice_ledger_id", invoiceRegistrationProductDto.getInvoiceLedgerId());
--
Gitblit v1.9.3