From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态(回款完成,未完成) 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制,过时后状态改为已过期

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

diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
index bb576cc..56003b7 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.sales.dto.InvoiceRegistrationDto;
 import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
@@ -63,7 +64,7 @@
             for (SalesLedgerProduct productDatum : productData) {
                 // 濡傛灉寮�绁ㄦ暟涓�0 璺宠繃
                 BigDecimal currentInvoiceNum = productDatum.getCurrentInvoiceNum();
-                if(null != currentInvoiceNum && BigDecimal.ZERO.compareTo(currentInvoiceNum) == 0){
+                if(null == currentInvoiceNum || BigDecimal.ZERO.compareTo(currentInvoiceNum) == 0){
                     continue;
                 }
                 invoiceAmountTotal = invoiceAmountTotal.add(currentInvoiceNum);
@@ -80,8 +81,13 @@
                 salesLedgerProductMapper.updateById(productDatum);
                 // 鏂板涓�鏉″紑绁ㄥ彴璐︽暟鎹�
                 InvoiceLedger invoiceLedger = new InvoiceLedger();
+                invoiceLedger.setInvoiceDate(salesLedgerDto.getIssueDate());
                 invoiceLedger.setInvoiceRegistrationProductId(invoiceRegistrationProduct.getId());
                 invoiceLedger.setInvoiceTotal(invoiceRegistrationProduct.getInvoiceAmount());
+                invoiceLedger.setInvoiceNo(salesLedgerDto.getInvoiceNo());
+                invoiceLedger.setCreateUser(SecurityUtils.getUserId().intValue());
+                invoiceLedger.setInvoicePerson(productDatum.getRegister());
+
                 invoiceLedgerMapper.insert(invoiceLedger);
             }
         }

--
Gitblit v1.9.3