diff --git a/YSZKDZBaoBiao/AccountsReceivableReport2.cs b/YSZKDZBaoBiao/AccountsReceivableReport2.cs
index 1fa50f1..ea52346 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,26 +163,29 @@ 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)    
-            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)    
-            FROM    
-            YingShouZhanKuanMX_GZTH  
-            where 1=1
+                    INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FTAXPRICE,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount,    
+         ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,[K3退货金额],PPBillingAmount,ZPBillingAmount,[星空退货金额],[星空发货金额])    
+         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(PPBillingAmount),
+         SUM(ZPBillingAmount),
+         sum(星空退货金额),SUM(星空发货金额)
+         FROM    
+         YingShouZhanKuanMX_GZTH  
+         where 1=1
             ");
             if (fGROUP == "2")
             {
@@ -190,12 +193,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 e19071d..1b6626b 100644
--- a/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql
+++ b/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql
@@ -24,31 +24,31 @@ 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                  
@@ -56,23 +56,53 @@ BEGIN
     FROM FPYSDZDMX A                   
     INNER JOIN FPYSDZDHPMXHP B ON A.FPFID = B.LZFPFID AND A.FPFENTRYID = B.LZFPFENTRYID                  
                   
- UPDATE A                  
- SET PPBillingAmount = PPBillingAmount + 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 
+ --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 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                
                   
+
+
  --����Ʊ�����ڳ���Ʊ������ֵ��ֵ�������еĿ�Ʊ���                    
  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         
@@ -88,10 +118,10 @@ BEGIN
  --�����ѳ���Ƿ��ѿ�ƱǷ�ǷƱ���Ƿ�������ֶ� 
   --  OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL	,OwedTickets= 0,BillingAmount=0
  SELECT                  
- 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))           
+ 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 '�Ƿ������'                  
@@ -110,7 +140,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                  
                
@@ -136,7 +166,7 @@ BEGIN
 	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          
 
diff --git a/派诺报表SQL文件/应收对账表(明细版存储过程).sql b/派诺报表SQL文件/应收对账表(明细版存储过程).sql
index 83e7351..29a9b55 100644
--- a/派诺报表SQL文件/应收对账表(明细版存储过程).sql
+++ b/派诺报表SQL文件/应收对账表(明细版存储过程).sql
@@ -5,12 +5,12 @@ GO
 SET QUOTED_IDENTIFIER ON
 GO
 ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]                
-@FSDATE varchar(1000),                
-@FEDATE varchar(1000),                
-@FSaleOrgId varchar(1000),                
-@FCUSTID varchar(1000),        
-@XSYFID varchar(1000),        
-@ZZHTH varchar(1000)        
+@FSDATE VARCHAR(1000),                
+@FEDATE VARCHAR(1000),                
+@FSaleOrgId VARCHAR(1000),                
+@FCUSTID VARCHAR(1000),        
+@XSYFID VARCHAR(1000),        
+@ZZHTH VARCHAR(1000)        
 AS                
 BEGIN                
     DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);