|
@@ -1586,7 +1586,7 @@ namespace JLHHJSvr.Helper
|
|
|
/// <param name="mattress"></param>
|
|
|
/// <param name="mxlist"></param>
|
|
|
/// <param name="subspecs">副规格列表</param>
|
|
|
- public void SaveMattress(u_mattress mattress,List<u_mattress_mx_mtrl> mxlist, List<u_mattress_mx_extra> extraProcesses = null, List<u_mattress_mx_extra> extraCosts = null, bool iferpmtrl = false)
|
|
|
+ public void SaveMattress(u_mattress mattress,List<u_mattress_mx_mtrl> mxlist, List<u_mattress_mx_extra> extraProcesses = null, List<u_mattress_mx_extra> extraCosts = null, bool iferpmtrl = false, string createby = "")
|
|
|
{
|
|
|
var fields = "mattressname, deptid, mattresscode, mattresstypeid, mattress_width, mattress_length, mattress_height, packtype, packqty, woodpallettype, total_hr_cost, total_material_cost, fees_dscrp, total_fees_cost, total_cost, taxrate, taxes, commissionrate, commission, fob," +
|
|
|
" profitrate, dept_profitrate, moneyrate, nottax_factory_cost, nottax_dept_cost, foreign_cost, diameter, area, cabinet_type, hrcost, biandaicost, createtime, createby, mattressrelcode, other_rate, flag, dept_profitrate_rangli, profitrate_point, if_moneyrate, discount, if_m_chai," +
|
|
@@ -1608,6 +1608,7 @@ namespace JLHHJSvr.Helper
|
|
|
//新建
|
|
|
mattress.createtime = context.opdate;
|
|
|
if (mattress.parentid == null || mattress.parentid == 0) mattress.createby = context.tokendata.username;
|
|
|
+ if (!string.IsNullOrEmpty(createby)) mattress.createby = createby;
|
|
|
|
|
|
mattress.mattressid = BllHelper.GetID(cmd, "u_mattress");
|
|
|
fields = "mattressid," + fields;
|
|
@@ -2108,14 +2109,15 @@ namespace JLHHJSvr.Helper
|
|
|
|
|
|
try
|
|
|
{
|
|
|
- CalCulateFormula(mattress_copy, mattressMxMtrlList, true, true, mattressMxExtra1List, mattressMxExtra2List);
|
|
|
+ //CalCulateFormula(mattress_copy, mattressMxMtrlList, true, true, mattressMxExtra1List, mattressMxExtra2List);
|
|
|
+ MattressCalculateCost(mattress_copy, mattressMxMtrlList, mattressMxExtra1List, mattressMxExtra2List);
|
|
|
}
|
|
|
catch (Exception e)
|
|
|
{
|
|
|
throw new LJCommonException(e.Message);
|
|
|
}
|
|
|
|
|
|
- SaveMattress(mattress_copy, mattressMxMtrlList, mattressMxExtra1List, mattressMxExtra2List, true);
|
|
|
+ SaveMattress(mattress_copy, mattressMxMtrlList, mattressMxExtra1List, mattressMxExtra2List, true, mattress.createby);
|
|
|
|
|
|
var mattressSubspecs = GetMattressSubspecs(mattress.mattressid);
|
|
|
|