Develop/Piolot_RepotForm_PeiHao
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
余宇波 2025-07-30 18:18:16 +08:00
parent be31b3f133
commit a069bda15c
2 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs
View File

@ -756,6 +756,17 @@ else
//K3累计普票金额(本位币) //K3累计普票金额(本位币)
this.View.Model.SetValue("F_K3PuPiaoJinEMX", item["K3PuPiaoJinEMX"], indexi); this.View.Model.SetValue("F_K3PuPiaoJinEMX", item["K3PuPiaoJinEMX"], indexi);
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);
if (item["F_038"]!=null) if (item["F_038"]!=null)
this.View.Model.SetValue("F_10060",decimal.Parse(item["F_038"]?.ToString()) * decimal.Parse(item["HuiLv"]?.ToString()), indexi); this.View.Model.SetValue("F_10060",decimal.Parse(item["F_038"]?.ToString()) * decimal.Parse(item["HuiLv"]?.ToString()), indexi);
if (item["F_039"] != null) if (item["F_039"] != null)
@ -774,6 +785,7 @@ else
//【订单总额、累计发货金额、累计退货金额、累计开票金额、累计到款金额、应收款合计、未出货总额、实际已出货应收款合计、】的明细需要去重 //【订单总额、累计发货金额、累计退货金额、累计开票金额、累计到款金额、应收款合计、未出货总额、实际已出货应收款合计、】的明细需要去重
if (dicList.ContainsKey(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString())) if (dicList.ContainsKey(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString()))
{ {
this.View.Model.SetValue("F_LeiJiKaiPiaoJinE_Sum_YuanBi", null, indexi);
this.View.Model.SetValue("F_010", null, indexi); this.View.Model.SetValue("F_010", null, indexi);
this.View.Model.SetValue("F_017", null, indexi); this.View.Model.SetValue("F_017", null, indexi);
this.View.Model.SetValue("F_018", null, indexi); this.View.Model.SetValue("F_018", null, indexi);
@ -782,6 +794,31 @@ else
this.View.Model.SetValue("F_021", null, indexi); this.View.Model.SetValue("F_021", null, indexi);
this.View.Model.SetValue("F_022", null, indexi); this.View.Model.SetValue("F_022", null, indexi);
this.View.Model.SetValue("F_025", null, indexi); this.View.Model.SetValue("F_025", null, indexi);
//K3整单累计发货金额(本位币)
this.View.Model.SetValue("F_K3FaHuoJinE", null, indexi);
//K3整单累计退货金额(本位币)
this.View.Model.SetValue("F_K3TuiHuoJinE", null, indexi);
//K3整单累计专票金额(本位币)
this.View.Model.SetValue("F_K3ZhuanPiaoJinE", null, indexi);
//K3整单累计普票金额(本位币)
this.View.Model.SetValue("F_K3PuPiaoJinE", null, indexi);
//K3累计发货金额(本位币)
this.View.Model.SetValue("F_K3FaHuoJinEMX", null, indexi);
//K3累计退货金额(本位币)
this.View.Model.SetValue("F_K3TuiHuoJinEMX", null, indexi);
//K3累计专票金额(本位币)
this.View.Model.SetValue("F_K3ZhuanPiaoJinEMX", null, indexi);
//K3累计普票金额(本位币)
this.View.Model.SetValue("F_K3PuPiaoJinEMX", null, indexi);
this.View.Model.SetValue("F_YunikaiPiao", null, indexi);
this.View.Model.SetValue("F_LeiJiFaHuoJinE", null, indexi);
this.View.Model.SetValue("F_LeIjITuiHuoJinE", null, indexi);
this.View.Model.SetValue("F_LeiJiKaiPiaoJinE_Sum", null, indexi);
//月 //月
this.View.Model.SetValue("F_Month", null, indexi); this.View.Model.SetValue("F_Month", null, indexi);
//周 //周
@ -817,10 +854,10 @@ else
// "); // ");
sql_4 += string.Format(@"/*dialect*/ sql_4 += string.Format(@"/*dialect*/
Select T1.FPAYORGID As ZZ,T2.FNAME As GHDW,Sum(FRECAMOUNT) As SKJE,Sum(FRECAMOUNT-F_AMOUNT*FEXCHANGERATE) AS DHXJE Select T1.FPAYORGID As ZZ,T2.FNAME As GHDW,(FRECAMOUNTFOR) As SKJE,(FRECAMOUNT-F_AMOUNT*FEXCHANGERATE) AS DHXJE, CONVERT(NVARCHAR(50), t1.FDATE,23) AS FDATE
From T_AR_RECEIVEBILL T1 From T_AR_RECEIVEBILL T1
Join T_BD_CUSTOMER_L T2 On T1.FCONTACTUNIT = T2.FCUSTID And T2.FLOCALEID = 2052 Join T_BD_CUSTOMER_L T2 On T1.FCONTACTUNIT = T2.FCUSTID And T2.FLOCALEID = 2052
Where 1=1 Where FRECAMOUNTFOR<> isnull( F_AMOUNT,0)
And FCONTACTUNITTYPE = 'BD_Customer' And FCONTACTUNITTYPE = 'BD_Customer'
"); ");
CustFid = string.Join("','", kehuName.Select(t => t.kehu).Distinct().ToList()); CustFid = string.Join("','", kehuName.Select(t => t.kehu).Distinct().ToList());
@ -828,7 +865,7 @@ else
FSaleOrgId = string.Join(",", kehuName.Select(t => t.zhuzhi).Distinct().ToList()); FSaleOrgId = string.Join(",", kehuName.Select(t => t.zhuzhi).Distinct().ToList());
sql_4 += $@" And T1.FPAYORGID in ({FSaleOrgId}) "; sql_4 += $@" And T1.FPAYORGID in ({FSaleOrgId}) ";
sql_4 += " Group By T1.FPAYORGID,T2.FNAME"; sql_4 += " order by GHDW,FDATE desc";
var sql_List3 = DBUtils.ExecuteDynamicObject(Context, sql_4); var sql_List3 = DBUtils.ExecuteDynamicObject(Context, sql_4);
var sumList = (from q in sql_List3 var sumList = (from q in sql_List3
@ -848,8 +885,13 @@ else
this.View.Model.SetValue("F_005", item["GHDW"], indexi); this.View.Model.SetValue("F_005", item["GHDW"], indexi);
//收款金额 //收款金额
this.View.Model.SetValue("F_010", item["SKJE"], indexi); this.View.Model.SetValue("F_010", item["SKJE"], indexi);
//待核销金额
this.View.Model.SetValue("FDingDanZongE_YuanBi", item["DHXJE"], indexi); //累计到款金额(本位币)
this.View.Model.SetValue("F_020", item["DHXJE"], indexi);
//应收款合计(本位币)
this.View.Model.SetValue("F_021", -1* decimal.Parse(item["DHXJE"]?.ToString()), indexi);
//订单日期
this.View.Model.SetValue("F_012", item["FDATE"], indexi);
//类型 //类型
this.View.Model.SetValue("F_009", "收款单", indexi); this.View.Model.SetValue("F_009", "收款单", indexi);
indexi++; indexi++;

16
非C#代码文件/应收明细SQL.sql
View File

@ -242,6 +242,7 @@ WHERE aa.FCreditStatus='A' AND aa.FRowAuditStatus='A' AND bb.FNUMBER=Cccc.FNUMBE
FROM T_IV_SALESIC t0 WITH(NOLOCK) FROM T_IV_SALESIC t0 WITH(NOLOCK)
INNER JOIN T_SAL_ORDER aa1 WITH(NOLOCK) ON t0.F_PAPERNUMBER=aa1.F_contractnumber AND t0.FSETTLEORGID=aa1.FSALEORGID INNER JOIN T_SAL_ORDER aa1 WITH(NOLOCK) ON t0.F_PAPERNUMBER=aa1.F_contractnumber AND t0.FSETTLEORGID=aa1.FSALEORGID
INNER JOIN dbo.T_SAL_ORDERFIN fin ON aa1.FID=fin.FID INNER JOIN dbo.T_SAL_ORDERFIN fin ON aa1.FID=fin.FID
WHERE t0.FDATE>='2025-01-01' AND t0.FDOCUMENTSTATUS='C'
) tt ) tt
GROUP BY F_PaperNumber, FSALEORGID GROUP BY F_PaperNumber, FSALEORGID
) AD ON AD.F_PaperNumber = A.F_contractnumber AND ad.FSALEORGID=a.FSALEORGID ) AD ON AD.F_PaperNumber = A.F_contractnumber AND ad.FSALEORGID=a.FSALEORGID
@ -286,10 +287,10 @@ WHERE T1.
---更新K3明细字段 ---更新K3明细字段
update [ZRP_YingShouMingXi_yuyubo] set update [ZRP_YingShouMingXi_yuyubo] set
[K3累计发货金额(本位币)]=[K3整单累计发货金额(本位币)]*[分摊比例]*[收款条件分摊比例]*0.01*0.01 [K3累计发货金额(本位币)]=[K3整单累计发货金额(本位币)]*[分摊比例]*0.01
,[K3累计退货金额(本位币)]=[K3整单累计退货金额(本位币)]*[分摊比例]*[收款条件分摊比例]*0.01*0.01 ,[K3累计退货金额(本位币)]=[K3整单累计退货金额(本位币)]*[分摊比例]*0.01
,[K3累计专票金额(本位币)]=[K3整单累计专票金额(本位币)]*[分摊比例]*[收款条件分摊比例]*0.01*0.01 ,[K3累计专票金额(本位币)]=[K3整单累计专票金额(本位币)]*[分摊比例]*0.01
,[K3累计普票金额(本位币)]=[K3整单累计普票金额(本位币)]*[分摊比例]*[收款条件分摊比例]*0.01*0.01 ,[K3累计普票金额(本位币)]=[K3整单累计普票金额(本位币)]*[分摊比例]*0.01
@ -376,9 +377,9 @@ WHERE T0.FREDBLUE=0 AND aa1.fid=
update [ZRP_YingShouMingXi_yuyubo] SET [未到期金额]=CASE WHEN ([收款条件] LIKE '货到%' OR [收款条件] LIKE '款到发货%' OR [收款条件] LIKE '协议付款%') AND [订单总额]>0 update [ZRP_YingShouMingXi_yuyubo] SET [未到期金额]=CASE WHEN ([收款条件] LIKE '货到%' OR [收款条件] LIKE '款到发货%' OR [收款条件] LIKE '协议付款%') AND [订单总额]>0
THEN ([整单累计发货金额]-[整单累计退货金额])*[分摊比例]*0.01*[收款条件分摊比例]*0.01 - [收款条件累计核销金额]*[分摊比例]*0.01+[运杂费]+[K3累计发货金额(本位币)]/汇率-[K3累计退货金额(本位币)]/汇率 THEN ([整单累计发货金额]+[K3整单累计发货金额(本位币)]/汇率-[整单累计退货金额]-[K3整单累计退货金额(本位币)]/汇率)*[分摊比例]*0.01*[收款条件分摊比例]*0.01 - [收款条件累计核销金额]*[分摊比例]*0.01+[运杂费]
WHEN [订单总额]>0 WHEN [订单总额]>0
THEN ([整单正数订单总额]-[整单累计退货金额])*[分摊比例]*0.01*[收款条件分摊比例]*0.01 - [收款条件累计核销金额]*[分摊比例]*0.01 +[运杂费]-[K3累计退货金额(本位币)]/汇率 ELSE 0 END ; THEN ([整单正数订单总额]-[整单累计退货金额]-[K3整单累计退货金额(本位币)]/汇率 )*[分摊比例]*0.01*[收款条件分摊比例]*0.01 - [收款条件累计核销金额]*[分摊比例]*0.01 +[运杂费] ELSE 0 END ;
UPDATE [ZRP_YingShouMingXi_yuyubo] SET [预计到期时间]=NULL UPDATE [ZRP_YingShouMingXi_yuyubo] SET [预计到期时间]=NULL
@ -557,7 +558,8 @@ FROM
INSERT INTO [ReceivablesDetailsTable] INSERT INTO [ReceivablesDetailsTable]
( [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_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_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_059],[F_000] ,[F_062],[F_063],[销售单主键ID],[销售员ID],[收款条件主键ID],[EditTime],[IfManualEdit] [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_059],[F_000]
,[F_062],[F_063],[销售单主键ID],[销售员ID],[收款条件主键ID],[EditTime],[IfManualEdit]
,[F_064],[F_065],[F_066],[F_067],[F_068] ,[BiBie] ,[F_064],[F_065],[F_066],[F_067],[F_068] ,[BiBie]
,[HuiLv] ,[HuiLv]
,[DingDanZongE_YuanBi] ,[DingDanZongE_YuanBi]