From acf50fa155a02656f4a892a38fd774b9b1b78dfd Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Mon, 11 Aug 2025 18:37:05 +0800
Subject: [PATCH] 1

---
 Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs | 7 ++++---
 更新核销金额.sql                                       | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs b/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs
index d5a291d..a38d363 100644
--- a/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs
+++ b/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs
@@ -45,9 +45,10 @@ namespace Pilot_KD_Parino.QPHY_AutoWrireRecord
 
             var billList = list1.Select(t => t["FBILLNO2"]).ToList();
             string bill = string.Join("','",billList);
-            string sql = $@"/*dialect*/ SELECT a.FBILLNO,(b.FBillAllAmount- isnull(a.F_AMOUNT,0)) as F_AMOUNT FROM dbo.T_SAL_ORDER a
-					 LEFT JOIN dbo.T_SAL_ORDERFIN b ON a.FID=b.FID
-					 WHERE a.FBILLNO in ('{bill}')  ";
+            string sql = $@"/*dialect*/ SELECT a.FBILLNO,(SUM(c.FAllAmount)- isnull(a.F_AMOUNT,0)) as F_AMOUNT FROM dbo.T_SAL_ORDER a				 
+					 LEFT JOIN dbo.T_SAL_ORDERENTRY_F c ON a.FID=c.FID
+					 WHERE a.FBILLNO in ('{bill}') AND c.FAllAmount>0
+					 GROUP BY a.FBILLNO,a.F_AMOUNT ";
             var data = DBServiceHelper.ExecuteDynamicObject(this.Context, sql);
             var one1 = (from q in data
                         join b in list1 on q["FBILLNO"].ToString() equals b["FBILLNO2"].ToString()
diff --git a/更新核销金额.sql b/更新核销金额.sql
index 86568be..f584d14 100644
--- a/更新核销金额.sql
+++ b/更新核销金额.sql
@@ -28,7 +28,7 @@ SELECT @cusId2=a.FCONTACTUNIT FROM dbo.T_AR_RECEIVEBILL a
 LEFT JOIN T_AutoWrireRecordEntry2 b ON a.FBILLNO=b.FBILLNO3
 WHERE b.fid=@fid
 
-IF(@custID1 !=@cusId2 )
+IF(@custID1 >0 AND @cusId2 >0 and @custID1 !=@cusId2 )
 begin 
   UPDATE T_AutoWrireRecord SET F_KUAKEHU='��' WHERE FID=@fid
   update T_AutoWrireRecord SET F_YeWuDate=FCreateDate
@@ -36,7 +36,7 @@ begin
  end
 ELSE
 begin
-  UPDATE T_AutoWrireRecord SET F_KUAKEHU='��' WHERE FID=@fid
+   UPDATE T_AutoWrireRecord SET F_KUAKEHU='��' WHERE FID=@fid
   
 	UPDATE T_AutoWrireRecord SET F_YeWuDate=b.FDATE3
 	FROM T_AutoWrireRecordEntry2 b