This commit is contained in:
2025-06-21 11:07:26 +08:00
parent 498718b79e
commit 4344c44822
5 changed files with 540 additions and 31 deletions

View File

@@ -301,7 +301,7 @@ else
var sql_1 = "";
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 From [ReceivablesDetailsTable] where {wheresql}
,[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 From [ReceivablesDetailsTable] where {wheresql}
Union ALL
(Select
null,null,'合计:',null,null,null,null,null,null,null,SUM(F_010),
@@ -317,7 +317,7 @@ else
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,'',1 [HuiLv],SUM([DingDanZongE_YuanBi]),'' [ZeRenRen],0 [XinYongEDu],'' [客户编码],SUM([DaoKuanJinE_YuanBi]) ,SUM([YingShouHeJi_YuanBi]),SUM([YunZaFei]),SUM([LeiJiTuiHuoJinE_YuanBi])
,SUM([F_SJYCHYSKHJ_BWB]) , null, null
,SUM([F_SJYCHYSKHJ_BWB]) , null, null,null AS F_zuzhi
From
(select distinct [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 ,0 as F_024 ,F_025,
0 as F_027,0 F_036 ,[BiBie] ,[DingDanZongE_YuanBi] ,[DaoKuanJinE_YuanBi] ,[YingShouHeJi_YuanBi] ,[YunZaFei], [LeiJiTuiHuoJinE_YuanBi]
@@ -661,9 +661,10 @@ else
//累计退货金额(原币)
this.View.Model.SetValue("FLeiJiTuiHuoJinE_YuanBi", item["LeiJiTuiHuoJinE_YuanBi"], indexi);
//实际已出货应收款合计(本位币)
//实际已出货应收款合计(本位币) F_zuzhi
this.View.Model.SetValue("F_SJYCHYSKHJ_BWB", item["F_SJYCHYSKHJ_BWB"], indexi);
//组织
this.View.Model.SetValue("F_zuzhi", item["F_zuzhi"], indexi);
//未到期金额(本位币)
this.View.Model.SetValue("F_WDQJE_BWB", item["F_WDQJE_BWB"], indexi);