1

YSZKDZBaoBiao/AccountsReceivableReport.cs

@@ -155,12 +155,22 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
             EXEC UpdateYSDZBJY_GZTH
             ", FSDate, fDate, ZZFID, fClient,XSYFID,ZZHTH,SFQJFWDZ);
 
-            sql += string.Format(@"
+            sql += string.Format($@"
+            INSERT INTO YingShouZhanKuanJY_GZTH(FID,NUMBER,PaymentAmount,ShippedDebt,InvoicedDebt)
+            Select 999998,'待核销'
+		    ,Sum((FRECAMOUNTFOR-F_AMOUNT)*FEXCHANGERATE) AS DHXJE
+		    ,-Sum((FRECAMOUNTFOR-F_AMOUNT)*FEXCHANGERATE) AS YCHQK
+		    ,-Sum((FRECAMOUNTFOR-F_AMOUNT)*FEXCHANGERATE) AS YKPQK
+            From T_AR_RECEIVEBILL T1
+            Where 1=1
+            And FDOCUMENTSTATUS = 'C'
+            And FCONTACTUNIT ={fClient}
+            
             INSERT INTO YingShouZhanKuanJY_GZTH(FID,Number,OrderAmount,ShipmentsAmount,FBillAllAmount,    
             FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets
             ,[K3发货数量],[K3发货金额],[K3退货数量],[K3退货金额],[星空发货数量],[星空发货金额],[星空退货数量],[星空退货金额],PPFALLAmountFor,ZPFALLAmountFor,[K3专票金额],[K3普票金额])      
             Select
-            999998,
+            999999,
             '合计',      
             SUM(OrderAmount) as OrderAmount,      
             SUM(ShipmentsAmount) as ShipmentsAmount,      
@@ -191,12 +201,12 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
             }
             sql += string.Format(@"
             SELECT 
-            ROW_NUMBER() OVER (ORDER BY [FID]) AS FIDENTITYID,
+            ROW_NUMBER() OVER (ORDER BY [DATE] DESC,[FID]) AS FIDENTITYID,
             *
             INTO {0}
             FROM YingShouZhanKuanJY_GZTH
             WHERE 1=1
-            ",tableName);
+            ", tableName);
             if (fGROUP == "2")
             {
                 sql += string.Format(@"AND IsEnded = '未完结'");