This commit is contained in:
余宇波 2025-10-09 14:43:36 +08:00
parent 341e003cb9
commit 1742f1751e

View File

@ -234,7 +234,8 @@ WHERE
AND A.FID NOT IN AND A.FID NOT IN
( (
SELECT FID FROM #PaiChuGongSi SELECT FID FROM #PaiChuGongSi
) {wheresql} ; "); ) {wheresql} ;
");
//系统合同 20250903 郭靖要求把S类合同改成系统合同特价 //系统合同 20250903 郭靖要求把S类合同改成系统合同特价
sql += string.Format($@"/*dialect*/ sql += string.Format($@"/*dialect*/
@ -351,7 +352,8 @@ WHERE
( (
SELECT FID FROM #PaiChuGongSi SELECT FID FROM #PaiChuGongSi
) )
AND G.FNUMBER LIKE 'V%' {wheresql} ; "; AND G.FNUMBER LIKE 'V%' {wheresql} ;
";
//派诺明细的充电桩系统合同CS、CW //派诺明细的充电桩系统合同CS、CW
sql += $@"/*dialect*/ sql += $@"/*dialect*/
@ -409,7 +411,9 @@ WHERE
( (
SELECT FID FROM #PaiChuGongSi SELECT FID FROM #PaiChuGongSi
) )
AND G.FNUMBER not LIKE 'V%' {wheresql}; "; AND G.FNUMBER not LIKE 'V%' {wheresql};
";
//几个临时表合并 //几个临时表合并
sql += string.Format(@"/*dialect*/ sql += string.Format(@"/*dialect*/
@ -425,7 +429,9 @@ SELECT *
FROM #XNChongDianZhuangHeTong FROM #XNChongDianZhuangHeTong
UNION ALL UNION ALL
SELECT * SELECT *
FROM #PLChongDianZhuangHeTong ;"); FROM #PLChongDianZhuangHeTong ;
");
if (!string.IsNullOrEmpty(fChanPin)) if (!string.IsNullOrEmpty(fChanPin))
{ {
@ -927,7 +933,9 @@ WHERE F_K3SEQ=k3.行号 AND #tempDaBiao.ContractNumber=k3.合同号;
where Quantity<>0 where Quantity<>0
) t1 ) 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()); Logger.Error("特价明细报表", sql, new Exception());
DBUtils.Execute(this.Context, sql); DBUtils.Execute(this.Context, sql);
} }