From 3efe047233366e466419e2b4929880e21afc4613 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Sun, 27 Apr 2025 10:06:15 +0800
Subject: [PATCH] 11

---
 Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs b/Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs
index 8255ff6..6cd066f 100644
--- a/Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs
+++ b/Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs
@@ -50,11 +50,15 @@ namespace Pilot_KD_Parino.SQL
         /// <returns></returns>
         public static DynamicObjectCollection GetWriteOrderDate3(Context ctx, string FORGID,string where )
         {
-            //定义SQL,调用物料视图
+            //定义SQL,调用物料视图  AND  A.FBusinessType='NORMAL'
+            /*
+             *      SELECT case when  FBusinessType='NORMAL' then (FDAMOUNT2+[整单累计退货金额]) else 0 end AS FDAMOUNT, * FROM 
+             * 
+             */
             string sql = string.Format($@"/*dialect*/   
-            SELECT * FROM 
+            SELECT FDAMOUNT2 as FDAMOUNT, * FROM 
             (
-                 SELECT  A.FID,
+                 SELECT  A.FID, A.FBusinessType,
                  A.FSALERID,
                  A.F_CONTRACTNUMBER,
                  A.FCUSTID,
@@ -65,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_LC-A.F_AMOUNT as 'FDAMOUNT',
+                 C.FBILLALLAMOUNT_LC-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',
@@ -99,10 +103,16 @@ INNER JOIN  T_SAL_ORDER aa1 WITH(NOLOCK) ON t0.F_PAPERNUMBER=aa1.F_contractnumbe
 ) AD WHERE AD.F_PaperNumber = A.F_contractnumber   AND ad.FSALEORGID=a.FSALEORGID  
 GROUP BY  F_PaperNumber, FSALEORGID
  )  as FInvoiceAmount30Days
+,[整单累计退货金额]=ISNULL((        
+ SELECT SUM(CC.FBillAllAmount_LC) AS '累计退货金额' 
+   FROM T_SAL_ORDER 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) 
                  FROM T_SAL_ORDER A
                  INNER JOIN T_SAL_ORDERFIN C ON C.FID =A.FID  
                  WHERE  
-                 C.FBILLALLAMOUNT_LC  >0    
+                 C.FBILLALLAMOUNT_LC  >0     
                  AND A.FDOCUMENTSTATUS = 'C' AND ISNULL(A.F_CONTRACTNUMBER,'')!=''    
                  AND (A.F_AMOUNT < C.FBILLALLAMOUNT_LC
                  or A.F_AMOUNT IS NULL)   {where}