2
This commit is contained in:
parent
2358d434d9
commit
96a872d2a7
@ -238,7 +238,7 @@ else
|
|||||||
Dictionary<string, decimal> dicList = new Dictionary<string, decimal>();
|
Dictionary<string, decimal> dicList = new Dictionary<string, decimal>();
|
||||||
if (action.ReturnData != null)
|
if (action.ReturnData != null)
|
||||||
{
|
{
|
||||||
|
//this.View.ShowMessage("123");
|
||||||
string wheresql = " 1=1 ";
|
string wheresql = " 1=1 ";
|
||||||
FilterParameter returnData = action.ReturnData as FilterParameter;//过滤框返回的数据
|
FilterParameter returnData = action.ReturnData as FilterParameter;//过滤框返回的数据
|
||||||
DynamicObject dyObj = returnData.CustomFilter as DynamicObject;
|
DynamicObject dyObj = returnData.CustomFilter as DynamicObject;
|
||||||
@ -325,7 +325,7 @@ else
|
|||||||
|
|
||||||
sql_1 += string.Format($@"/*dialect*/Select * From (Select [FId],[F_001],[F_002],[F_003],[F_004],[F_005],[F_006],[F_007],[F_008],[F_009],[F_010],[F_011],[F_012],[F_013],[F_014],[F_015],[F_016],[F_017],[F_018],[F_019],[F_020],[F_021],[F_022],[F_023],[F_024],[F_025],[F_026],[F_027],[F_028],[F_029],[F_030],[F_031],[F_032],[F_033],[F_034],[F_035],[F_036],[F_037],[F_038],[F_039],[F_040],[F_041],[F_042],[F_043],[F_044],[F_045],[F_046],[F_047],[F_048],[F_049],[F_050],[F_051],[F_052],[F_053],[F_054],[F_055],[F_056],[F_057],[F_058],[F_059],[F_000],[F_060],[F_061],[F_062],[F_063],[销售单主键ID],[销售员ID],[收款条件主键ID],[EditTime],[IfManualEdit],[F_064],[F_065],[F_066],[F_067],[F_068],[BiBie],[HuiLv],[DingDanZongE_YuanBi],[ZeRenRen],[XinYongEDu],[客户编码],[DaoKuanJinE_YuanBi],[YingShouHeJi_YuanBi],[YunZaFei],[LeiJiTuiHuoJinE_YuanBi]
|
sql_1 += string.Format($@"/*dialect*/Select * From (Select [FId],[F_001],[F_002],[F_003],[F_004],[F_005],[F_006],[F_007],[F_008],[F_009],[F_010],[F_011],[F_012],[F_013],[F_014],[F_015],[F_016],[F_017],[F_018],[F_019],[F_020],[F_021],[F_022],[F_023],[F_024],[F_025],[F_026],[F_027],[F_028],[F_029],[F_030],[F_031],[F_032],[F_033],[F_034],[F_035],[F_036],[F_037],[F_038],[F_039],[F_040],[F_041],[F_042],[F_043],[F_044],[F_045],[F_046],[F_047],[F_048],[F_049],[F_050],[F_051],[F_052],[F_053],[F_054],[F_055],[F_056],[F_057],[F_058],[F_059],[F_000],[F_060],[F_061],[F_062],[F_063],[销售单主键ID],[销售员ID],[收款条件主键ID],[EditTime],[IfManualEdit],[F_064],[F_065],[F_066],[F_067],[F_068],[BiBie],[HuiLv],[DingDanZongE_YuanBi],[ZeRenRen],[XinYongEDu],[客户编码],[DaoKuanJinE_YuanBi],[YingShouHeJi_YuanBi],[YunZaFei],[LeiJiTuiHuoJinE_YuanBi]
|
||||||
,[F_025]*[HuiLv] as F_SJYCHYSKHJ_BWB, [F_024]*[HuiLv] as F_WDQJE_BWB, [F_027]*[HuiLv] F_DQJE_BWB ,[F_000] AS F_zuzhi
|
,[F_025]*[HuiLv] as F_SJYCHYSKHJ_BWB, [F_024]*[HuiLv] as F_WDQJE_BWB, [F_027]*[HuiLv] F_DQJE_BWB ,[F_000] AS F_zuzhi
|
||||||
,Month([F_012]) as F_Month , DATEPART(week, [F_012]) AS F_week from [ReceivablesDetailsTable] where {wheresql}
|
,Month([F_012]) as F_Month , DATEPART(week, [F_012]) AS F_week,[数据截止时间] from [ReceivablesDetailsTable] where {wheresql}
|
||||||
Union ALL
|
Union ALL
|
||||||
(Select
|
(Select
|
||||||
null,null,'合计:',null,null,null,null,null,null,null,SUM(F_010),
|
null,null,'合计:',null,null,null,null,null,null,null,SUM(F_010),
|
||||||
@ -341,11 +341,11 @@ else
|
|||||||
FROM [ReceivablesDetailsTable] hh where {wheresql} ) a )
|
FROM [ReceivablesDetailsTable] hh where {wheresql} ) a )
|
||||||
,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,0,0,0,null,0
|
,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,0,0,0,null,0
|
||||||
, null, null, null, null, null,'',1 [HuiLv],SUM([DingDanZongE_YuanBi]),'' [ZeRenRen],0 [XinYongEDu],'' [客户编码],SUM([DaoKuanJinE_YuanBi]) ,SUM([YingShouHeJi_YuanBi]),SUM([YunZaFei]),SUM([LeiJiTuiHuoJinE_YuanBi])
|
, null, null, null, null, null,'',1 [HuiLv],SUM([DingDanZongE_YuanBi]),'' [ZeRenRen],0 [XinYongEDu],'' [客户编码],SUM([DaoKuanJinE_YuanBi]) ,SUM([YingShouHeJi_YuanBi]),SUM([YunZaFei]),SUM([LeiJiTuiHuoJinE_YuanBi])
|
||||||
,SUM([F_SJYCHYSKHJ_BWB]) ,sum(F_WDQJE_BWB) F_WDQJE_BWB,sum(F_DQJE_BWB) F_DQJE_BWB,null AS F_zuzhi,NULL,NULL
|
,SUM([F_SJYCHYSKHJ_BWB]) ,sum(F_WDQJE_BWB) F_WDQJE_BWB,sum(F_DQJE_BWB) F_DQJE_BWB,null AS F_zuzhi,NULL,NULL, max(数据截止时间) [数据截止时间]
|
||||||
From
|
From
|
||||||
( select [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 ,SUM([F_024]) as F_024 ,F_025,
|
( select [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 ,SUM([F_024]) as F_024 ,F_025,
|
||||||
SUM(F_027) F_027,SUM(F_036) F_036 ,[BiBie] ,[DingDanZongE_YuanBi] ,[DaoKuanJinE_YuanBi] ,[YingShouHeJi_YuanBi] ,[YunZaFei], [LeiJiTuiHuoJinE_YuanBi]
|
SUM(F_027) F_027,SUM(F_036) F_036 ,[BiBie] ,[DingDanZongE_YuanBi] ,[DaoKuanJinE_YuanBi] ,[YingShouHeJi_YuanBi] ,[YunZaFei], [LeiJiTuiHuoJinE_YuanBi]
|
||||||
,[F_025]*[HuiLv] as F_SJYCHYSKHJ_BWB, SUM([F_024]*[HuiLv]) as F_WDQJE_BWB, SUM([F_027]*[HuiLv]) F_DQJE_BWB from
|
,[F_025]*[HuiLv] as F_SJYCHYSKHJ_BWB, SUM([F_024]*[HuiLv]) as F_WDQJE_BWB, SUM([F_027]*[HuiLv]) F_DQJE_BWB ,max(数据截止时间) AS [数据截止时间] from
|
||||||
[ReceivablesDetailsTable]
|
[ReceivablesDetailsTable]
|
||||||
where {wheresql}
|
where {wheresql}
|
||||||
GROUP BY [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 , F_025,
|
GROUP BY [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 , F_025,
|
||||||
@ -697,6 +697,8 @@ else
|
|||||||
//到期金额(本位币)
|
//到期金额(本位币)
|
||||||
this.View.Model.SetValue("F_DQJE_BWB", item["F_DQJE_BWB"], indexi);
|
this.View.Model.SetValue("F_DQJE_BWB", item["F_DQJE_BWB"], indexi);
|
||||||
|
|
||||||
|
this.View.Model.SetValue("F_JZSJ", item["数据截止时间"], indexi);
|
||||||
|
|
||||||
//月
|
//月
|
||||||
this.View.Model.SetValue("F_Month", item["F_Month"], indexi);
|
this.View.Model.SetValue("F_Month", item["F_Month"], indexi);
|
||||||
//周
|
//周
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user