DS7_JingHan
hanxuntao 2 years ago
parent 6509b4fea0
commit dd1e8eaf15

@ -1166,6 +1166,49 @@ namespace DSWeb.Areas.Account.Controllers
var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = count, data = dataList.ToList() }); var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = count, data = dataList.ToList() });
return new ContentResult() { Content = json }; return new ContentResult() { Content = json };
} }
public ContentResult AddDui(string bill, string data, string curr, string storeCurrExrate, int billtype, string addcurr)
{
var exrateList = JsonConvert.Deserialize<List<ChFeeExrate>>(storeCurrExrate);
var bodyList = JsonConvert.Deserialize<List<ChPaySettlement>>(data);
if (((exrateList == null) || (exrateList.Count == 0)) && (addcurr != curr))
{
exrateList = ChsettlementDAL.GetAppCurrExrateData(bodyList, curr, addcurr);
if (exrateList.Count == 0)
{
var modb = new ModelObjectDB();
DBResult result = ChsettlementDAL.AddRecvAppDCDetail(bill, bodyList, curr, Convert.ToString(Session["COMPANYID"]), addcurr, exrateList);
if (result.Success) { ChsettlementDAL.p_update_Amount(bill, billtype); }
var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
else
{
var jsonRespose = new JsonResponse { Success = true, Message = "查询成功", Data = exrateList.ToList() };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
}
else
{
var modb = new ModelObjectDB();
DBResult result = ChsettlementDAL.AddRecvAppDCDetail(bill, bodyList, curr, Convert.ToString(Session["COMPANYID"]), addcurr, exrateList);
if (result.Success) { ChsettlementDAL.p_update_Amount(bill, billtype); }
var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
}
#endregion #endregion

@ -545,10 +545,11 @@
<Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChPaysettlementBLEdit.js" /> <Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChPaysettlementBLEdit.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChPaySettlementEdit.js" /> <Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChPaySettlementEdit.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChPaysettlementIndex.js" /> <Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChPaysettlementIndex.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvDuiBLsettlementEdit.js" /> <Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvDuiBLsettlementEdit6.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvAppBLsettlementEdit.js" /> <Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvAppBLsettlementEdit.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvAppsettlementEdit.js" /> <Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvAppsettlementEdit.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvInvsettlementEdit.js" /> <Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvInvsettlementEdit.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvDuiBLsettlementEdit.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvsettlementBLEdit.js" /> <Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvsettlementBLEdit.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvsettlementEdit.js" /> <Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvsettlementEdit.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvsettlementIndex.js" /> <Content Include="Areas\Account\Viewsjs\Chfee_settlement\ChRecvsettlementIndex.js" />

Loading…
Cancel
Save