This commit is contained in:
2025-07-29 20:17:28 +08:00
parent 9ea8a4af86
commit be31b3f133
2 changed files with 66 additions and 51 deletions

View File

@@ -799,51 +799,62 @@ else
indexi++;
#endregion
}
if (sql_List1.Count > 0)
{
var kehuName = sql_List1.Where(t=> t["F_000"] !=null && t["F_005"] !=null).Select(t => new { kehu = t["F_005"].ToString(), zhuzhi = t["F_000"].ToString() }).Distinct().ToList();
var sql_4 = "";
sql_4 += string.Format(@"/*dialect*/
var sql_4 = "";
// 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
// From T_AR_RECEIVEBILL T1
// Join T_BD_CUSTOMER_L T2 On T1.FCONTACTUNIT = T2.FCUSTID And T2.FLOCALEID = 2052
// Join (Select DISTINCT 购货单位,组织ID
//From ZRP_YingShouMingXi_yuyubo
//Where ([整单正数订单总额]-[累计退货金额(原币)]-[K3整单累计退货金额(本位币)])<>[累计到款金额(原币)]) T3
//ON T3.组织ID = T1.FPAYORGID AND t3.购货单位=t2.FNAME
// Where 1=1
// And FCONTACTUNITTYPE = 'BD_Customer'
// ");
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
From T_AR_RECEIVEBILL T1
Join T_BD_CUSTOMER_L T2 On T1.FCONTACTUNIT = T2.FCUSTID And T2.FLOCALEID = 2052
Join (Select DISTINCT 购货单位,组织ID
From ZRP_YingShouMingXi_yuyubo
Where ([整单正数订单总额]-[累计退货金额(原币)]-[K3整单累计退货金额(本位币)])<>[累计到款金额(原币)]) T3
ON T3.组织ID = T1.FPAYORGID AND t3.购货单位=t2.FNAME
Where 1=1
Join T_BD_CUSTOMER_L T2 On T1.FCONTACTUNIT = T2.FCUSTID And T2.FLOCALEID = 2052
Where 1=1
And FCONTACTUNITTYPE = 'BD_Customer'
");
if (CUST != null)
{
CustFid = Convert.ToString(CUST["name"]);
sql_4 += $@" And t2.FNAME = '{CustFid}'";
}
if (FSaleOrg != null)
{
FSaleOrgId = Convert.ToString(FSaleOrg["ID"]);
sql_4 += $@" And T1.FPAYORGID ={FSaleOrgId}";
}
sql_4 += " Group By T1.FPAYORGID,T2.FNAME";
var sql_List3 = DBUtils.ExecuteDynamicObject(Context, sql_4);
this.View.Model.CreateNewEntryRow("F_MBBA_Entity_qtr");
//类型
this.View.Model.SetValue("F_009", "类型", indexi);
indexi += 1;
foreach (var item in sql_List3)
{
this.View.Model.CreateNewEntryRow("F_MBBA_Entity_qtr");
//组织
this.View.Model.SetValue("F_zuzhi", item["ZZ"], indexi);
//购货单位
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_009", "收款单", indexi);
indexi++;
}
CustFid = string.Join("','", kehuName.Select(t => t.kehu).Distinct().ToList());
sql_4 += $@" And t2.FNAME in ('{CustFid}') ";
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";
var sql_List3 = DBUtils.ExecuteDynamicObject(Context, sql_4);
var sumList = (from q in sql_List3
join k in kehuName on new { kehu = q["GHDW"].ToString(), zhuzhi = q["ZZ"].ToString() } equals new { k.kehu, k.zhuzhi }
select q).ToList();
this.View.Model.CreateNewEntryRow("F_MBBA_Entity_qtr");
//类型
this.View.Model.SetValue("F_009", "类型", indexi);
indexi += 1;
foreach (var item in sumList)
{
this.View.Model.CreateNewEntryRow("F_MBBA_Entity_qtr");
//组织
this.View.Model.SetValue("F_zuzhi", item["ZZ"], indexi);
//购货单位
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_009", "收款单", indexi);
indexi++;
}
}
this.View.UpdateView("F_MBBA_Entity_qtr");
}