From a6df28ad29d23ea87693b0dc029049a358cf5add Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Thu, 7 Aug 2025 15:33:34 +0800
Subject: [PATCH] 11

---
 .../SBUYingShouBiao/SBUYingShouBiao.cs        |  3 +-
 非C#代码文件/收款单核销流水存储过程.sql       | 69 +++++++++++--------
 2 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs b/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs
index c3fe72e..3690e66 100644
--- a/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs
+++ b/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs
@@ -261,7 +261,8 @@ FROM T_SAL_ORDERFIN aa
             result.Add(new SummaryField("预发货回款额", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));
             result.Add(new SummaryField("预发货回款率", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));
             result.Add(new SummaryField("回款目标", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));
-            
+            result.Add(new SummaryField("仪表发货金额", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));
+            result.Add(new SummaryField("系统验收金额", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));
 
             return result;
         }
diff --git a/非C#代码文件/收款单核销流水存储过程.sql b/非C#代码文件/收款单核销流水存储过程.sql
index f293578..baef28f 100644
--- a/非C#代码文件/收款单核销流水存储过程.sql
+++ b/非C#代码文件/收款单核销流水存储过程.sql
@@ -13,7 +13,7 @@ CREATE PROCEDURE dbo.PR_YingShouSBU_yuyubo @BeginDATE DATETIME='2024-01-01'
 AS
 BEGIN
 
-DELETE [ZZZ_HeXiaoBook] WHERE [ShouKuanFDate]>=@BeginDATE
+DELETE [ZZZ_HeXiaoBook] WHERE [ShouKuanFDate]>=@BeginDATE OR ShouKuanType>0
 
 DECLARE @FDATE DATETIME,@FBILLNO NVARCHAR(200),@ShouKuanFID INT,@FSALEORGID INT ,@F_contractnumber NVARCHAR(2000),@fid2 INT,@fid3 INT,@amount DECIMAL(18,2),@hexiao DECIMAL(18,2)
 ,@remark NVARCHAR(200);
@@ -53,7 +53,7 @@ ORDER BY FDATE
 			,[BenCiHeXiao]
 			,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark)
 			( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE
-			,(CASE WHEN  b.FALLAMOUNT22<c.FALLAMOUNT33 THEN b.FALLAMOUNT22 ELSE c.FALLAMOUNT33 END)   
+			,b.FALLAMOUNT22
 			,@FSALEORGID,'���۵��Զ�������¼��',@fid2,dd.FExchangeRate,FSettleCurrId,FLocalCurrId,0
 		    ,head.F_NOTE
 			FROM T_SAL_ORDER a
@@ -210,17 +210,31 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE  b.FSRCBILLNO=@FBILLN
 
     -- 5. �ͷ��α���Դ
     DEALLOCATE cursor_name2;
+  
+    INSERT INTO [dbo].[ZZZ_HeXiaoBook]
+			   ([XiaoShouFid]
+			   ,[XiaoShouBillNo]
+			   ,[XiaoShouHeTong]
+			   ,[ShouKuanFid]
+			   ,[ShouKuanBillNo]
+			   ,[ShouKuanFDate]
+			   ,[BenCiHeXiao]
+			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark)
+	      
+		 ( SELECT   a.fid AS [XiaoShouFid],a.FBILLNO,a.F_CONTRACTNUMBER,b.FEntryID,head.FBILLNO,head.F_YEWUDATE
+			,b.FALLAMOUNT22   
+			,a.FSaleOrgId,'���۵������۵�����',head.FID AS heahid,dd.FExchangeRate,FSettleCurrId,FLocalCurrId,2
+		    ,head.F_NOTE
+			FROM  T_AutoWrireRecordEntry b
+			LEFT JOIN T_SAL_ORDER a ON a.FBILLNO=b.FBILLNO2
+			LEFT JOIN T_AutoWrireRecordEntry2 c  ON b.FID=c.FID		
+			LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID
+		    LEFT JOIN T_AutoWrireRecord head ON b.FID=head.FID
+			WHERE    head.FDOCUMENTSTATUS='C' AND c.FID IS NULL 
+		   )
 
---SELECT a.XiaoShouFid,a.XiaoShouBillNo,[XiaoShouHeTong],a.ShouKuanFDate,b.Ԥ�Ƶ���ʱ��,b.����ʱ�� FROM [ZZZ_HeXiaoBook] a
---LEFT JOIN (SELECT b.���۵�����ID,MAX(b.Ԥ�Ƶ���ʱ��) AS Ԥ�Ƶ���ʱ�� ,max (b.����ʱ��) AS ����ʱ��  FROM  [ZRP_YingShouMingXi_yuyubo] b GROUP BY  ���۵�����ID) b
---ON a.XiaoShouFid=b.���۵�����ID
---ORDER BY a.XiaoShouFid
+  
 
- UPDATE  [ZZZ_HeXiaoBook] SET  ZhangLing= ISNULL(  ROUND( DATEDIFF(DAY,[����ʱ��],[ZZZ_HeXiaoBook].ShouKuanFDate) / 30,0) ,0 ) 
- FROM (SELECT a.XiaoShouFid,a.XiaoShouBillNo,[XiaoShouHeTong],a.ShouKuanFDate,b.Ԥ�Ƶ���ʱ��,b.����ʱ�� FROM [ZZZ_HeXiaoBook] a
-LEFT JOIN (SELECT b.���۵�����ID,MAX(b.Ԥ�Ƶ���ʱ��) AS Ԥ�Ƶ���ʱ�� ,max (b.����ʱ��) AS ����ʱ��  FROM  [ZRP_YingShouMingXi_yuyubo] b GROUP BY  ���۵�����ID) b
-ON a.XiaoShouFid=b.���۵�����ID) b
-WHERE [ZZZ_HeXiaoBook].XiaoShouFid=b.XiaoShouFid
 
 --------�������������----------
 
@@ -237,8 +251,7 @@ WHERE a.FMATCHMETHODID=30
   )
 ORDER BY a.FVERIFYSEQ
 
-
-      INSERT INTO [dbo].[ZZZ_HeXiaoBook]
+             INSERT INTO [dbo].[ZZZ_HeXiaoBook]
 			   ([XiaoShouFid]
 			   ,[XiaoShouBillNo]
 			   ,[XiaoShouHeTong]
@@ -248,8 +261,8 @@ ORDER BY a.FVERIFYSEQ
 			   ,[BenCiHeXiao]
 			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark)
 			   ( 
-			   SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,d.FVERIFYSEQ,d.FSRCBILLNO,FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR,a.FSALEORGID,'�������û���տ',FVERIFYSEQ
-			   ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0  ,''
+			   SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,0,d.FSRCBILLNO,FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR,a.FSALEORGID,'�������û���տ',FVERIFYSEQ
+			   ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,1  ,''
 			   FROM T_SAL_ORDER a
 			     LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID			 
 				 INNER JOIN
@@ -259,21 +272,23 @@ ORDER BY a.FVERIFYSEQ
 				 ) c
 				 ON c.F_PAPER=a.F_CONTRACTNUMBER AND c.FSALEORGID=a.FSALEORGID
 				 INNER JOIN #temp222 d ON d.FSRCBILLID=c.fid AND d.FBILLFORMID ='AR_receivable'
-			     WHERE   d.FBILLFORMID='AR_receivable'  AND a.FDOCUMENTSTATUS='C'	 
-				 --AND d.FVERIFYSEQ=109376
-				 ORDER BY d.FVERIFYSEQ
-
+			     WHERE   d.FBILLFORMID='AR_receivable'  AND a.FDOCUMENTSTATUS='C'
 				 )
+               DROP TABLE  #temp222
 
-				 --SELECT * FROM #temp222
-				 --WHERE FVERIFYSEQ=109376
+ UPDATE  [ZZZ_HeXiaoBook] SET  ZhangLing= ISNULL(  ROUND( DATEDIFF(DAY,[����ʱ��],[ZZZ_HeXiaoBook].ShouKuanFDate) / 30,0) ,0 ) 
+ FROM (SELECT a.XiaoShouFid,a.XiaoShouBillNo,[XiaoShouHeTong],a.ShouKuanFDate,b.Ԥ�Ƶ���ʱ��,b.����ʱ�� FROM [ZZZ_HeXiaoBook] a
+LEFT JOIN (SELECT b.���۵�����ID,MAX(b.Ԥ�Ƶ���ʱ��) AS Ԥ�Ƶ���ʱ�� ,max (b.����ʱ��) AS ����ʱ��  FROM  [ZRP_YingShouMingXi_yuyubo] b GROUP BY  ���۵�����ID) b
+ON a.XiaoShouFid=b.���۵�����ID) b
+WHERE [ZZZ_HeXiaoBook].XiaoShouFid=b.XiaoShouFid
 
-DROP TABLE  #temp222
-SELECT  FVERIFYDATE,FBILLFORMID, FVERIFYSEQ,FSOURCETYPE,FCURWRITTENOFFAMOUNTFOR,FCURWRITTENOFFAMOUNT,FSRCBILLNO,b.FEXCHANGERATE,FCURTAXMATCHAMOUNT,FCURNOTAXMATCHAMOUNT  ,FSRCBILLID,a.FMATCHMETHODID		 
-FROM T_AR_RECMacthLog a 
-LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID
-LEFT JOIN T_BAS_BILLTYPE c ON b.FSOURCETYPE=c.FBILLTYPEID 
-WHERE a.FVERIFYSEQ =100135
+
+
+--SELECT  FVERIFYDATE,FBILLFORMID, FVERIFYSEQ,FSOURCETYPE,FCURWRITTENOFFAMOUNTFOR,FCURWRITTENOFFAMOUNT,FSRCBILLNO,b.FEXCHANGERATE,FCURTAXMATCHAMOUNT,FCURNOTAXMATCHAMOUNT  ,FSRCBILLID,a.FMATCHMETHODID		 
+--FROM T_AR_RECMacthLog a 
+--LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID
+--LEFT JOIN T_BAS_BILLTYPE c ON b.FSOURCETYPE=c.FBILLTYPEID 
+--WHERE a.FVERIFYSEQ =100135
 
   END