diff --git a/DDWFHMX.cs b/DDWFHMX.cs
index 63d5a4a..077fef6 100644
--- a/DDWFHMX.cs
+++ b/DDWFHMX.cs
@@ -57,8 +57,10 @@ namespace GZ_LTHReportForms.ReporyDDWFH
 
             ReportHeader header = new ReportHeader();
 
-            header.AddChild("日期", new LocaleValue("日期"), SqlStorageType.SqlDatetime);
+            header.AddChild("单据日期", new LocaleValue("单据日期"), SqlStorageType.SqlDatetime);
             header.AddChild("制单人", new LocaleValue("制单人"), SqlStorageType.Sqlnvarchar);
+            header.AddChild("审核日期", new LocaleValue("审核日期"), SqlStorageType.SqlDatetime);
+            header.AddChild("审核人", new LocaleValue("审核人"), SqlStorageType.Sqlnvarchar);
             header.AddChild("区域", new LocaleValue("区域"), SqlStorageType.Sqlnvarchar);
             header.AddChild("业务员", new LocaleValue("业务员"), SqlStorageType.Sqlnvarchar);
             header.AddChild("合同号", new LocaleValue("合同号"), SqlStorageType.Sqlnvarchar);
@@ -113,12 +115,12 @@ namespace GZ_LTHReportForms.ReporyDDWFH
             EXEC GZTH_DDWFHMXB '{0}','{1}','{2}','{4}'
 
             SELECT
-            ROW_NUMBER() OVER (ORDER BY [日期]) AS FIDENTITYID,
+            ROW_NUMBER() OVER (ORDER BY [审核日期]) AS FIDENTITYID,
             * 
             INTO {3} 
             FROM GZ_DDWFHMX_TH
             WHERE [未发货数量] <> 0 AND [未发货数量] <> 0
-            ORDER BY [日期]
+            ORDER BY [审核日期]
             ", FstartDate, FEndDate, FSaleOrgId, tableName, Fcontractnumber);
             DBUtils.Execute(this.Context, sql);
         }
@@ -131,6 +133,12 @@ namespace GZ_LTHReportForms.ReporyDDWFH
             result.Add(new SummaryField("已发货金额", BOSEnums.Enu_SummaryType.SUM));
             result.Add(new SummaryField("未发货数量", BOSEnums.Enu_SummaryType.SUM));
             result.Add(new SummaryField("未发货金额", BOSEnums.Enu_SummaryType.SUM));
+            result.Add(new SummaryField("星空已发货数量", BOSEnums.Enu_SummaryType.SUM));
+            result.Add(new SummaryField("星空已发货金额", BOSEnums.Enu_SummaryType.SUM));
+            result.Add(new SummaryField("星空未发货数量", BOSEnums.Enu_SummaryType.SUM));
+            result.Add(new SummaryField("K3已发货数量", BOSEnums.Enu_SummaryType.SUM));
+            result.Add(new SummaryField("K3已发货金额", BOSEnums.Enu_SummaryType.SUM));
+            result.Add(new SummaryField("K3未发货数量", BOSEnums.Enu_SummaryType.SUM));
             return result;
         }
     }
diff --git a/YSZKDZBaoBiao/AccountsReceivableReport2.cs b/YSZKDZBaoBiao/AccountsReceivableReport2.cs
index 4cc81fd..7848abd 100644
--- a/YSZKDZBaoBiao/AccountsReceivableReport2.cs
+++ b/YSZKDZBaoBiao/AccountsReceivableReport2.cs
@@ -93,7 +93,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
             header.AddChild("PPBillingDate", new LocaleValue("普票开票日期"), SqlStorageType.Sqlvarchar);
             header.AddChild("PPBillingAmount", new LocaleValue("普票开票金额"), SqlStorageType.SqlDecimal);
             header.AddChild("ZPBillingDate", new LocaleValue("专票开票日期"), SqlStorageType.Sqlvarchar);
-            header.AddChild("ZPBillingAmount", new LocaleValue("专票开票金额"), SqlStorageType.Sqlvarchar);
+            header.AddChild("ZPBillingAmount", new LocaleValue("专票开票金额"), SqlStorageType.SqlDecimal);
             header.AddChild("BillingAmount", new LocaleValue("开票金额"), SqlStorageType.SqlDecimal);
             header.AddChild("PaymentDate", new LocaleValue("回款日期"), SqlStorageType.Sqlvarchar);
             header.AddChild("PaymentAmount", new LocaleValue("回款金额"), SqlStorageType.SqlDecimal);
@@ -163,28 +163,28 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
           
             ", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH);
             sql += string.Format(@"/*dialect*/
-            INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FTAXPRICE,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount,    
-            ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,[K3专票金额],[K3普票金额])    
-            SELECT    
-            '合计',    
-            SUM(FQTY),    
-            SUM(FTAXPRICE),    
-            SUM(FALLAMOUNT),    
-            SUM(OrderAmount),    
-            SUM(ShipmentsNum),    
-            SUM(ShipmentsAmount),    
-            SUM(ReturnNum),    
-            SUM(ReturnAmount),    
-            SUM(BillingAmount),    
-            SUM(PaymentAmount),    
-            SUM(ShippedDebt),    
-            SUM(InvoicedDebt),    
-            SUM(OwedTickets),
-            SUM([K3专票金额]),
-            SUM([K3普票金额])
-            FROM    
-            YingShouZhanKuanMX_GZTH  
-            where 1=1
+                    INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount,    
+         ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,[K3退货金额],PPBillingAmount,ZPBillingAmount,[星空退货金额],[星空发货金额])    
+         SELECT    
+         '合计',    
+         SUM(FQTY),       
+         SUM(FALLAMOUNT),    
+         SUM(OrderAmount),    
+         SUM(ShipmentsNum),    
+         SUM(ShipmentsAmount),    
+         SUM(ReturnNum),    
+         SUM(ReturnAmount),    
+         SUM(BillingAmount),    
+         SUM(PaymentAmount),    
+         SUM(ShippedDebt),    
+         SUM(InvoicedDebt),    
+         SUM(OwedTickets),sum(K3退货金额)  ,
+         SUM(PPBillingAmount),
+         SUM(ZPBillingAmount),
+         sum(星空退货金额),SUM(星空发货金额),
+         FROM    
+         YingShouZhanKuanMX_GZTH  
+         where 1=1
             ");
             if (fGROUP == "2")
             {
@@ -192,12 +192,12 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
             }
             sql += string.Format(@"
             SELECT 
-            ROW_NUMBER() OVER (ORDER BY [FID]) AS FIDENTITYID,
+            ROW_NUMBER() OVER (ORDER BY [FID],OrderAmount desc) AS FIDENTITYID,
             *
             INTO {0}
             FROM YingShouZhanKuanMX_GZTH
             WHERE 1=1 
-            ",tableName);
+            ", tableName);
             if (fGROUP == "2")
             {
                 sql += string.Format("AND FID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH WHERE IsEnded = '未完结')");
diff --git a/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql b/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql
index 2bd9eda..98c088f 100644
--- a/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql
+++ b/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql
@@ -1,9 +1,3 @@
- 
-/****** Object:  StoredProcedure [dbo].[GXFPJEYSDZDMX_GZTH]    Script Date: 2025/7/15 16:06:03 ******/
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
 ALTER PROCEDURE [dbo].[GXFPJEYSDZDMX_GZTH]                  
                   
 AS                  
@@ -24,55 +18,117 @@ BEGIN
  INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ                  
  WHERE B.FPLX = 'רƱ' AND A.[�Ƿ�K3����] = 0          
             
- --�ڳ�רƱ���                  
- update A                  
- SET A.QCZPBillingAmount = ISNULL(A.QCZPBillingAmount,0) + B.FAFTERTOTALTAXFOR                  
- FROM YingShouZhanKuanMX_GZTH A                  
- CROSS APPLY                  
- (SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR                  
- FROM T_IV_SALESIC                   
- WHERE F_PAPERNUMBER = A.CONTRACTNUMBER                    
- AND FBILLTYPEID = '50ea4e69b6144f69961d2e9b44820929'                  
- AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX) 
- AND A.[�Ƿ�K3����] = 0                 
- ) B                  
+ ----�ڳ�רƱ���                  
+ --UPDATE A                  
+ --SET A.QCZPBillingAmount =0 -- ISNULL(A.QCZPBillingAmount,0) + B.FAFTERTOTALTAXFOR                  
+ --FROM YingShouZhanKuanMX_GZTH A                  
+ --CROSS APPLY                  
+ --(SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR                  
+ --FROM T_IV_SALESIC                   
+ --WHERE F_PAPERNUMBER = A.CONTRACTNUMBER                    
+ --AND FBILLTYPEID = '50ea4e69b6144f69961d2e9b44820929'                  
+ --AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX) 
+ --AND A.[�Ƿ�K3����] = 0                 
+ --) B                  
                   
- --�ڳ���Ʊ���                  
- update A                  
- SET A.QCPPBillingAmount = ISNULL(A.QCPPBillingAmount,0)+ B.FAFTERTOTALTAXFOR                  
- FROM YingShouZhanKuanMX_GZTH A                  
- CROSS APPLY                  
- (SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR                  
- FROM T_IV_SALESIC                   
- WHERE F_PAPERNUMBER = A.CONTRACTNUMBER                  
- AND FBILLTYPEID = '1cab58bc33d24e27826be02249f4edac'                  
- AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX)
- AND A.[�Ƿ�K3����] = 0                  
- ) B                  
+ ----�ڳ���Ʊ���                  
+ --UPDATE A                  
+ --SET A.QCPPBillingAmount =0-- ISNULL(A.QCPPBillingAmount,0)+ B.FAFTERTOTALTAXFOR                  
+ --FROM YingShouZhanKuanMX_GZTH A                  
+ --CROSS APPLY                  
+ --(SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR                  
+ --FROM T_IV_SALESIC                   
+ --WHERE F_PAPERNUMBER = A.CONTRACTNUMBER                  
+ --AND FBILLTYPEID = '1cab58bc33d24e27826be02249f4edac'                  
+ --AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX)
+ --AND A.[�Ƿ�K3����] = 0                  
+ --) B                  
                    
  --������Ʊ���ƺ�Ʊ�Ŀ�Ʊ���                  
  UPDATE A                  
-    SET A.KPJE = B.HZKPJE, A.ISTrue = 1                  
+    SET --A.KPJE = B.HZKPJE, 
+	A.ISTrue = 1                  
     FROM FPYSDZDMX A                   
     INNER JOIN FPYSDZDHPMXHP B ON A.FPFID = B.LZFPFID AND A.FPFENTRYID = B.LZFPFENTRYID                  
-                  
+ 
  UPDATE A                  
- SET PPBillingAmount = PPBillingAmount + B.KPJE                  
+ SET PPBillingDate = FORMAT(CONVERT(DATE, B.FPRQ), 'yyyy-MM-dd')
  FROM YingShouZhanKuanMX_GZTH A                  
- INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ                  
- WHERE B.FPLX = '��Ʊ' AND B.ISTrue = 1  AND A.[�Ƿ�K3����] = 0 
+ INNER JOIN (SELECT MAX(FPRQ) FPRQ,XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX FROM FPYSDZDMX GROUP BY XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX) B 
+ ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ              
+ WHERE B.FPLX = '��Ʊ' AND A.[�Ƿ�K3����] = 0 
+  UPDATE A                  
+ SET ZPBillingDate = FORMAT(CONVERT(DATE, B.FPRQ), 'yyyy-MM-dd')
+ FROM YingShouZhanKuanMX_GZTH A                  
+ INNER JOIN (SELECT MAX(FPRQ) FPRQ,XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX FROM FPYSDZDMX GROUP BY XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX) B 
+ ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ  
+  WHERE B.FPLX = 'רƱ' AND A.[�Ƿ�K3����] = 0 
+                
+ --UPDATE A                  
+ --SET PPBillingAmount =  B.KPJE                  
+ --FROM YingShouZhanKuanMX_GZTH A                  
+ --INNER JOIN  (SELECT bb.XSDDFID,bb.XSDDFENTRYID,bb.FPJSZZ,SUM(KPJE) KPJE FROM  FPYSDZDMX  bb
+ --WHERE bB.FPLX = '��Ʊ'  
+ --GROUP BY bb.XSDDFID,bb.XSDDFENTRYID,bb.FPJSZZ ) B
+ --ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ                  
+ --WHERE   A.[�Ƿ�K3����] = 0 
                   
+ --UPDATE A                  
+ --SET ZPBillingAmount =  B.KPJE                  
+ --FROM  YingShouZhanKuanMX_GZTH A                  
+ --INNER JOIN  (SELECT bb.XSDDFID,bb.XSDDFENTRYID,bb.FPJSZZ,SUM(KPJE) KPJE FROM  FPYSDZDMX  bb
+ --WHERE bB.FPLX = 'רƱ'   
+ --GROUP BY bb.XSDDFID,bb.XSDDFENTRYID,bb.FPJSZZ ) B
+ --ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ                  
+ --WHERE  A.[�Ƿ�K3����] = 0                
+   
+
  UPDATE A                  
- SET ZPBillingAmount = ZPBillingAmount+ B.KPJE                  
- FROM YingShouZhanKuanMX_GZTH A                  
- INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ                  
- WHERE B.FPLX = 'רƱ' AND B.ISTrue = 1  AND A.[�Ƿ�K3����] = 0                
+ SET PPBillingAmount =  B.KPJE   
+    FROM  YingShouZhanKuanMX_GZTH A                  
+ INNER JOIN  ( SELECT SUM(cc.KPJE) KPJE,XSDDFID,cc.FPJSZZ FROM (
+  SELECT DISTINCT bb.XSDDFID,bb.FPFENTRYID,bb.KPJE ,bb.FPJSZZ  FROM  FPYSDZDMX  bb
+  WHERE bb.FPLX = '��Ʊ'  ) cc
+  GROUP BY cc.XSDDFID,cc.FPJSZZ )  B
+ ON A.FID = B.XSDDFID   AND A.FSaleOrgId = B.FPJSZZ                  
+ WHERE  A.[�Ƿ�K3����] = 0   
+
+ --UPDATE A                  
+ --SET PPBillingAmount =  B.KPJE   
+ --   FROM  YingShouZhanKuanMX_GZTH A                  
+ --INNER JOIN  ( SELECT SUM(cc.KPJE) KPJE,XSDDFID,cc.FPJSZZ,cc.XSDDFENTRYID FROM (
+ -- SELECT DISTINCT bb.XSDDFID,bb.FPFENTRYID,bb.KPJE ,bb.FPJSZZ,bb.XSDDFENTRYID  FROM  FPYSDZDMX  bb
+ -- WHERE bb.FPLX = '��Ʊ'  ) cc
+ -- GROUP BY cc.XSDDFID,cc.FPJSZZ,cc.XSDDFENTRYID )  B
+ --ON A.FID = B.XSDDFID   AND A.FSaleOrgId = B.FPJSZZ  AND A.FENTRYID = b.XSDDFENTRYID                
+ --WHERE A.[�Ƿ�K3����] = 0    
+
+
+ UPDATE A   
+ SET ZPBillingAmount =  B.KPJE                  
+ FROM  YingShouZhanKuanMX_GZTH A                  
+ INNER JOIN  ( SELECT SUM(cc.KPJE) KPJE,XSDDFID,cc.FPJSZZ FROM (
+  SELECT DISTINCT bb.XSDDFID,bb.FPFENTRYID,bb.KPJE ,bb.FPJSZZ  FROM  FPYSDZDMX  bb
+  WHERE bb.FPLX = 'רƱ'  ) cc
+  GROUP BY cc.XSDDFID,cc.FPJSZZ )  B
+ ON A.FID = B.XSDDFID   AND A.FSaleOrgId = B.FPJSZZ                  
+ WHERE  A.[�Ƿ�K3����] = 0                
                   
+ --UPDATE A                  
+ --SET PPBillingAmount =  B.KPJE   
+ --   FROM  YingShouZhanKuanMX_GZTH A                  
+ --INNER JOIN  ( SELECT SUM(cc.KPJE) KPJE,XSDDFID,cc.FPJSZZ,cc.XSDDFENTRYID FROM (
+ -- SELECT DISTINCT bb.XSDDFID,bb.FPFENTRYID,bb.KPJE ,bb.FPJSZZ,bb.XSDDFENTRYID  FROM  FPYSDZDMX  bb
+ -- WHERE bb.FPLX = 'רƱ'  ) cc
+ -- GROUP BY cc.XSDDFID,cc.FPJSZZ,cc.XSDDFENTRYID )  B
+ --ON A.FID = B.XSDDFID   AND A.FSaleOrgId = B.FPJSZZ  AND A.FENTRYID = b.XSDDFENTRYID                
+ --WHERE A.[�Ƿ�K3����] = 0     
+
  --����Ʊ�����ڳ���Ʊ������ֵ��ֵ�������еĿ�Ʊ���                    
  SELECT                   
  A.FID,              
  A.FENTRYID,              
- SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.PPBillingAmount,0)) + SUM(ISNULL(A.QCZPBillingAmount,0)) + SUM(ISNULL(A.QCPPBillingAmount,0)) AS 'רƱ���'                  
+ SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.PPBillingAmount,0)) + SUM(ISNULL(A.K3רƱ���,0)) + SUM(ISNULL(A.K3��Ʊ���,0)) AS 'רƱ���'                  
  INTO #TEMP3                  
  FROM YingShouZhanKuanMX_GZTH A 
  WHERE A.[�Ƿ�K3����] = 0         
@@ -85,12 +141,13 @@ BEGIN
  INNER JOIN #TEMP3 B ON A.FID = B.FID AND A.FENTRYID = B.FENTRYID  
  WHERE A.[�Ƿ�K3����] = 0               
                   
- --�����ѳ���Ƿ��ѿ�ƱǷ�ǷƱ���Ƿ�������ֶ�                  
+ --�����ѳ���Ƿ��ѿ�ƱǷ�ǷƱ���Ƿ�������ֶ� 
+  --  OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL	,OwedTickets= 0,BillingAmount=0
  SELECT                  
- FID, SUM(ShipmentsAmount) - SUM(PaymentAmount) AS '�ѳ���Ƿ��',SUM(BillingAmount) - SUM(PaymentAmount) AS '�ѿ�ƱǷ��',SUM(OrderAmount) - SUM(BillingAmount) AS 'ǷƱ',                  
- CASE WHEN (SUM(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = SUM(ISNULL(ShipmentsAmount,0))                  
- AND (SUM(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = SUM(ISNULL(BillingAmount,0))                  
- AND (SUM(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = SUM(ISNULL(PaymentAmount,0))           
+ FID, SUM(ShipmentsAmount) - AVG(PaymentAmount) AS '�ѳ���Ƿ��',AVG(BillingAmount) - AVG(PaymentAmount) AS '�ѿ�ƱǷ��',SUM(OrderAmount) - SUM(BillingAmount) AS 'ǷƱ',                  
+ CASE WHEN (AVG(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = SUM(ISNULL(ShipmentsAmount,0))                  
+ AND (AVG(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = AVG(ISNULL(BillingAmount,0))                  
+ AND (AVG(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = AVG(ISNULL(PaymentAmount,0))           
  THEN '�����'                  
  ELSE '��'                  
  END AS '�Ƿ������'                  
@@ -100,7 +157,7 @@ BEGIN
  GROUP BY FID                  
                   
  UPDATE A                  
- SET A.ShippedDebt = B.[�ѳ���Ƿ��], A.InvoicedDebt = B.[�ѿ�ƱǷ��],A.OwedTickets = B.[ǷƱ],                  
+ SET A.ShippedDebt = B.[�ѳ���Ƿ��], A.InvoicedDebt = B.[�ѿ�ƱǷ��],--A.OwedTickets = B.[ǷƱ],                  
  A.IsEnded = B.[�Ƿ������]                  
  FROM YingShouZhanKuanMX_GZTH A                  
  INNER JOIN #TEMP4 B ON A.FID = B.FID
@@ -109,7 +166,7 @@ BEGIN
  --�Ա��е����ݽ��е���                  
   SELECT       
   *,               
-  ROW_NUMBER() OVER (PARTITION BY FID ORDER BY FID) as row_num1                  
+  ROW_NUMBER() OVER (PARTITION BY FID ORDER BY FID) AS row_num1                  
   INTO #TEMP5                  
   FROM YingShouZhanKuanMX_GZTH                  
                
@@ -119,6 +176,7 @@ BEGIN
   FROM YingShouZhanKuanMX_GZTH A        
   INNEr JOIN  #TEMP5 B ON A.FID = B.FID AND A.FENTRYID = B.FENTRYID              
       
+
                   
   --UPDATE A                  
   --SET A.BillingAmount = 0,A.OrderAmount = 0,A.PaymentAmount = 0,A.ShippedDebt = 0,A.InvoicedDebt = 0,A.OwedTickets = 0,A.IsEnded = '',QCPPBillingAmount = 0,QCZPBillingAmount = 0                  
@@ -131,12 +189,21 @@ BEGIN
   WHERE PPBillingAmount = 0         
     
 	UPDATE YingShouZhanKuanMX_GZTH
-	 SET OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL	,OwedTickets= 0,BillingAmount=0
+	 SET OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL	,OwedTickets= 0,BillingAmount=0,PPBillingAmount=0,ZPBillingAmount=0,ZPBillingDate='',PPBillingDate='',PaymentDate = ''
 	from (
 		 SELECT   CASE WHEN ROW_NUMBER() OVER(PARTITION BY FBILLNO ORDER BY fid) = 1 THEN FBILLNO 
        END AS ����,* FROM YingShouZhanKuanMX_GZTH
-	    
+	  
 	 ) B 
 	 WHERE  YingShouZhanKuanMX_GZTH.FID=B.FID AND YingShouZhanKuanMX_GZTH.FENTRYID=b.FENTRYID   AND b.���� IS null          
 
+	UPDATE A                  
+	SET OwedTickets = B.QP                
+	FROM YingShouZhanKuanMX_GZTH A
+	JOIN (SELECT FID,SUM(OrderAmount) - SUM(BillingAmount) AS 'QP' FROM YingShouZhanKuanMX_GZTH GROUP BY FID) B ON A.FID = B.FID                
+	WHERE A.[�Ƿ�K3����] = 0 AND A.row_num = 1
+
+DROP TABLE #TEMP3
+DROP TABLE #TEMP4
+DROP TABLE #TEMP5
 END
\ No newline at end of file
diff --git a/派诺报表SQL文件/应收对账表(明细创建).sql b/派诺报表SQL文件/应收对账表(明细创建).sql
index 7ece05f..e7fe82b 100644
--- a/派诺报表SQL文件/应收对账表(明细创建).sql
+++ b/派诺报表SQL文件/应收对账表(明细创建).sql
@@ -1,4 +1,4 @@
-ALTER PROCEDURE UpdateYSDZBMX_GZTH                
+ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]                
 @FSDATE varchar(1000),                
 @FEDATE varchar(1000),                
 @FSaleOrgId varchar(1000),                
@@ -7,15 +7,18 @@ ALTER PROCEDURE UpdateYSDZBMX_GZTH
 @ZZHTH varchar(1000)        
 AS                
 BEGIN                
-    DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);                
-    DECLARE @EndDate DATE = CONVERT(DATE, @FEDATE);                
+    DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);
+	--DECLARE @EndDate DATE = CONVERT(DATE,@FEDATE);                
+    DECLARE @EndDate DATE = CONVERT(DATE,CASE @FEDATE WHEN '' THEN '2099-12-31'ELSE @FEDATE END);                
                     
     -- ��������������һ��                
     SET @EndDate = DATEADD(DAY, 1, @EndDate);                
                 
  TRUNCATE TABLE YingShouZhanKuanMX_GZTH;                
                 
- INSERT INTO YingShouZhanKuanMX_GZTH (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[�Ƿ�K3����])                
+ INSERT INTO 
+ YingShouZhanKuanMX_GZTH 
+ (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[�Ƿ�K3����],�����ϱ���,NUMBER)                
  SELECT                 
  A.FID AS ���۶���FID                
  ,B.FENTRYID AS ���۶���FENTRYID                
@@ -31,12 +34,15 @@ BEGIN
  ,B_F.FALLAMOUNT_LC AS ��˰�ϼ�                
  ,AF.FBillAllAmount  �������                           
  ,A.F_Amount AS �ۼƺ������
- ,0 AS �Ƿ�K3����                
+ ,0 AS �Ƿ�K3����  
+ ,tmm.FOldNumber
+ ,ROW_NUMBER() OVER(ORDER BY A.FID) AS NUMBER
  FROM T_SAL_ORDER A                
  INNER JOIN T_SAL_ORDERFIN AF ON A.FID = AF.FID                
  INNER JOIN T_BAS_PREBDONE_L GC ON A.F_projectname = GC.FID                
  INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID                
- INNER JOIN T_BD_MATERIAL_L WL_L ON B.FMATERIALID = WL_L.FMATERIALID                
+ INNER JOIN T_BD_MATERIAL_L WL_L ON B.FMATERIALID = WL_L.FMATERIALID    
+ INNER JOIN T_BD_MATERIAL tmm ON B.FMATERIALID = tmm.FMATERIALID    
  INNER JOIN T_SAL_ORDERENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID        
  INNER JOIN V_BD_SALESMAN_L XS ON XS.FID = A.FSALERID      
  WHERE A.FSaleOrgId = @FSaleOrgId                 
@@ -44,37 +50,51 @@ BEGIN
  AND A.FApproveDate >= @StartDate                
  AND A.FApproveDate <= @EndDate        
  AND (ISNULL(@XSYFID, '') = '' OR A.FSalerId = @XSYFID)        
- AND (ISNULL(@ZZHTH,'') = '' OR A.F_contractnumber = @ZZHTH)        
- 
- --����K3����
- INSERT INTO YingShouZhanKuanMX_GZTH (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,[K3��������],[K3�������],[K3�˻�����],[K3�˻����],[K3��Ʊ���],[K3רƱ���],[�Ƿ�K3����])                
- SELECT 
-  B.FID AS ���۶���FID                
- ,0 AS ���۶���FENTRYID                
- ,B.FSaleOrgId AS ������֯                
- ,B.FBILLNO AS ���۶������                
- ,XS.FNAME AS ����ԱFID                
- ,FORMAT( B.FApproveDate,'yyyy-MM-dd') AS ǩ������                
- ,B.F_contractnumber AS ������                
- ,GC.FNAME AS ��Ŀ����                
- ,A.����ͺ� AS �ͺ�                
- ,A.�������� AS ��������                
- ,A.������� AS �������                
- ,A.�˻����� AS �˻����� 
- ,A.�˻���� AS �˻����               
- ,A.��Ʊ��� AS ��Ʊ���                           
- ,A.רƱ��� AS רƱ��� 
- ,1 AS �Ƿ�K3���� 
- FROM oldk3seorder0701 A  
- INNER JOIN T_SAL_ORDER B ON A.���ݱ��� = B.FBILLNO 
- INNER JOIN T_BAS_PREBDONE_L GC ON B.F_projectname = GC.FID
- INNER JOIN V_BD_SALESMAN_L XS ON XS.FID = B.FSALERID     
- WHERE B.FSaleOrgId = @FSaleOrgId                 
- AND B.FCUSTID = @FCUSTID                 
- AND B.FApproveDate >= @StartDate                
- AND B.FApproveDate <= @EndDate        
- AND (ISNULL(@XSYFID, '') = '' OR B.FSalerId = @XSYFID)        
- AND (ISNULL(@ZZHTH,'') = '' OR B.F_contractnumber = @ZZHTH)      
+ AND (ISNULL(@ZZHTH,'') = '' OR A.F_contractnumber = @ZZHTH)
+ AND B.FRETURNTYPE <> 'RETURN'
+  	UPDATE  a	
+	 SET a.[K3��������]=b.��������,a.[K3�������]=b.�������,a.[K3�˻�����]=b.�˻�����
+	 ,a.[K3�˻����]=b.�˻����,a.[K3רƱ���] = b.רƱ���	,a.[K3��Ʊ���]= b.��Ʊ��� 
+	
+ 	FROM YingShouZhanKuanMX_GZTH A 
+	INNER JOIN [oldk3seorder0701] b
+	ON a.FBILLNO=b.[���ݱ���] AND a.�����ϱ���=[���ϱ���] AND a.FQty=[����] AND (ABS(a.FTaxPrice-b.[��˰����])<=0.02 OR ABS(a.FTaxPrice-b.[���])<=0.02)
+	 WHERE  �Ƿ�K3����=0 
+
+
+
+
+ ----����K3����
+ --INSERT INTO 
+ --YingShouZhanKuanMX_GZTH 
+ --(FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,[K3��������],[K3�������],[K3�˻�����],[K3�˻����],[K3��Ʊ���],[K3רƱ���],[�Ƿ�K3����])                
+ --SELECT 
+ -- B.FID AS ���۶���FID                
+ --,0 AS ���۶���FENTRYID                
+ --,B.FSaleOrgId AS ������֯                
+ --,B.FBILLNO AS ���۶������                
+ --,XS.FNAME AS ����ԱFID                
+ --,FORMAT( B.FApproveDate,'yyyy-MM-dd') AS ǩ������                
+ --,B.F_contractnumber AS ������                
+ --,GC.FNAME AS ��Ŀ����                
+ --,A.����ͺ� AS �ͺ�                
+ --,A.�������� AS ��������                
+ --,A.������� AS �������                
+ --,A.�˻����� AS �˻����� 
+ --,A.�˻���� AS �˻����               
+ --,A.��Ʊ��� AS ��Ʊ���                           
+ --,A.רƱ��� AS רƱ��� 
+ --,1 AS �Ƿ�K3����  
+ --FROM oldk3seorder0701 A  
+ --INNER JOIN T_SAL_ORDER B ON A.���ݱ��� = B.FBILLNO 
+ --INNER JOIN T_BAS_PREBDONE_L GC ON B.F_projectname = GC.FID
+ --INNER JOIN V_BD_SALESMAN_L XS ON XS.FID = B.FSALERID     
+ --WHERE B.FSaleOrgId = @FSaleOrgId                 
+ --AND B.FCUSTID = @FCUSTID                 
+ --AND B.FApproveDate >= @StartDate                
+ --AND B.FApproveDate <= @EndDate        
+ --AND (ISNULL(@XSYFID, '') = '' OR B.FSalerId = @XSYFID)        
+ --AND (ISNULL(@ZZHTH,'') = '' OR B.F_contractnumber = @ZZHTH)      
                   
  --���·������ڣ����������ͷ������                
  SELECT                 
@@ -85,9 +105,9 @@ BEGIN
  ,B_F.FAllAmount_LC AS �������                
  INTO #TEMP1                
  FROM T_SAL_DELIVERYNOTICE A                
- INNER JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID                
- INNER JOIN T_SAL_DELIVERYNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID                
- INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'                
+ LEFT JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID                
+ LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID                
+ LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'                
  WHERE C.FSBILLID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH)                
  AND C.FSID IN (SELECT FENTRYID FROM YingShouZhanKuanMX_GZTH)     
  
@@ -126,8 +146,8 @@ BEGIN
                 
  --�����˻����ڣ��˻��������˻����                
  SELECT                 
- C.FSBILLID AS ���۶���FID                
- ,C.FSID AS ���۶���FENTRYID                
+ E.FSBILLID AS ���۶���FID                
+ ,E.FSID AS ���۶���FENTRYID                
  ,A.FDATE AS �˻�����                 
  ,B.FQTY AS �˻�����                
     ,B_F.FALLAMOUNT_LC AS �˻����                
@@ -135,7 +155,9 @@ BEGIN
  FROM T_SAL_RETURNNOTICE A                
  INNER JOIN T_SAL_RETURNNOTICEENTRY B ON A.FID = B.FID                
  INNER JOIN T_SAL_RETURNNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID                
- INNER JOIN T_SAL_RETURNNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'  
+ INNER JOIN T_SAL_RETURNNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'
+ INNER JOIN T_SAL_ORDERENTRY D ON C.FSBILLID = D.FID AND C.FSID = D.FENTRYID 
+ INNER JOIN T_SAL_ORDERENTRY_LK E ON E.FENTRYID = D.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'   
  
  ----����k3�˻�����
  --update A
@@ -151,6 +173,13 @@ BEGIN
  INNER JOIN #TEMP2 B ON A.FID = B.���۶���FID AND A.FENTRYID = B.���۶���FENTRYID    
  
  update YingShouZhanKuanMX_GZTH
- SET ReturnNum = K3�˻����� + �ǿ��˻�����, ReturnAmount = K3�˻���� + �ǿ��˻����
-                 
+ SET ReturnNum = K3�˻����� + �ǿ��˻�����, ReturnAmount = K3�˻���� + �ǿ��˻����;
+
+ --���»ؿ�����
+  UPDATE A                
+ SET PaymentDate = FORMAT(B.ShouKuanFDate,'yyyy-MM-dd')               
+ FROM YingShouZhanKuanMX_GZTH A                 
+ INNER JOIN ZZZ_HeXiaoBook B ON B.XiaoShouFid = A.FID
+  --SELECT OrderAmount,PaymentAmount,ShippedDebt,InvoicedDebt,IsEnded 	,OwedTickets,BillingAmount, CASE WHEN ROW_NUMBER() OVER(PARTITION BY FBILLNO ORDER BY fid) = 1 THEN FBILLNO 
+  --END AS ����,* FROM YingShouZhanKuanMX_GZTH
 END 
\ No newline at end of file
diff --git a/派诺报表SQL文件/应收对账表(明细版存储过程).sql b/派诺报表SQL文件/应收对账表(明细版存储过程).sql
index 623ef5c..01f5623 100644
--- a/派诺报表SQL文件/应收对账表(明细版存储过程).sql
+++ b/派诺报表SQL文件/应收对账表(明细版存储过程).sql
@@ -1,5 +1,6 @@
-
-/****** Object:  StoredProcedure [dbo].[UpdateYSDZBMX_GZTH]    Script Date: 2025/7/15 15:56:20 ******/
+USE [AIS2025]
+GO
+/****** Object:  StoredProcedure [dbo].[UpdateYSDZBMX_GZTH]    Script Date: 2025/7/23 13:45:57 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
@@ -23,7 +24,7 @@ BEGIN
                 
  INSERT INTO 
  YingShouZhanKuanMX_GZTH 
- (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[�Ƿ�K3����])                
+ (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[�Ƿ�K3����],�����ϱ���,NUMBER)                
  SELECT                 
  A.FID AS ���۶���FID                
  ,B.FENTRYID AS ���۶���FENTRYID                
@@ -39,12 +40,15 @@ BEGIN
  ,B_F.FALLAMOUNT_LC AS ��˰�ϼ�                
  ,AF.FBillAllAmount  �������                           
  ,A.F_Amount AS �ۼƺ������
- ,0 AS �Ƿ�K3����                
+ ,0 AS �Ƿ�K3����  
+ ,tmm.FOldNumber
+ ,ROW_NUMBER() OVER(ORDER BY A.FID) AS NUMBER
  FROM T_SAL_ORDER A                
  INNER JOIN T_SAL_ORDERFIN AF ON A.FID = AF.FID                
  INNER JOIN T_BAS_PREBDONE_L GC ON A.F_projectname = GC.FID                
  INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID                
- INNER JOIN T_BD_MATERIAL_L WL_L ON B.FMATERIALID = WL_L.FMATERIALID                
+ INNER JOIN T_BD_MATERIAL_L WL_L ON B.FMATERIALID = WL_L.FMATERIALID    
+ INNER JOIN T_BD_MATERIAL tmm ON B.FMATERIALID = tmm.FMATERIALID    
  INNER JOIN T_SAL_ORDERENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID        
  INNER JOIN V_BD_SALESMAN_L XS ON XS.FID = A.FSALERID      
  WHERE A.FSaleOrgId = @FSaleOrgId                 
@@ -59,7 +63,7 @@ BEGIN
 	
  	FROM YingShouZhanKuanMX_GZTH A 
 	INNER JOIN [oldk3seorder0701] b
-	ON a.FBILLNO=b.[���ݱ���] AND a.SizeModel=[����ͺ�] AND a.FQty=[����] AND (ABS(a.FTaxPrice-b.[��˰����])<=0.02 OR ABS(a.FTaxPrice-b.[���])<=0.02)
+	ON a.FBILLNO=b.[���ݱ���] AND a.�����ϱ���=[���ϱ���] AND a.FQty=[����] AND (ABS(a.FTaxPrice-b.[��˰����])<=0.02 OR ABS(a.FTaxPrice-b.[���])<=0.02)
 	 WHERE  �Ƿ�K3����=0 
 
 
@@ -106,9 +110,9 @@ BEGIN
  ,B_F.FAllAmount_LC AS �������                
  INTO #TEMP1                
  FROM T_SAL_DELIVERYNOTICE A                
- INNER JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID                
- INNER JOIN T_SAL_DELIVERYNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID                
- INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'                
+ LEFT JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID                
+ LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID                
+ LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'                
  WHERE C.FSBILLID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH)                
  AND C.FSID IN (SELECT FENTRYID FROM YingShouZhanKuanMX_GZTH)     
  
diff --git a/派诺报表SQL文件/应收对账表(简易)更新数据.sql b/派诺报表SQL文件/应收对账表(简易)更新数据.sql
index 35fdff9..b3103f3 100644
--- a/派诺报表SQL文件/应收对账表(简易)更新数据.sql
+++ b/派诺报表SQL文件/应收对账表(简易)更新数据.sql
@@ -4,13 +4,18 @@ BEGIN
           
 TRUNCATE TABLE YingShouZhanKuanJY_GZTH          
           
-INSERT INTO YingShouZhanKuanJY_GZTH(FID,FSaleOrgId,FSalerId,[DATE],ContractNumber,ProjectName,OrderAmount,FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,IsEnded,Remark,[K3רƱ���],[K3��Ʊ���])          
+INSERT INTO YingShouZhanKuanJY_GZTH(FID,FSaleOrgId,FSalerId,[DATE],ContractNumber,ProjectName,OrderAmount,FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,IsEnded,Remark,[K3רƱ���],[K3��Ʊ���],ZPFALLAmountFor,PPFALLAmountFor)          
 SELECT FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,SUM(OrderAmount) OrderAmount,SUM(BillingAmount) BillingAmount,SUM(PaymentAmount) PaymentAmount,SUM(ShippedDebt) ShippedDebt
-,SUM(InvoicedDebt) InvoicedDebt,SUM(OwedTickets) OwedTickets,IsEnded,Remark,SUM([K3רƱ���]) [K3רƱ���],SUM([K3��Ʊ���]) [K3��Ʊ���]       
+,SUM(InvoicedDebt) InvoicedDebt,SUM(OwedTickets) OwedTickets,null,Remark,SUM([K3רƱ���]) [K3רƱ���],SUM([K3��Ʊ���]) [K3��Ʊ���],SUM(ZPBillingAmount) [רƱ��Ʊ���],SUM(PPBillingAmount) [��Ʊ��Ʊ���]      
 FROM YingShouZhanKuanMX_GZTH  
 WHERE Number <> '�ϼ�' OR Number IS NULL
-GROUP BY FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,IsEnded,Remark
+GROUP BY FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,Remark
           
+UPDATE YingShouZhanKuanJY_GZTH SET IsEnded= b.IsEnded
+FROM (SELECT DISTINCT CONTRACTNUMBER,IsEnded FROM YingShouZhanKuanMX_GZTH aa 
+ WHERE IsEnded IS NOT NULL) b
+ WHERE  b.CONTRACTNUMBER=YingShouZhanKuanJY_GZTH.CONTRACTNUMBER
+
 ----�Ա���δ�������ݽ�������          
 --select FID,sum(shipmentsamount) as '�������',          
 --sum(ReturnAmount) AS '�˻����',          
diff --git a/派诺报表SQL文件/销售执行统计表存储过程.sql b/派诺报表SQL文件/销售执行统计表存储过程.sql
new file mode 100644
index 0000000..8b35022
--- /dev/null
+++ b/派诺报表SQL文件/销售执行统计表存储过程.sql
@@ -0,0 +1,310 @@
+ 
+
+/****** Object:  StoredProcedure [dbo].[GetOrderData]    Script Date: 2025/7/16 11:49:14 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+                                                                  
+--EXEC [GetOrderData] '�麣��ŵ','2025-01-01','2025-06-30'                                                                                  
+ALTER PROCEDURE [dbo].[GetOrderData]                                                                            
+                                                                            
+(                                                                            
+ @FSaleOrgIdName nvarchar(1000),                                                                                   
+ @FSDate nvarchar(1000),                                                  
+ @FEDate nvarchar(1000)                                                  
+)                                                                            
+as                                                                       
+  DECLARE @FSaleOrgId nvarchar(1000);                    
+  DECLARE @FSDateDate DATE;                    
+  DECLARE @FEDateDate DATE;                    
+                                                                      
+  SELECT @FSaleOrgId = FORGID                                                                   
+  FROM T_ORG_ORGANIZATIONS_L WHERE                                                                         
+  FNAME = @FSaleOrgIdName                    
+                      
+  SET @FSDateDate = CONVERT(DATE, @FSDate);                    
+  SET @FEDateDate = CONVERT(DATE, @FEDate);                    
+                    
+  -- @FEDate + 1��                    
+SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);                    
+                                                                                             
+  SELECT  D.FENTRYID,sum(b.fqty) AS 'FQTY',sum(E.fallamount) AS 'FAMOUNT'                                                                             
+  INTO #SAL                                                                            
+  FROM T_SAL_DELIVERYNOTICE A                                                                             
+  INNER JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID                                                                             
+  INNER JOIN T_SAL_DELIVERYNOTICEENTRY_F E ON E.FENTRYID = B.FENTRYID                                                                            
+  INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK  C ON C.FENTRYID = B.FENTRYID                                                                             
+  INNER JOIN T_SAL_ORDERENTRY D ON D.FID = C.FSBILLID  AND D.FENTRYID = C.FSID                                                                            
+  WHERE A.FDOCUMENTSTATUS= 'C'         
+  AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)                                    
+  AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)                                                    
+  AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)    
+  GROUP BY D.FENTRYID                                                                            
+                                                                            
+                                                                            
+  SELECT  D.FENTRYID,sum(b.fqty) AS 'FQTY',sum(E.fallamount) AS 'FAMOUNT'                                                                             
+  INTO #RETURN                                                                            
+  FROM T_SAL_RETURNNOTICE  A                                                                             
+  INNER JOIN T_SAL_RETURNNOTICEENTRY  B ON A.FID = B.FID                                                                             
+  INNER JOIN T_SAL_RETURNNOTICEENTRY_F E ON E.FENTRYID = B.FENTRYID                                                                            
+  INNER JOIN T_SAL_RETURNNOTICEENTRY_LK  C ON C.FENTRYID = B.FENTRYID                                
+  INNER JOIN T_SAL_ORDERENTRY D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID             
+  WHERE A.FDOCUMENTSTATUS= 'C'    
+  AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)                                    
+  AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)                                                    
+  AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)    
+  GROUP BY D.FENTRYID                                                                            
+                                                                            
+                                                                  
+  SELECT  F.FENTRYID,sum(b.FREALQTY) AS 'FQTY',sum(G.FALLAMOUNT_LC) AS 'FAMOUNT'                                   
+  INTO #OUTSTOCK                         
+  FROM  T_SAL_OUTSTOCK A                    
+  INNER JOIN T_SAL_OUTSTOCKENTRY B ON A.FID = B.FID                                      
+  INNER JOIN T_SAL_OUTSTOCKENTRY_F G ON G.FENTRYID = B.FENTRYID                                                               
+  INNER JOIN T_SAL_OUTSTOCKENTRY_LK C ON C.FENTRYID = B.FENTRYID                                       
+  INNER JOIN T_SAL_DELIVERYNOTICEENTRY  D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID                                                                            
+  INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK E ON E.FENTRYID = D.FENTRYID                            
+  INNER JOIN T_SAL_ORDERENTRY F ON F.FID = E.FSBILLID  AND F.FENTRYID = E.FSID                                                                            
+  WHERE A.FDOCUMENTSTATUS= 'C'     
+  AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)                                    
+  AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)                                                    
+  AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)    
+  GROUP BY F.FENTRYID                                               
+                                                                            
+  SELECT  F.FENTRYID,sum(b.FREALQTY) AS 'FQTY',sum(G.FALLAMOUNT_LC) AS 'FAMOUNT'                                                                             
+  INTO #RETURNSTOCK                                             
+  FROM T_SAL_RETURNSTOCK A                                                                             
+  INNER JOIN T_SAL_RETURNSTOCKENTRY B ON A.FID = B.FID                                                        
+  INNER JOIN T_SAL_RETURNSTOCKENTRY_F G ON G.FENTRYID = B.FENTRYID                                                                            
+  INNER JOIN T_SAL_RETURNSTOCKENTRY_LK C ON C.FENTRYID = B.FENTRYID                                                                            
+  INNER JOIN T_SAL_RETURNNOTICEENTRY  D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID                                                                            
+  INNER JOIN T_SAL_RETURNNOTICEENTRY_LK E ON E.FENTRYID = D.FENTRYID                                                                              
+  INNER JOIN T_SAL_ORDERENTRY F ON F.FID = E.FSBILLID  AND F.FENTRYID = E.FSID                                                                            
+  WHERE A.FDOCUMENTSTATUS= 'C'      
+  AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)                                    
+  AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)                                                    
+  AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)    
+  GROUP BY F.FENTRYID                                                                        
+                                                                          
+                                                                                                                            
+  SELECT  b.FORDERENTRYID as 'FENTRYID',sum(b.FPriceQty) AS 'FQTY',sum(b.FALLAMOUNT) AS 'FAMOUNT'                                                                            
+  INTO #RECE                  
+  FROM t_AR_receivable A             
+  INNER JOIN t_AR_receivableENTRY B ON A.FID = B.FID                                                                               
+  WHERE A.FDOCUMENTSTATUS= 'C'    
+  AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)                                    
+  AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)                                                    
+  AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)    
+  GROUP BY b.FORDERENTRYID                                                                                                                                                         
+    
+ SELECT   a.FID, STUFF(                                                                            
+ (                                  
+ SELECT ','+ CONVERT(NVARCHAR(100), FNAME,120) -- Ҫƴ�ӵ���                                                                            
+ FROM  (    
+    SELECT DISTINCT  x.FNAME +'--'+CONVERT(NVARCHAR(50), CONVERT(INT, w.F_DAY))+'��--'+CONVERT(NVARCHAR(50),CONVERT(DECIMAL(18,2), w.FRECADVANCERATE))+'%' AS FNAME    
+    ,w.FID,w.F_PMSDate    
+    ,W.FRECADVANCEAMOUNT,w.F_DAY  ,w.F_MBBA_DECIMAL_UKY    
+    ,w.FENTRYID, W.F_RecConditionId ,w.FRECADVANCERATE ,x.FNAME AS fname2 ,w.FMUSTDATE [������]     
+    FROM T_SAL_ORDERPLAN  w WITH(NOLOCK)    
+           LEFT JOIN T_BD_RecCondition_L X ON X.FID = W.F_RecConditionId       
+    ) t WHERE t.FID=a.FID    
+ FOR XML PATH('')                                      
+ ),1 ,1, '') ��������     
+ INTO #TEMP2    
+  FROM T_SAL_ORDER  A WITH(NOLOCK)    
+                         
+                        
+ --������ŵ��                      
+ SELECT A.FID AS FID                 
+ INTO #TEMP3                
+ FROM T_SAL_ORDER A                                                   
+ INNER JOIN T_BD_CUSTOMER_L C ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052                                                  
+ LEFT JOIN V_BD_SALESMAN_L L ON L.fid = A.FSALERID                       
+ left JOIN T_PerformanceSharing M ON M.FSOURCEBILLNO = A.FBILLNO AND M.FDOCUMENTSTATUS = 'C'                        
+ left JOIN T_PerformanceSharingEntry N ON N.FID=M.FID                                                   
+ LEFT JOIN V_BD_SALESMAN_L O ON O.fid= N.FSALEID                                                  
+ LEFT JOIN  ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.����=O.FNAME                                                                   
+ LEFT JOIN  ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.����=L.FNAME                                                   
+ WHERE A.FSALEORGID = 100302 AND                                                  
+ (ACO.���� = '̼���ǿ�'                                                   
+ OR ACL.���� = '̼���ǿ�'                                                      
+ OR C.FCUSTID IN ('1517849','1156999','1149200')                
+ OR (C.FCUSTID = 1150173 AND (ACO.���� = '�����Ŷ�' OR ACL.���� = '�����Ŷ�'))                
+ OR L.FNAME = '��ŵ��'                
+ OR A.FID IN (110185,207800)                     
+ AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)                                                    
+ AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE< @FEDateDate) )                      
+                                                                             
+                                                                            
+ SELECT                                                                               
+ A.FID ,                                                                            
+ A.FBILLNO,                                                                             
+ B.FENTRYID,
+ N.FSHARERATE,
+ F.FALLAMOUNT_LC,                                                                             
+--RANK()OVER(PARTITION BY A.FID,B.FENTRYID ORDER BY N.FENTRYID  ) AS '��̯���',           
+--RANK()OVER(PARTITION BY A.FID,B.FENTRYID ORDER BY N.FENTRYID DESC  ) AS '��̯���1',                                                                            
+-- RANK()OVER(ORDER BY A.FID,b.FENTRYID) AS '���' --��ˮ�ţ������Զ�����                      
+ MONTH(A.FApproveDate) AS '�·�' --���۶���-����ͷ-����-��Ӧ���·�                                                                            
+ ,CASE WHEN ISNULL(O.FNAME,'')='' THEN L.FNAME                   
+  ELSE O.FNAME END as 'ҵ����̯������Ա'   -- ҵ����̯������Ա                                                                        
+ ,CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.���� ELSE ACO.����  END AS '����'                                  
+ ,CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.��ϸ���� ELSE ACO.��ϸ���� END AS '��ϸ����'                                                                        
+ ,c.FNAME as '������λ' --���۶���-����ͷ-�ͻ�   
+ ,CONVERT(VARCHAR(10), A.FDate,23) AS 'ǩ������'  
+ ,CONVERT(VARCHAR(10), A.FApproveDate,23) AS '�������' --���۶���-����ͷ-�������                                                                            
+ ,A.F_contractnumber AS '������'--���۶���-����ͷ-ֽ�ʺ�ͬ��                                                              
+ ,E.FNUMBER AS '��Ʒ����'                                                            
+ ,d.FNAME as '��Ʒ����' --���۶���-������-��������                                                                            
+ ,d.FSPECIFICATION as '����ͺ�'--���۶���-������-����ͺ�                              
+ ,CONCAT(A.F_contractnumber,d.FSPECIFICATION ) as '��������ͺ�' --H�������š�(��Ӧֽ�ʺ�ͬ��)+J���ͺţܹ��ܱ�׼��                                                               
+ ,CASE WHEN E.FNUMBER LIKE 'L%' AND HT.FNUMBER = 'SX' AND ISNULL(b.F_ProjectProposal,'') != ''                         
+  THEN CONCAT(b.F_ProjectProposal,'��ʣ�ಿ��')  ELSE E.F_114 END AS '�ͺŷ���' --���ϵ���-�Զ����ֶ�-�ͺŴ���                                                                        
+ ,CASE WHEN E.FNUMBER LIKE 'L%' AND HT.FNUMBER = 'SX' AND ISNULL(b.F_ProjectProposal,'') != ''                                                                
+  THEN CONCAT(b.F_ProjectProposal,'��ʣ�ಿ��')  ELSE E.F_115 END AS '��Ʒ����'--���ϵ���-�Զ����ֶ�-��Ʒ����                                                                            
+,E.F_116 AS '��Ʒ��'--���ϵ���-�Զ����ֶ�-��Ʒ��                                                                        
+ --,'' as 'ҵ����' --������ȷ��ȡ���߼�                                                                        
+ ,CASE WHEN A.F_VRYF_Combo_lsn LIKE '%XTZHT%' THEN 'ϵͳ����ͬ'                                                                       
+  WHEN A.F_VRYF_Combo_lsn LIKE '%SXTXS%' THEN '��ϵͳ����'  
+  WHEN A.F_Returntype = 'HH' OR A.F_Returntype = 'TH' THEN '��ϵͳ����'
+  WHEN F_VRYF_Combo_lsn LIKE 'DDXS' THEN '��������'END as '��������'                                                                      
+ ,CASE WHEN A.F_VRYF_Combo_lsn LIKe '%DDXS%' THEN '�DZ����ͬ(CEP)' ELSE '��ϵͳ����' END AS '��������1'                                                                             
+ --,cast( B.FQTY as real) AS '����̨' --���۶���-������-����������ʾ��ҵ����̯��                                                     
+ ,cast( ROUND( F.FTAXPRICE,2) as real) AS '����Ԫ̨' --���۶���-������-��˰���� "ҵ����ֻ̯��̯����̯����                                                                            
+,cast( ROUND( f.FALLAMOUNT_LC,2) as real)  as '�к�˰����'                                                                            
+ ,CASE WHEN n.FSHARERATE IS NULL THEN ROUND(F.FALLAMOUNT_LC,10)                                                                
+ ELSE ROUND( f.FALLAMOUNT_LC * (n.FSHARERATE/100) ,10) END  as '��ͬ�ܼ�' --ҵ����ֻ̯��̯����̯��������¼����˰�ϼƱ�λ�ҡ�*ҵ����̯���еķ�̯����                                                                       
+ , G.FNAME as '���۶���-����ͷ-��Ŀ����' --���۶���-����ͷ-��Ŀ����                                                                         
+ ,y.FCAPTION AS '��Ŀ��������'--���۶���-����ͷ-��Ŀ��������                                                                      
+ ,CASE       
+    WHEN A.F_contractnumber LIKE 'W2%' OR A.F_contractnumber LIKE 'CW%' THEN '����ҵ��'       
+    WHEN (CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.���� ELSE ACO.���� END) LIKE '%�ۺ���Դ����%'       
+         OR (CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.���� ELSE ACO.���� END) LIKE '%��������%'       
+    THEN '��ҵ�������ҵ��'       
+    ELSE '��Ʒҵ��'       
+    END AS 'ҵ������-����Ʒ����'                                                                           
+ ,CASE WHEN I.F_CustomerType= 'JXS' THEN  '������'                               
+ WHEN I.F_CustomerType = 'MYS' THEN '��'                              
+ ELSE ''                              
+ END                              
+ as 'ֱ�����Ǿ�����'                                                                             
+ ,CASE WHEN b.F_specialoffer = '1' THEN '��' ELSE '��' end AS '�Ƿ��ؼ�'--���۶���-���ݷ�¼-�Ƿ��ؼ�                                                                       
+ ,CASE WHEN (CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.���� ELSE ACO.����  END) LIKE '%��Ʒ��%' OR                              
+             (CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.���� ELSE ACO.����  END) LIKE '%�����Ŷ�%'OR                                                                      
+             (CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.���� ELSE ACO.����  END) LIKE '%�����Ʒ��%'                                          
+             THEN '��Ʒ��'         
+             WHEN (CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.���� ELSE ACO.����  END) like '��������' OR                                              
+             (CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.���� ELSE ACO.����  END) LIKE '%ҽԺ%'            
+             OR (CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.���� ELSE ACO.����  END) LIKE '%����%'            
+             THEN '��ҵ��'                             
+             ELSE '������' END AS 'ҵ������'                       
+ ,CASE WHEN N.FSHARERATE is null THEN '' ELSE CONCAT( CAST ( N.FSHARERATE AS REAL),'%') END as 'ҵ����̯����' --���۶���-ҵ����̯��-��̯����                                                                    
+ , b.F_ProjectProposal AS '��Ŀ��������'           
+ ,'' AS '�տ���' --���� �տ���                                                                            
+ , CAST( J.FEXCHANGERATE AS REAL) AS '����' --���۶���-����ͷ-����                                                                              
+ ,H.F_Province AS '��Ŀ����ʡ��' --�ֶ����ijɡ���Ŀ����ʡ�ݡ�������CRMϵͳ�̻���ERP�̻���Ҫ�����ı��ֶζ�Ӧ                                                                            
+ ,h.F_City AS '��Ŀ��������' --�ֶ����ijɡ���Ŀ�������С�������CRMϵͳ�̻���ERP�̻���Ҫ�����ı��ֶζ�Ӧ                                                                            
+ ,u.FCAPTION AS '���ƻ�ϵͳ'--���ƻ�ϵͳ ���ֶ���Ҫ�����۶��������֣�������ERP���ϵ���������ִ��ͳ�Ʊ�������Ҫ���ִ��ֶΣ�����Ӧ�տ���ϸ����Ҫ�Ӷ���ִ����ϸ����ȡ���ֶΣ����Դ��ֶλ���Ҫ������ȡ���۶���-����ͷ-�������                                                                                                                                             
+ ,CASE WHEN ROW_NUMBER() OVER (PARTITION BY A.FID ORDER BY B.FENTRYID) = COUNT(*) OVER (PARTITION BY A.FID)                                                                   
+  THEN CAST(J.FBILLALLAMOUNT_LC AS numeric(18,2)) ELSE NULL END AS '�����ܶ�'                                                                             
+ ,K.FDATAVALUE AS '��ҵ���͹�˾����'--�����ڿͻ�����-��˾����                                                                                                                                                              
+ ,'' AS 'Ƿ���ܶ�' --���ѽ��������˻���-�տ��*ҵ����̯����                      
+ , TU.FNAME AS '�Ƶ���' --���۶���-����ͷ-����ҳǩ-�����ˣ�ϣ��ȡ�������۶����ύ�ˣ�                                                                        
+,S.FCAPTION AS '����ҵ�����' --2024-11-20��ͨ�����ֶΣ����۶�����ͷ���ӣ����Ƿ񼯲���Ŀ������ѡ���/����/����/�̵�/�����ز�/����Ǽ��ɣ����������Ĭ��Ϊ���񡿣���CRMϵͳ���ݵ�ERPϵͳ�У�Ĭ��ֵΪ��                                                                         
+,L.FNAME AS '���۶���ҵ��Ա'                  
+, CASE                   
+        WHEN N.FSHARERATE IS NOT NULL THEN                   
+            CASE                   
+                WHEN ROW_NUMBER() OVER (PARTITION BY A.FID, B.FENTRYID ORDER BY N.FENTRYID) = 1 THEN CAST(B.FQTY AS REAL)                  
+                ELSE NULL                   
+            END                  
+        ELSE CAST(B.FQTY AS REAL)                  
+    END AS '����̨'              
+ ,AE.FDATAVALUE AS '��ͬ����'               
+ INTO #TEMP4                                                                            
+ FROM T_SAL_ORDER A --���۶�����ͷ                                          
+ INNER JOIN T_BAS_ASSISTANTDATAENTRY HT ON A.F_ORDERCATEGORY = HT.FMASTERID -- �����������ϲ�ѯ��ͬ�ı���                                                                
+ INNER JOIN T_SEC_USER TU ON A.FCreatorId = TU.FUSERID -- �û�����������                                                                     
+ INNER JOIN T_SAL_orderentry b on a.FID = B.FID --���۶�������                                                                  
+ INNER JOIN T_BD_CUSTOMER_L C ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 --�ͻ�������                                                                            
+ INNER JOIN T_BD_MATERIAL_L d on d.FMATERIALID =b.FMATERIALID and d.FLOCALEID=2052 --���ϸ�����                                                                            
+ INNER JOIN T_BD_MATERIAL E ON E.FMATERIALID =D.FMATERIALID                                                                            
+ INNER JOIN T_SAL_ORDERENTRY_F  F ON F.FENTRYID = B.FENTRYID                                                               
+ INNER JOIN T_SAL_ORDERENTRY_R AR ON AR.FENTRYID = B.FENTRYID                                                              
+ INNER JOIN T_BD_CUSTOMER I ON I .FCUSTID = A.FCUSTID                                                                            
+ INNER JOIN T_SAL_ORDERFIN J ON J.FID= A.FID                                                                             
+ LEFT JOIN  T_BAS_PREBDONE_L G ON G.FID = A.F_projectname AND G.FLocaleID =2052                                                                   
+ LEFT JOIN  T_BAS_PREBDTHREE H ON H.FID = A.F_BON                                                                            
+ LEFT JOIN T_META_FORMENUMITEM Z ON Z.FVALUE  = H.F_PROJECTFIELD AND Z.FID =  '3ad5efac-d4a5-467c-b290-685a22791e68'                                                                            
+ LEFT JOIN T_META_FORMENUMITEM_L Y ON Y.FENUMID = Z.FENUMID AND Y.FLOCALEID = 2052                                                    
+ LEFT JOIN T_META_FORMENUMITEM X ON x.FVALUE  = I.F_CustomerType AND X.FID =  '5fbc5d34-7347-4b6d-8a9d-4816a47936cc'                                                                            
+ LEFT JOIN T_META_FORMENUMITEM_L W ON W.FENUMID = X.FENUMID AND W.FLOCALEID = 2052                    
+ LEFT JOIN T_META_FORMENUMITEM V ON V.FVALUE  = A.F_OrderType AND v.FID =  'bc2c1d77-0f4b-41d2-b61b-e29554c570d4'                           
+ LEFT JOIN T_META_FORMENUMITEM_L U ON U.FENUMID = V.FENUMID AND U.FLOCALEID = 2052                                                                              
+ LEFT JOIN T_META_FORMENUMITEM T ON T.FVALUE  = A.F_PURCHASINGPRO AND T.FID =  'a8624cbb-00e0-4beb-8045-53cbe94eb9ee'                                                                            
+ LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = T.FENUMID AND S.FLOCALEID = 2052                                                                              
+ LEFT JOIN V_ASSISTANTDATA K ON K.FENTRYID = I.FCompanyNature                                                                             
+ LEFT JOIN V_BD_SALESMAN_L L ON L.fid = A.FSALERID                                                                              
+ left JOIN T_PerformanceSharing M ON M.FSOURCEBILLNO = A.FBILLNO AND M.FDOCUMENTSTATUS = 'C'                                                                          
+ left JOIN T_PerformanceSharingEntry N ON N.FID=M.FID                                                                   
+ LEFT JOIN V_BD_SALESMAN_L O ON O.fid= N.FSALEID --AND N.FID IN (SELECT FID FROM T_PerformanceSharing WHERE FDOCUMENTSTATUS = 'C' )                                                                                        
+ LEFT JOIN  ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.����=O.FNAME AND ISNULL(ACO.��ϸ����,'') != ''                                                                      
+ LEFT JOIN  ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.����=L.FNAME AND ISNULL(ACL.��ϸ����,'') != ''                                                                                  
+ INNER JOIN T_BAS_ASSISTANTDATAENTRY_L AE ON AE.FENTRYID = A.F_Ordercategory              
+ WHERE                                                         
+1=1 AND                                                        
+A.FID NOT IN(                                                        
+  SELECT FID FROM  #TEMP3                                            
+ )                                                        
+ AND(@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)                                                     
+ AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)                                                    
+ AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)                                            
+ AND A.FDocumentStatus = 'C'                                        
+AND A.FManualClose <> '1'                                      
+AND B.FManualRowClose <> '1'                                  
+AND A.F_contractnumber NOT LIKE 'Z%'    
+
+
+ SELECT 
+ A.*                                                                                                                                                                                                                                  
+ ,AD.�������� as '��������'--���۶���-�տ�ƻ�-�տ�����+����+���족+Ӧ�ձ���(%),����֮����Ҫ�á�,���������������Ϊ�վ�Ĭ��Ϊ0��                                                                                                                                            
+ ,CAST( ISNULL(P.FQTY,'0') AS REAL) as '��������' --���۶��������ķ���֪ͨ����������ʾ��ҵ����̯���е�һ��ҵ��Ա����                                                                            
+,cast( round( ISNULL(P.FAMOUNT,0) * ISNULL(A.FSHARERATE,100)/100,2) as real)  as '�������'--ȡ���۶��������ķ���֪ͨ�����*��̯����                                                                            
+ ,CAST( ISNULL(q.FQTY,'0') AS REAL) as '�˻�����' --���۶����������˻�֪ͨ������                                                                            
+ ,cast( round( ISNULL(q.FAMOUNT,0) * ISNULL(A.FSHARERATE,100)/100,2) as real) as '�˻����'--���۶����������˻�֪ͨ�����*��̯����                                                                        
+ ,CAST( ISNULL(P.FQTY,0)-isnull(q.FQTY,0)  AS REAL)  AS '�ѽ�����-���˻�' --��ʽ=����֪ͨ������-�˻�֪ͨ����������ʾ��ҵ����̯���е�һ��ҵ��Ա���£�AR������������-AT���˻�������                                                                            
+ ,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)) * isnull(A.FSHARERATE,100)/100 ,2) AS '�ѽ������-���˻�' --2024-11-20��ͨ�������۶������ģ�AS�������-AU�˻���*ҵ����̯����                        
+ ,B.FQTY - AR.FDeliQty  AS 'δ������' --����-�ѽ�����                                                                                
+ , round( (A.FALLAMOUNT_LC - ISNULL(P.FAMOUNT,0) +ISNULL(Q.FAMOUNT,0))* isnull(A.FSHARERATE,100)/100,2)   as 'δ�������'--(���۶�����˰�ϼƱ�λ��-����֪ͨ�����+�˻�֪ͨ�����)*��̯����                                                                                                       
+,CAST( ISNULL(AB.FQTY,0) AS REAL) AS '�ѿ�Ʊ����' --��Ʊ������ȡ���۳��ⵥ����������Ӧ�յ�-�˻��������ĺ���Ӧ�յ�                                
+ ,CAST(round( ISNULL(AB.FAMOUNT,0) * isnull(A.FSHARERATE,100)/100,2)  AS REAL)  AS '��Ʊ���'--���۶��������ģ�����Ӧ�յ����-����Ӧ�յ���*��̯����                                                                                    
+ ,CAST( ISNULL(P.FQTY,0)-isnull(q.FQTY,0) - ISNULL(AB.FQTY,0) AS REAL) AS 'δ��Ʊ����' --AV�ѽ�����-BB�ѿ�Ʊ����                                                                            
+ ,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)- ISNULL(AB.FAMOUNT,0) ) * isnull(A.FSHARERATE,100)/100 ,2) AS 'δ��Ʊ���' --(AW�ѽ������-BC��Ʊ���)*��̯����                                                                                                                                                                                                                                                
+ INTO #TEMP1                                                                            
+ FROM #TEMP4 A 
+LEFT JOIN T_SAL_orderentry b on a.FENTRYID = B.FENTRYID --���۶������� 
+LEFT JOIN T_SAL_ORDERENTRY_R AR ON AR.FENTRYID = A.FENTRYID                                                            
+LEFT JOIN  #SAL P ON P.FENTRYID = A.FENTRYID  --����֪ͨ��                                                                             
+LEFT JOIN  #RETURN q ON q.FENTRYID = A.FENTRYID  --�˻�֪ͨ��                                                                            
+LEFT JOIN #OUTSTOCK R ON R.FENTRYID = A.FENTRYID --���۳��ⵥ                                                                            
+LEFT JOIN #RETURNSTOCK AA ON AA.FENTRYID = A.FENTRYID   --�����˻���                                                                            
+LEFT JOIN #RECE AB ON AB.FENTRYID = A.FENTRYID --Ӧ�յ�                                                                                                                                              
+LEFT JOIN #TEMP2 AD ON AD.FID = A.FID                           
+                                                                            
+SELECT * FROM #TEMP1 ORDER BY [������]
+--ҵ����̯�Ķ������Ǹ�������������Ʊ�����������������DZ���һ�У�Ҫ�����ظ����ˡ�
+drop table #TEMP2
+drop table #RECE
+drop table #RETURNSTOCK
+drop table #OUTSTOCK
+drop table #RETURN
+drop table #SAL
+drop table #TEMP3
+drop table #TEMP4
+drop table #TEMP1 
+GO
+
+