From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人,维护时间默认当前 2.销售报价审核非必填,产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间,修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了,增加生产订单当前工序 3.库存导入模板规格改成图纸编号,产品名称可以为空,加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量(只统计二级)

---
 src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml b/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml
index 45f6109..9edbea4 100644
--- a/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml
@@ -18,10 +18,20 @@
             T1.tenant_id,
             T2.customer_contract_no,
             T3.customer_name,
-            T2.contract_amount
+            T2.contract_amount,
+            CASE WHEN T4.noInvoiceAmountTotal IS NULL THEN 0 ELSE T4.noInvoiceAmountTotal END AS noInvoiceAmountTotal
         FROM invoice_registration T1
         LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
         LEFT JOIN customer T3 ON T1.customer_id = T3.id
+        LEFT JOIN (
+            SELECT
+                SUM( no_invoice_amount ) AS noInvoiceAmountTotal ,
+                invoice_registration_id
+            FROM
+                invoice_registration_product
+            GROUP BY
+                invoice_registration_id
+        ) T4 ON T1.id = T4.invoice_registration_id
     </select>
 
     <select id="invoiceRegisAndProductExcelDtoList" resultType="com.ruoyi.sales.excel.InvoiceRegisAndProductExcelDto">

--
Gitblit v1.9.3