From d453e3627b9f8f0096649a257390b445790aa8d0 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Mon, 3 Nov 2025 13:52:00 +0800
Subject: [PATCH] 1

---
 非C#代码文件/特价明细表SQL22.sql              | 32 +++----------------
 非C#代码文件/重置收款计划的已核销金额字段.sql | 24 ++++++++++----
 2 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/非C#代码文件/特价明细表SQL22.sql b/非C#代码文件/特价明细表SQL22.sql
index 9699701..7355d3d 100644
--- a/非C#代码文件/特价明细表SQL22.sql
+++ b/非C#代码文件/特价明细表SQL22.sql
@@ -230,7 +230,9 @@ WHERE
           (
               SELECT FID FROM #PaiChuGongSi
           )
-	 AND G.FNUMBER not LIKE 'V%'  AND   1=1  AND a.F_CONTRACTNUMBER like '%S202508080020X%'; /*dialect*/
+	 AND G.FNUMBER not LIKE 'V%'  AND   1=1  AND a.F_CONTRACTNUMBER like '%S202508080020X%'; 
+	 
+	 /*dialect*/
           /*dialect*/
 SELECT *
 INTO #TempTable3
@@ -392,33 +394,7 @@ FROM #PLChongDianZhuangHeTong ;
                     ON W1.FSID = W2.FENTRYID
             GROUP BY W2.FSID,
                      W2.FSBILLID
-        ) Aq
-            JOIN
-            (
-                SELECT W2.FSBILLID,
-                      
-                       SUM(W1.FPRICEUNITQTY) AS 'FRETNOTICEQTY',
-                       SUM(W1.FALLAMOUNT_LC) AS 'FBillAllAmount_LC'
-                FROM
-                (
-                    SELECT q1.FDATE,
-                           q3.FSID,
-                           q2.FALLAMOUNT_LC,
-                           q2.FPRICEUNITQTY
-                    FROM T_SAL_RETURNNOTICE q1
-                        JOIN T_SAL_RETURNNOTICEENTRY_F q2
-                            ON q1.FID = q2.FID
-                        JOIN T_SAL_RETURNNOTICEENTRY_LK q3
-                            ON q2.FENTRYID = q3.FENTRYID
-                    WHERE q1.FDOCUMENTSTATUS = 'C'
-                          AND q1.FCANCELSTATUS = 'A'
-                          AND q3.FSTABLENAME = 'T_SAL_ORDERENTRY'
-                ) W1
-                    JOIN T_SAL_ORDERENTRY_LK W2
-                        ON W1.FSID = W2.FENTRYID
-                GROUP BY W2.FSBILLID
-            ) Aq2
-                ON Aq.FSBILLID = Aq2.FSBILLID
+        ) Aq            
     ) B3 --���۶���-���������������˻���
         ON B.FENTRYID = B3.FSID
     JOIN T_SAL_ORDERFIN C --���۶���_�����
diff --git a/非C#代码文件/重置收款计划的已核销金额字段.sql b/非C#代码文件/重置收款计划的已核销金额字段.sql
index 1a587c6..56774aa 100644
--- a/非C#代码文件/重置收款计划的已核销金额字段.sql
+++ b/非C#代码文件/重置收款计划的已核销金额字段.sql
@@ -20,10 +20,12 @@ BEGIN
            a.FID,
            b.FENTRYID AS wfid,
            b.FRECADVANCEAMOUNT,
-           a.F_EXPENSES
+           a.F_EXPENSES,b.FRecAdvanceRate,a.F_TotalPositiveAmount,fin.FExchangeRate
     FROM dbo.T_SAL_ORDER a WITH (NOLOCK)
         LEFT JOIN dbo.T_SAL_ORDERPLAN b WITH (NOLOCK)
             ON a.FID = b.FID
+		LEFT JOIN T_SAL_RETURNNOTICEFIN fin WITH (NOLOCK)
+		ON a.fid=fin.FID
         --INNER JOIN
         --(
         --    SELECT DISTINCT
@@ -62,7 +64,10 @@ BEGIN
             @fid INT,
             @wfid INT,
             @FRecAdvanceAmount DECIMAL(18, 2),
-            @F_EXPENSES DECIMAL(18, 6);
+            @F_EXPENSES DECIMAL(18, 6),
+			@FRecAdvanceRate  DECIMAL(18, 6) ,
+			@F_TotalPositiveAmount   DECIMAL(18, 6),
+			@FExchangeRate  DECIMAL(18, 4);
     FETCH NEXT FROM cursor_name
     INTO @F_AMOUNT,
          @F_MBBA_Decimal_uky,
@@ -72,8 +77,10 @@ BEGIN
          @fid,
          @wfid,
          @FRecAdvanceAmount,
-         @F_EXPENSES;
-
+         @F_EXPENSES,
+		 @FRecAdvanceRate,
+	    @F_TotalPositiveAmount ,
+			@FExchangeRate   ;
     WHILE @@FETCH_STATUS = 0
     BEGIN
         -- ���ݴ����߼���ʾ�������
@@ -83,7 +90,7 @@ BEGIN
         BEGIN
             SELECT @rowId = @fid,@amount = @F_AMOUNT;
                    --@amount = @F_AMOUNT - @F_EXPENSES;
-
+             SELECT @FRecAdvanceAmount=@F_TotalPositiveAmount/@FExchangeRate*@FRecAdvanceRate*0.01;
         END;
 		PRINT  @amount;
         IF (@amount >= @FRecAdvanceAmount and @FRecAdvanceAmount>0)
@@ -91,7 +98,7 @@ BEGIN
 		    DECLARE @tempF_EXPENSES DECIMAL(18,2)=0;---��ʱ�˷ѱ���
 			
             UPDATE T_SAL_ORDERPLAN
-            SET F_MBBA_DECIMAL_UKY = @FRecAdvanceAmount+@F_EXPENSES*FRECADVANCERATE*0.01,@tempF_EXPENSES=@F_EXPENSES*FRECADVANCERATE*0.01
+            SET F_MBBA_DECIMAL_UKY = @FRecAdvanceAmount+@F_EXPENSES*FRECADVANCERATE*0.01,@tempF_EXPENSES=@F_EXPENSES*FRECADVANCERATE*0.01			
             WHERE FENTRYID = @wfid;
             SELECT @amount = @amount - @FRecAdvanceAmount-@tempF_EXPENSES;
         END;
@@ -124,7 +131,10 @@ BEGIN
              @fid,
              @wfid,
              @FRecAdvanceAmount,
-             @F_EXPENSES;
+             @F_EXPENSES,
+			@FRecAdvanceRate,
+			@F_TotalPositiveAmount ,
+			@FExchangeRate ;
     END;
 
     -- 4. �ر��α�