From 883052c749cf5d3378881f77d952c05d83603517 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Thu, 28 Aug 2025 19:20:32 +0800 Subject: [PATCH] 11 --- .../Receivables/ReceivablesDetails.cs | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs index 88776d3..fec0367 100644 --- a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs +++ b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs @@ -333,7 +333,7 @@ else ,[K3FaHuoJinEMX] ,[K3TuiHuoJinEMX] ,[K3ZhuanPiaoJinEMX] - ,[K3PuPiaoJinEMX] + ,[K3PuPiaoJinEMX] ,[F_019]*HuiLv AS F_YunikaiPiao,[F_019]*HuiLv+K3PuPiaoJinEMX+K3ZhuanPiaoJinEMX AS F_LeiJiKaiPiaoJinE_Sum from [ReceivablesDetailsTable] where {wheresql} Union ALL (Select @@ -358,10 +358,10 @@ else ,sum([K3FaHuoJinEMX]) AS [K3FaHuoJinEMX] ,sum([K3TuiHuoJinEMX]) AS [K3TuiHuoJinEMX] ,sum([K3ZhuanPiaoJinEMX]) AS [K3ZhuanPiaoJinEMX] - ,sum([K3PuPiaoJinEMX]) AS [K3PuPiaoJinEMX] + ,sum([K3PuPiaoJinEMX]) AS [K3PuPiaoJinEMX],SUM(a.F_019*[HuiLv]) AS F_YunikaiPiao,SUM([F_019]*HuiLv+K3PuPiaoJinEMX+K3ZhuanPiaoJinEMX) AS F_LeiJiKaiPiaoJinE_Sum 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, - SUM(F_027) F_027,SUM(F_036) F_036 ,[BiBie] ,[DingDanZongE_YuanBi] ,[DaoKuanJinE_YuanBi] ,[YingShouHeJi_YuanBi] ,[YunZaFei], [LeiJiTuiHuoJinE_YuanBi] + ( select [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019 AS 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] , sum([YunZaFei]) as [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 ,max(数据截止时间) AS [数据截止时间] ,[K3FaHuoJinE] ,[K3TuiHuoJinE] @@ -370,12 +370,12 @@ else ,[K3FaHuoJinEMX] ,[K3TuiHuoJinEMX] ,[K3ZhuanPiaoJinEMX] - ,[K3PuPiaoJinEMX] + ,[K3PuPiaoJinEMX] ,[HuiLv] from [ReceivablesDetailsTable] where {wheresql} GROUP BY [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 , F_025, - [BiBie] ,[DingDanZongE_YuanBi] ,[DaoKuanJinE_YuanBi] ,[YingShouHeJi_YuanBi] ,[YunZaFei], [LeiJiTuiHuoJinE_YuanBi] ,[HuiLv] + [BiBie] ,[DingDanZongE_YuanBi] ,[DaoKuanJinE_YuanBi] ,[YingShouHeJi_YuanBi], [LeiJiTuiHuoJinE_YuanBi] ,[HuiLv] ,[K3FaHuoJinE] ,[K3TuiHuoJinE] ,[K3ZhuanPiaoJinE] @@ -760,11 +760,21 @@ else this.View.Model.SetValue("F_LeiJiFaHuoJinE", decimal.Parse(item["F_017"]?.ToString()) + decimal.Parse(item["K3FaHuoJinEMX"]?.ToString()), indexi); this.View.Model.SetValue("F_LeIjITuiHuoJinE", decimal.Parse(item["F_018"]?.ToString()) + decimal.Parse(item["K3TuiHuoJinEMX"]?.ToString()), indexi); - var fapiao = decimal.Parse(item["F_019"]?.ToString()) * decimal.Parse(item["HuiLv"]?.ToString()); - - this.View.Model.SetValue("F_LeiJiKaiPiaoJinE_Sum_YuanBi", fapiao, indexi); - this.View.Model.SetValue("F_YunikaiPiao", fapiao, indexi); - this.View.Model.SetValue("F_LeiJiKaiPiaoJinE_Sum", fapiao + decimal.Parse(item["K3PuPiaoJinEMX"]?.ToString()) + decimal.Parse(item["K3ZhuanPiaoJinEMX"]?.ToString()), indexi); + //云星空累计开票金额(原币) + var fapiao = decimal.Parse(item["F_019"]?.ToString()) ; + //汇率 + var huiLv = decimal.Parse(item["HuiLv"]?.ToString()); + + //累计开票金额(原币) + this.View.Model.SetValue("F_LeiJiKaiPiaoJinE_Sum_YuanBi", fapiao + decimal.Parse(item["K3PuPiaoJinEMX"]?.ToString())/ huiLv + decimal.Parse(item["K3ZhuanPiaoJinEMX"]?.ToString())/ huiLv, indexi); + + //云星空累计开票金额(本位币) + this.View.Model.SetValue("F_YunikaiPiao", decimal.Parse(item["F_YunikaiPiao"]?.ToString()), indexi); + + + + //累计开票金额(本位币) + this.View.Model.SetValue("F_LeiJiKaiPiaoJinE_Sum", decimal.Parse(item["F_LeiJiKaiPiaoJinE_Sum"]?.ToString()), indexi); if (item["F_038"]!=null)