From 1742f1751e3c487f99dbf6ff226196ecba92deca Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Thu, 9 Oct 2025 14:43:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpecialDetails/SpecialDetailsReport.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs index 0c7cd40..df51f43 100644 --- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs +++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs @@ -234,7 +234,8 @@ WHERE AND A.FID NOT IN ( SELECT FID FROM #PaiChuGongSi - ) {wheresql} ; "); + ) {wheresql} ; + "); //系统合同 20250903 郭靖要求把S类合同改成系统合同特价 sql += string.Format($@"/*dialect*/ @@ -351,7 +352,8 @@ WHERE ( SELECT FID FROM #PaiChuGongSi ) - AND G.FNUMBER LIKE 'V%' {wheresql} ; "; + AND G.FNUMBER LIKE 'V%' {wheresql} ; + "; //派诺明细的充电桩系统合同CS、CW sql += $@"/*dialect*/ @@ -409,7 +411,9 @@ WHERE ( SELECT FID FROM #PaiChuGongSi ) - AND G.FNUMBER not LIKE 'V%' {wheresql}; "; + AND G.FNUMBER not LIKE 'V%' {wheresql}; + +"; //几个临时表合并 sql += string.Format(@"/*dialect*/ @@ -425,7 +429,9 @@ SELECT * FROM #XNChongDianZhuangHeTong UNION ALL SELECT * -FROM #PLChongDianZhuangHeTong ;"); +FROM #PLChongDianZhuangHeTong ; + +"); if (!string.IsNullOrEmpty(fChanPin)) { @@ -927,7 +933,9 @@ WHERE F_K3SEQ=k3.行号 AND #tempDaBiao.ContractNumber=k3.合同号; where Quantity<>0 ) t1 - order by Sort desc,Date 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); }