This commit is contained in:
2025-08-12 14:33:43 +08:00
parent 8b2d13ea1f
commit 2f388fdbf4

View File

@@ -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);
}