From f37e90b14d191bd568a20260658f163c9efbfca6 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Tue, 28 Oct 2025 19:05:11 +0800
Subject: [PATCH] 99

---
 国庆后的需求变化.txt         | 6 ++++++
 非C#代码文件/应收明细SQL.sql | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/国庆后的需求变化.txt b/国庆后的需求变化.txt
index 63632fc..e802a06 100644
--- a/国庆后的需求变化.txt
+++ b/国庆后的需求变化.txt
@@ -39,3 +39,9 @@
 产品分类= A
 A（储能、微电风、光储充）剩余部分  OK 
 
+
+
+2025-10-28
+郭靖：
+目前系统里C和CS合同模板需新增文档中标黄的部分@格致--余宇波 @贺光波 
+同时，系统里C合同还需要新增一个模板
diff --git a/非C#代码文件/应收明细SQL.sql b/非C#代码文件/应收明细SQL.sql
index 25d0954..43fd239 100644
--- a/非C#代码文件/应收明细SQL.sql
+++ b/非C#代码文件/应收明细SQL.sql
@@ -339,14 +339,14 @@ UPDATE  [ZRP_YingShouMingXi_yuyubo] SET [
  SELECT  
 STRING_AGG(CONVERT(NVARCHAR(10),kaipiaoriqi,23)+'---'+FORMAT( F_GeneralInvoice,'0.00')+'Ԫ',',')[��Ʊ����2] FROM (
 SELECT   F_PaperNumber, t0.FSALEORGID,
-	CASE WHEN   F_ORDERCATEGORY ='67283ced82f38d' THEN FINVOICEDATE
-	WHEN   F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN NULL ELSE FINVOICEDATE END AS kaipiaoriqi
+	CASE WHEN   F_ORDERCATEGORY ='67283ced82f38d' THEN t0.FDATE
+	WHEN   F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN NULL ELSE t0.FDATE END AS kaipiaoriqi
 	,CASE WHEN   F_ORDERCATEGORY ='67283ced82f38d' THEN FAFTERTOTALTAX
 	WHEN   F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN 0 ELSE FAFTERTOTALTAX END AS F_GeneralInvoice
 	--FAFTERTOTALTAX 
 FROM T_IV_SALESIC t0 WITH(NOLOCK)
 INNER JOIN  T_SAL_ORDER aa1 WITH(NOLOCK) ON t0.F_PAPERNUMBER=aa1.F_contractnumber AND t0.FSETTLEORGID=aa1.FSALEORGID
- WHERE T0.FREDBLUE=0
+ WHERE T0.FREDBLUE=0 AND t0.FDOCUMENTSTATUS='C'
 ) tt
 WHERE ISNULL(kaipiaoriqi,'')!='' AND F_PaperNumber=[ֽ�ʺ�ͬ��] AND FSALEORGID=��֯ID
 GROUP BY  F_PaperNumber, FSALEORGID