Merge branch 'main' of http://8.130.121.29:3000/TianHua/PiolotTH_ReportFrom into main

YSZKDZBaoBiao/AccountsReceivableReport2.cs

@@ -212,7 +212,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
             --ROW_NUMBER() OVER (ORDER BY [DATE] DESC,[FID]) AS FIDENTITYID,
             --DENSE_RANK() OVER (ORDER BY [DATE] DESC,[FID] ) AS OUTPUTNUMBER,
             ROW_NUMBER() OVER (ORDER BY (CASE [NUMBER] WHEN '待核销' THEN 999998 WHEN '合计' THEN 999999  ELSE  CONVERT(INT,[NUMBER]) END),[FID]) AS FIDENTITYID,
-            DENSE_RANK() OVER (ORDER BY (CASE [NUMBER] WHEN '待核销' THEN 999998 WHEN '合计' THEN 999999  ELSE  CONVERT(INT,[NUMBER]) END),[FID] ) AS OUTPUTNUMBER,
+            DENSE_RANK() OVER (ORDER BY (CASE [NUMBER] WHEN '待核销' THEN '2099-12-30' WHEN '合计' THEN '2099-12-31'  ELSE  [DATE] END),[FID] ) AS OUTPUTNUMBER,
             *
             INTO {0}
             FROM YingShouZhanKuanMX_GZTH

派诺报表SQL文件/应收对账表(明细版存储过程).sql

@@ -111,7 +111,7 @@ BEGIN
  ,A.F_Amount AS 累计核销金额
  ,0 AS 是否K3数据  
  ,tmm.FOldNumber
- ,ROW_NUMBER() OVER(ORDER BY A.FApproveDate DESC,A.FID) AS NUMBER
+ ,ROW_NUMBER() OVER(ORDER BY A.FApproveDate ,A.FID) AS NUMBER
  FROM T_SAL_ORDER A                
  INNER JOIN (
 	SELECT T1.FID,SUM(T1.FALLAMOUNT_LC) FBillAllAmount 

派诺报表SQL文件/应收对账表(简易)更新数据.sql

@@ -57,7 +57,7 @@ FROM YingShouZhanKuanJY_GZTH A
 INNER JOIN (
 	SELECT        
 	FID,           
-	ROW_NUMBER() OVER (ORDER BY [DATE] DESC,[FID]) as row_num1 
+	ROW_NUMBER() OVER (ORDER BY [DATE] ,[FID]) as row_num1 
 	FROM YingShouZhanKuanJY_GZTH  
 	) B On A.FID = B.FID