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

View File

@@ -756,6 +756,17 @@ else
//K3累计普票金额(本位币)
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)
this.View.Model.SetValue("F_10060",decimal.Parse(item["F_038"]?.ToString()) * decimal.Parse(item["HuiLv"]?.ToString()), indexi);
if (item["F_039"] != null)
@@ -774,6 +785,7 @@ else
//【订单总额、累计发货金额、累计退货金额、累计开票金额、累计到款金额、应收款合计、未出货总额、实际已出货应收款合计、】的明细需要去重
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_017", 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_022", 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);
//周
@@ -817,10 +854,10 @@ else
// ");
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
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'
");
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());
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 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_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);
indexi++;