From d8907012ca088a2da51405e87f28d2fce9463f37 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Tue, 8 Jul 2025 19:17:42 +0800
Subject: [PATCH] 1

---
 收款单核销流水存储过程.sql | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/收款单核销流水存储过程.sql b/收款单核销流水存储过程.sql
index 7d0247a..3660082 100644
--- a/收款单核销流水存储过程.sql
+++ b/收款单核销流水存储过程.sql
@@ -50,10 +50,10 @@ ORDER BY FDATE
 			,[ShouKuanBillNo]
 			,[ShouKuanFDate]
 			,[BenCiHeXiao]
-			,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID)
+			,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType])
 			( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE
 			,(CASE WHEN  b.FALLAMOUNT22<c.FALLAMOUNT33 THEN b.FALLAMOUNT22 ELSE c.FALLAMOUNT33 END)   
-			,@FSALEORGID,'���۵��Զ�������¼��',@fid2,dd.FExchangeRate,FSettleCurrId,FLocalCurrId FROM T_SAL_ORDER a
+			,@FSALEORGID,'���۵��Զ�������¼��',@fid2,dd.FExchangeRate,FSettleCurrId,FLocalCurrId,0 FROM T_SAL_ORDER a
 			LEFT JOIN T_AutoWrireRecordEntry  b 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
@@ -78,8 +78,8 @@ ORDER BY FDATE
 			   ,[ShouKuanBillNo]
 			   ,[ShouKuanFDate]
 			   ,[BenCiHeXiao]
-			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID)
-			   ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,@amount,@FSALEORGID,'����֪ͨ���ĺ�����¼��',@fid2, dd.FExchangeRate,FSettleCurrId,FLOCALCURRID FROM T_SAL_ORDER a
+			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType])
+			   ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,@amount,@FSALEORGID,'����֪ͨ���ĺ�����¼��',@fid2, dd.FExchangeRate,FSettleCurrId,FLOCALCURRID,0 FROM T_SAL_ORDER a
 			     LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID
 			     WHERE a.FSALEORGID=[FSaleOrgId] and a.F_CONTRACTNUMBER=@F_contractnumber)
 		END
@@ -109,9 +109,9 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE  b.FSRCBILLNO=@FBILLN
 			   ,[ShouKuanBillNo]
 			   ,[ShouKuanFDate]
 			   ,[BenCiHeXiao]
-			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID)
+			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType])
 			   ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,d.FCURWRITTENOFFAMOUNTFOR,@FSALEORGID,'Ӧ�պ�����¼��',@fid3
-			   ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID
+			   ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0
 			   FROM T_SAL_ORDER a
 			     LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID
 				 LEFT JOIN T_AR_receivable c ON c.F_PAPERPRO=a.F_CONTRACTNUMBER AND c.FSALEORGID=a.FSALEORGID
@@ -135,9 +135,9 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE  b.FSRCBILLNO=@FBILLN
 				,[ShouKuanBillNo]
 				,[ShouKuanFDate]
 				,[BenCiHeXiao]
-				,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID)
+				,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType])
 				( SELECT aa.fid,aa.FBILLNO,aa.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,b.FREALRECAMOUNT,@FSALEORGID,'�տ��Դ��ϸ',@fid2
-				,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID
+				,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0
 				FROM T_AR_RECEIVEBILL a LEFT JOIN T_AR_RECEIVEBILLSRCENTRY b ON a.FID=b.FID
 				LEFT JOIN dbo.T_SAL_ORDER aa ON b.FSRCBILLID=aa.FID
 				 LEFT JOIN T_SAL_ORDERFIN dd ON aa.FID=dd.FID
@@ -156,8 +156,8 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE  b.FSRCBILLNO=@FBILLN
 			   ,[ShouKuanBillNo]
 			   ,[ShouKuanFDate]
 			   ,[BenCiHeXiao]
-			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID)
-			   ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,F_shareAmount,@FSALEORGID,'��ʷ������¼��',c.FEntryID ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID FROM T_SAL_ORDER a
+			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType])
+			   ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,F_shareAmount,@FSALEORGID,'��ʷ������¼��',c.FEntryID ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 FROM T_SAL_ORDER a
 			    LEFT JOIN VRYF_t_Cust_Entry100021 c ON a.F_CONTRACTNUMBER=c.F_ORDERNO 
 			     LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID
 			     WHERE a.FSALEORGID=[FSaleOrgId] AND F_matched=1 AND c.F_Receiptnumber=@FBILLNO )