|
@@ -129,7 +129,7 @@ namespace JLHHJSvr.Helper
|
|
|
/// </summary>
|
|
|
/// <param name="mtrl">核价物料资料</param>
|
|
|
/// <returns>错误信息</returns>
|
|
|
- public string SaveMtrldef(u_mattress mtrl, string fields = "mtrlname,mtrlmode,mtrltypeid,mtrltype,unit,mtrlengname,configname")
|
|
|
+ public string SaveMtrldef(u_mattress mtrl, string fields = "mtrlname,mtrlmode,mtrltypeid,mtrltype,unit,mtrlengname,configname,model")
|
|
|
{
|
|
|
var errMsg = string.Empty;
|
|
|
|
|
@@ -155,7 +155,8 @@ namespace JLHHJSvr.Helper
|
|
|
["extras_cost"] = mtrl.extras_cost, // 额外费用
|
|
|
["planprice"] = mtrl.nottax_factory_cost, // 计划价
|
|
|
["bj_mxdscrp"] = mtrl.bj_mxdscrp,
|
|
|
- ["configname"] = mtrl.configname
|
|
|
+ ["configname"] = mtrl.configname,
|
|
|
+ ["model"] = mtrl.model
|
|
|
}
|
|
|
},
|
|
|
["updateFields"] = fields
|
|
@@ -180,6 +181,12 @@ namespace JLHHJSvr.Helper
|
|
|
{
|
|
|
var errMsg = string.Empty;
|
|
|
|
|
|
+ var mattresstype = new u_mattress_type();
|
|
|
+ if (DbSqlHelper.SelectOne(cmd, "u_mattress_type", "mattresstypeid = @mattresstypeid", new Dictionary<string, object>() { { "mattresstypeid", mattress.mattresstypeid } }, mattresstype, "typename") == 1)
|
|
|
+ {
|
|
|
+ mattress.model = mattresstype.typename;
|
|
|
+ }
|
|
|
+
|
|
|
var lde_dijia_cost = mattress.nottax_factory_cost / (mattress.dept_profitrate + mattress.dept_profitrate_rangli / 100);
|
|
|
var lde_commission = lde_dijia_cost / (1 - (mattress.commission - 1)) - lde_dijia_cost;
|
|
|
var ls_bj_mxdscrp = "底价:" + lde_dijia_cost.Value.ToString("###0.00") + ", 佣金:" + lde_commission.Value.ToString("###0.00") + ", 税金:" + mattress.taxes.Value.ToString("###0.00") + ", fob:" + mattress.fob.Value.ToString("###0.00") + ", 最后更新日期:" + DateTime.Today.ToString("yyyy-MM-dd") + "," + mattress.nottax_factory_cost.Value.ToString("###0.00");
|