From 2f388fdbf40c98cbe16da2c4428fc59dad8bd8ff Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Tue, 12 Aug 2025 14:33:43 +0800
Subject: [PATCH] 11

---
 .../SpecialDetails/SpecialDetailsReport.cs    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
index 55cc535..6cb587c 100644
--- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
+++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
@@ -196,8 +196,8 @@ WHERE A.FSALEORGID = 100302
             sql += string.Format($@"/*dialect*/                        
             SELECT A.FBILLNO AS 'AFBILLNO',
        'YB' F_ORDERTYPE,
-       CONVERT(NVARCHAR, A.FDATE, 23) AS 'Date',                                         --日期
-       MONTH(A.FDATE) AS 'Month',                                                       --月份     
+       CONVERT(NVARCHAR, A.FApproveDate, 23) AS 'Date',                                         --日期
+       MONTH(A.FApproveDate) AS 'Month',                                                       --月份     
        A.F_CONTRACTNUMBER AS 'ContractNumber',                                           --纸质合同号  
 	   a.FSALEORGID ,A.FID,B.FENTRYID  ,'#YiBiaoHeTong'   AS TableName
 INTO #YiBiaoHeTong
@@ -238,8 +238,8 @@ WHERE
             sql += string.Format($@"/*dialect*/
             SELECT  A.FBILLNO AS 'AFBILLNO',
        'XT' F_ORDERTYPE,
-       CONVERT(NVARCHAR, A.FDATE, 23) AS 'Date',                                         --日期
-       MONTH(A.FDATE) AS 'Month',                                                       --月份     
+       CONVERT(NVARCHAR, A.FApproveDate, 23) AS 'Date',                                         --日期
+       MONTH(A.FApproveDate) AS 'Month',                                                       --月份     
        A.F_CONTRACTNUMBER AS 'ContractNumber',                                           --纸质合同号  
 	   a.FSALEORGID   ,A.FID,B.FENTRYID    ,'#XiTongHeTong'   AS TableName
 INTO #XiTongHeTong
@@ -282,8 +282,8 @@ WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW','B' )
             sql += $@"/*dialect*/
     SELECT   A.FBILLNO AS 'AFBILLNO',
        'CDZ' F_ORDERTYPE,
-       CONVERT(NVARCHAR, A.FDATE, 23) AS 'Date',                                         --日期
-       MONTH(A.FDATE) AS 'Month',                                                       --月份     
+       CONVERT(NVARCHAR, A.FApproveDate, 23) AS 'Date',                                         --日期
+       MONTH(A.FApproveDate) AS 'Month',                                                       --月份     
        A.F_CONTRACTNUMBER AS 'ContractNumber',                                           --纸质合同号  
 	   a.FSALEORGID,A.FID,B.FENTRYID  ,'#XNChongDianZhuangHeTong'   AS TableName
 INTO #XNChongDianZhuangHeTong
@@ -337,8 +337,8 @@ WHERE
             sql += $@"/*dialect*/
     SELECT  A.FBILLNO AS 'AFBILLNO',
        A.F_ORDERTYPE,
-       CONVERT(NVARCHAR, A.FDATE, 23) AS 'Date',                                         --日期
-       MONTH(A.FDATE) AS 'Month',                                                       --月份     
+       CONVERT(NVARCHAR, A.FApproveDate, 23) AS 'Date',                                         --日期
+       MONTH(A.FApproveDate) AS 'Month',                                                       --月份     
        A.F_CONTRACTNUMBER AS 'ContractNumber',                                           --纸质合同号  
 	   a.FSALEORGID ,A.FID,B.FENTRYID ,'#PLChongDianZhuangHeTong'   AS TableName   
 INTO #PLChongDianZhuangHeTong
@@ -416,8 +416,8 @@ FROM #PLChongDianZhuangHeTong ;");
             sql += $@"/*dialect*/
        SELECT AAA.TableName,  A.FBILLNO AS 'AFBILLNO',
        AAA.F_ORDERTYPE,
-       CONVERT(NVARCHAR, A.FDATE, 23) AS 'Date',                                         --日期
-       MONTH(A.FDATE) AS 'Month',                                                        --月份
+       CONVERT(NVARCHAR, A.FApproveDate, 23) AS 'Date',                                         --日期
+       MONTH(A.FApproveDate) AS 'Month',                                                        --月份
        E.FNAME AS 'Client',                                                              --购货单位
        F.FNAME AS 'Currency',                                                            --币别
        ISNULL(E.FDATAVALUE, '') AS 'CreditType',                                         --客户信用类型
@@ -765,7 +765,7 @@ where TableName IN ('#PLChongDianZhuangHeTong') AND #tempDaBiao.AFBILLNO=B.AFBIL
             sql += string.Format($@"/*dialect*/
             Select
             *,
-              ROW_NUMBER() OVER (ORDER BY FID DESC,FENTRYID) AS FIDENTITYID 
+              ROW_NUMBER() OVER (ORDER BY Date desc,FID DESC,FENTRYID) AS FIDENTITYID 
             INTO {tableName}
             From 
             (SELECT [TableName]
@@ -838,7 +838,7 @@ where TableName IN ('#PLChongDianZhuangHeTong') AND #tempDaBiao.AFBILLNO=B.AFBIL
            where Quantity<>0
         ) t1
            
-            order by Sort desc,fid desc ,FIDENTITYID ", tableName);
+            order by Sort desc,Date desc ,fid desc ,FIDENTITYID ", tableName);
             //Logger.Error("特价明细报表", sql, new Exception());
             DBUtils.Execute(this.Context, sql);
         }