This commit is contained in:
2025-08-14 11:22:33 +08:00
parent 04bbc82014
commit 4679f5bc57
3 changed files with 223 additions and 64 deletions

View File

@@ -82,6 +82,8 @@ namespace Pilot.Report.Exploitation.SpecialDetails
header.AddChild("Supervisor", new LocaleValue("审批人"), SqlStorageType.Sqlvarchar);
header.AddChild("SpecialCauseType", new LocaleValue("特价原因分类"), SqlStorageType.Sqlvarchar);
header.AddChild("CRMSpecialCause", new LocaleValue("CRM特价原因"), SqlStorageType.Sqlvarchar);
header.AddChild("CurrentSettledUpsetJinE", new LocaleValue("当期结算价*数量(仪表)"), SqlStorageType.SqlDecimal);
header.AddChild("F_VRYF_Amount_yrr", new LocaleValue("整单结算总价"), SqlStorageType.SqlDecimal);
header.AddChild("CurrentSettledUpset1", new LocaleValue("当期结算价(仪表)"), SqlStorageType.SqlDecimal);
header.AddChild("CurrentSettledUpset2", new LocaleValue("当期结算价(系统)"), SqlStorageType.SqlDecimal);
header.AddChild("Difference", new LocaleValue("差额(单价-结算价)"), SqlStorageType.SqlDecimal);
@@ -432,6 +434,22 @@ FROM #PLChongDianZhuangHeTong ;");
ISNULL(H4.FNAME, '') AS 'Supervisor', --审批人
H5.FDATAVALUE AS 'SpecialCauseType', --特价原因分类
A.FCRMSPECIALPRICINGREASON AS 'CRMSpecialCause', --CRM特价原因
CASE
WHEN (AAA.TableName IN ( '#YiBiaoHeTong','#XNChongDianZhuangHeTong')) THEN
B.F_SETTLEMENTP*B.FQTY
ELSE
NULL
END AS 'CurrentSettledUpsetJinE', --当期结算价*数量(仪表)
CASE
WHEN ROW_NUMBER() OVER (PARTITION BY A.FID,AAA.TableName ORDER BY a.FID,AAA.TableName,b.FENTRYID) = 1 THEN
CAST(ISNULL(A.F_VRYF_Amount_yrr, 0) AS FLOAT)
ELSE
NULL
END AS 'F_VRYF_Amount_yrr', -- 整单结算总价#
CASE
WHEN (AAA.TableName IN ( '#YiBiaoHeTong','#XNChongDianZhuangHeTong')) THEN
B.F_SETTLEMENTP
@@ -504,7 +522,7 @@ FROM #PLChongDianZhuangHeTong ;");
END
AS 'ExpireUnpaidAmount', --到期未付金额
G.FNUMBER AS 'ProductsCode' --产品长代码
,aaa.FSALEORGID,AAA.FENTRYID,aaa.FID
,aaa.FSALEORGID,AAA.FENTRYID,aaa.FID,B.F_K3SEQ
INTO #tempDaBiao
FROM #TempTable3 AAA
INNER JOIN T_SAL_ORDERENTRY B ON AAA.FENTRYID=B.FENTRYID
@@ -746,6 +764,13 @@ FROM #PLChongDianZhuangHeTong ;");
WHERE W2.FSTABLENAME = 'T_SAL_ORDERENTRY'
) H7
ON B.FENTRYID = H7.FSID {wheresql} ;
UPDATE #tempDaBiao SET NotShipmentsAmount=NotShipmentsAmount-ISNULL(k3.含税单价*K3.销售出库数量*1.000,0)
FROM dbo.oldk3seorder0701 k3
WHERE F_K3SEQ=k3.行号 AND #tempDaBiao.ContractNumber=k3.合同号;
UPDATE #tempDaBiao SET TotalSpread=TotalSpread+b.TotalSpreadYiBiao,CurrentSettledUpset2=CurrentSettledUpset2-b.TotalSpreadYiBiao
FROM (SELECT SUM(a.CurrentSettledUpset1*a.Quantity) AS TotalSpreadYiBiao,a.AFBILLNO FROM #tempDaBiao a
WHERE TableName='#XNChongDianZhuangHeTong'
@@ -788,6 +813,8 @@ where TableName IN ('#PLChongDianZhuangHeTong') AND #tempDaBiao.AFBILLNO=B.AFBIL
,[SpecialCauseType]
,[CRMSpecialCause]
,[CurrentSettledUpset1]
,CurrentSettledUpsetJinE
,F_VRYF_Amount_yrr
,[CurrentSettledUpset2]
,[Difference]
,[TotalSpreadYiBiao]
@@ -823,6 +850,8 @@ where TableName IN ('#PLChongDianZhuangHeTong') AND #tempDaBiao.AFBILLNO=B.AFBIL
'',
'',
SUM(t1.CurrentSettledUpset1),
SUM(CurrentSettledUpsetJinE)
,SUM(F_VRYF_Amount_yrr),
SUM(t1.CurrentSettledUpset2),
SUM(t1.Difference),
SUM(t1.TotalSpreadYiBiao),