From 6c8082f57b73967a34396f1eccff2943460e2004 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 15 一月 2026 17:04:32 +0800
Subject: [PATCH] feat(product): 生产出库和入库接口

---
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index 1dafbe4..1d3ff74 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -70,6 +70,7 @@
 //                .eq(SalesLedgerProduct::getType, salesLedgerProduct.getType());
         List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectSalesLedgerProductList(salesLedgerProduct);
         if(!CollectionUtils.isEmpty(salesLedgerProducts)){
+            // 寮�绁�
             InvoiceRegistrationProductDto invoiceRegistrationProductDto = new InvoiceRegistrationProductDto();
             invoiceRegistrationProductDto.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId().intValue());
             List<InvoiceRegistrationProductDto> invoiceRegistrationProductDtoList = invoiceRegistrationProductMapper.invoiceRegistrationProductList(invoiceRegistrationProductDto);
@@ -78,14 +79,20 @@
                 for (SalesLedgerProduct ledgerProduct : salesLedgerProducts) {
                     BigDecimal invoiceNum = BigDecimal.ZERO;
                     BigDecimal invoiceAmount = BigDecimal.ZERO;
+                    BigDecimal noInvoiceNum = BigDecimal.ZERO;
+                    BigDecimal noInvoiceAmount = BigDecimal.ZERO;
                     for (InvoiceRegistrationProductDto registrationProductDto : invoiceRegistrationProductDtoList) {
                         if(ledgerProduct.getId().intValue() == registrationProductDto.getSalesLedgerProductId()){
                             invoiceNum =  invoiceNum.add(registrationProductDto.getInvoiceNum());
                             invoiceAmount = invoiceAmount.add(registrationProductDto.getInvoiceAmount());
+                            noInvoiceNum = ledgerProduct.getQuantity().subtract(invoiceNum);
+                            noInvoiceAmount = ledgerProduct.getTaxInclusiveTotalPrice().subtract(invoiceAmount);
                         }
                     }
                     ledgerProduct.setInvoiceNum(invoiceNum);
                     ledgerProduct.setInvoiceAmount(invoiceAmount);
+                    ledgerProduct.setNoInvoiceNum(noInvoiceNum);
+                    ledgerProduct.setNoInvoiceAmount(noInvoiceAmount);
                 }
             }
 
@@ -222,6 +229,7 @@
                         ProductWorkOrder productWorkOrder = new ProductWorkOrder();
                         productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
                         productWorkOrder.setProductOrderId(productOrder.getId());
+                        productWorkOrder.setQuantity(salesLedgerProduct.getQuantity());
                         productWorkOrder.setPlanQuantity(salesLedgerProduct.getQuantity());
                         productWorkOrder.setWorkOrderNo(workOrderNoStr);
                         productWorkOrder.setStatus(1);

--
Gitblit v1.9.3