This commit is contained in:
2025-06-21 10:51:43 +08:00
parent 9409365e34
commit c0c3d01e95
2 changed files with 47 additions and 21 deletions

View File

@@ -147,6 +147,7 @@ namespace Pilot_KD_Parino.Sal_Order
////目标单据数据集合
DynamicObject[] destObjs = convertResult.TargetDataEntities.Select(r => r.DataEntity).ToArray();
//目标订单实体
var orderSheet = destObjs[0];
var sdsas = JsonHelper.ToJson(destObjs);
Logger.Error("目标单据数据集合", sdsas, new Exception());
@@ -282,7 +283,7 @@ namespace Pilot_KD_Parino.Sal_Order
string sqltemp1 = $@"/*dialect*/ SELECT FUseOrgId,a.FNUMBER,b.FNAME,a.FCUSTID FROM T_BD_CUSTOMER a
LEFT JOIN T_BD_CUSTOMER_L b ON a.FCUSTID=b.FCUSTID
WHERE FUseOrgId={SupplierId_Id} AND FNAME LIKE '%{beiHuoName3}%' ";
Logger.Error("客户组织",sqltemp1, new Exception());
//Logger.Error("客户组织",sqltemp1, new Exception());
var keHuList = DBServiceHelper.ExecuteDynamicObject(this.Context, sqltemp1, null, null, CommandType.Text, null);
if (keHuList != null && keHuList.Count > 0)
@@ -467,12 +468,11 @@ namespace Pilot_KD_Parino.Sal_Order
var entryDetailList = (orderSheet["SaleOrderEntry"] as DynamicObjectCollection).ToList();
var entryDetailList2 = (FEntity2["SaleOrderEntry"] as DynamicObjectCollection).ToList();
entryDetailList.ForEach(t =>
{
var tempOne1 = entryDetailList2[kk] as DynamicObject;
t["SettleOrgId"] = orderSheet["SaleOrgId"];
t["SettleOrgId"] = orderSheet["SaleOrgId"];
t["SettleOrgId_Id"] = orderSheet["SaleOrgId_Id"];
t["AllAmount_LC"] = tempOne1["AllAmount_LC"];
t["Amount_LC"] = tempOne1["Amount_LC"];
@@ -485,6 +485,11 @@ namespace Pilot_KD_Parino.Sal_Order
var SaleOrderFinanceList = (orderSheet["SaleOrderFinance"] as DynamicObjectCollection).ToList();
var SaleOrderFinanceList2 = (FEntity2["SaleOrderFinance"] as DynamicObjectCollection).ToList();
kk = 0;
string now = DateTime.Now.Date.ToString();
var huiLvSQL = $@"/*dialect*/SELECT FCYFORID,FCyToID,FExchangeRate,FReverseExRate,FBegDate,FEndDate FROM T_BD_Rate
where FBegDate<='{now}' and FEndDate >='{now}'";
var HuiLvlist= DBServiceHelper.ExecuteDynamicObject(this.Context, huiLvSQL, null, null, CommandType.Text, null);
Logger.Error("获取有效汇率", huiLvSQL, new Exception());
SaleOrderFinanceList.ForEach(t =>
{
//t = SaleOrderFinanceList2[kk].Clone() as DynamicObject;
@@ -492,8 +497,23 @@ namespace Pilot_KD_Parino.Sal_Order
var tempOne1 = SaleOrderFinanceList2.FirstOrDefault();
t["ExchangeTypeId_Id"] = tempOne1["ExchangeTypeId_Id"];
t["ExchangeTypeId"] = tempOne1["ExchangeTypeId"];
t["SettleCurrId_Id"] = tempOne1["SettleCurrId_Id"];
t["SettleCurrId"] = tempOne1["SettleCurrId"];
t["SettleCurrId_Id"] = tempOne1["LocalCurrId_Id"];
t["SettleCurrId"] = tempOne1["LocalCurrId"];
if (orderSheet["SaleOrgId_Id"].ToString() == "438224")
{
t["LocalCurrId_Id"] = 2;
}
else
{
t["LocalCurrId"] = tempOne1["LocalCurrId"];
t["LocalCurrId_Id"] = 1;
}
var tempHuiLv = HuiLvlist.Where(H => H["FCYFORID"].ToString() == t["SettleCurrId_Id"].ToString() && H["FCyToID"].ToString() == t["LocalCurrId_Id"].ToString()).FirstOrDefault();
if (tempHuiLv != null)
{
t["ExchangeRate"] = tempHuiLv["FExchangeRate"].ToString();
}
t["BillAllAmount"] = tempOne1["BillAllAmount"];
t["BillAllAmount_LC"] = tempOne1["BillAllAmount_LC"];