From 16a3bb1e935387cc7f89e02db42bd7a65904e915 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Fri, 29 Aug 2025 16:43:26 +0800
Subject: [PATCH] 11

---
 Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs     | 4 ++--
 Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuYanZheng.cs | 4 ++--
 Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs                    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs b/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs
index eb3895c..4859bef 100644
--- a/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs
+++ b/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs
@@ -52,10 +52,10 @@ namespace Pilot_KD_Parino.QPHY_AutoWrireRecord
 					 //GROUP BY a.FBILLNO,a.F_AMOUNT ";
 
             string sql = $@"/*dialect*/SELECT bb.F_CONTRACTNUMBER,bb.F_AMOUNT,fin.FBillAllAmount,bb.F_expenses, bb.FBILLNO
-        ,(fin.FBillAllAmount+bb.F_expenses-bb.F_AMOUNT) AS XiaoFamount
+        ,(bb.ZhengShuHeJi+bb.F_expenses-bb.F_AMOUNT) AS XiaoFamount
         ,b.FALLAMOUNT22
         FROM T_AutoWrireRecordEntry b         
-        INNER JOIN dbo.T_SAL_ORDER bb
+        INNER JOIN dbo.ZZV_SalOrder bb
         ON b.FBILLNO2=bb.FBILLNO
         INNER JOIN dbo.T_SAL_ORDERFIN fin ON bb.FID=fin.FID
        	WHERE  bb.FBILLNO in ('{bill}')";
diff --git a/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuYanZheng.cs b/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuYanZheng.cs
index 34a0d0c..c8fc7c5 100644
--- a/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuYanZheng.cs
+++ b/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuYanZheng.cs
@@ -38,10 +38,10 @@ namespace Pilot_KD_Parino.QPHY_AutoWrireRecord
                 //获取单据Id
                 string Id = sheet["Id"].ToString();
                 string sql = $@"/*dialect*/SELECT bb.F_CONTRACTNUMBER,bb.F_AMOUNT,fin.FBillAllAmount,bb.F_expenses, bb.FBILLNO
-        ,(fin.FBillAllAmount+bb.F_expenses-bb.F_AMOUNT) AS XiaoFamount
+        ,(bb.ZhengShuHeJi+bb.F_expenses-bb.F_AMOUNT) AS XiaoFamount
         ,b.FALLAMOUNT22
         FROM T_AutoWrireRecordEntry b         
-        INNER JOIN dbo.T_SAL_ORDER bb
+        INNER JOIN dbo.ZZV_SalOrder bb
         ON b.FBILLNO2=bb.FBILLNO
         INNER JOIN dbo.T_SAL_ORDERFIN fin ON bb.FID=fin.FID
        	WHERE b.fid={Id} ";
diff --git a/Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs b/Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs
index f2bb327..902af80 100644
--- a/Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs
+++ b/Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs
@@ -69,7 +69,7 @@ namespace Pilot_KD_Parino.SQL
                  C.FBILLALLAMOUNT_LC AS 'FALLAMOUNT'  ,     
 	             C.FBILLALLAMOUNT as 'FALLAMOUNTY',
                  ISNULL(A.F_AMOUNT,0) as 'FYAMOUNT',
-                 C.FBILLALLAMOUNT+a.F_EXPENSES-A.F_AMOUNT as 'FDAMOUNT2',
+                 a.ZhengShuHeJi+a.F_EXPENSES-A.F_AMOUNT as 'FDAMOUNT2',
 	             C.FSETTLECURRID as 'FCurr',
                  case when  DATEDIFF(MONTH, A.FDATE, GETDATE())<3 then 'True' else 'False' end as 'FIs30'   ,
                  '销售订单' as 'FTYPE',
@@ -106,7 +106,7 @@ GROUP BY  F_PaperNumber, FSALEORGID
  )  as FInvoiceAmount30Days
 ,[整单累计退货金额]=ISNULL((        
  SELECT SUM(CC.FBILLALLAMOUNT) AS '累计退货金额' 
-   FROM T_SAL_ORDER AA
+   FROM ZZV_SalOrder AA
     INNER JOIN T_SAL_ORDERFIN CC ON CC.FID =AA.FID                 
   WHERE AA.FDOCUMENTSTATUS= 'C' AND ISNULL(AA.F_CONTRACTNUMBER,'') !=''   AND   AA.F_contractnumber LIKE A.F_contractnumber+'%'
     AND AA.fid<>A.fid  AND aa.FSALEORGID=a.FSALEORGID),0)