核价后台：1、已审批复制，支持修改登记人

JLHHJSvr/Com/GetUserList.cs

@@ -18,6 +18,7 @@ namespace JLHHJSvr.Com
             return "GetUserList";
         }
         public string token { get; set; }
+        public int?  simple { get; set; }
     }
 
     public sealed class GetUserListResponse : LJResponse

JLHHJSvr/Excutor/DelMattressExcutor.cs

@@ -65,7 +65,7 @@ namespace JLHHJSvr.Excutor
                             {
 
                                 var list = new List<u_mattress>();
-                                var outputFields = @"flag, js1_flag, mattresscode,";
+                                var outputFields = @"flag, js1_flag, mattresscode";
                                 var selectStr = @" SELECT flag, js1_flag, mattresscode, parentid FROM u_mattress";
 
                                 var whereList = new List<string>();

JLHHJSvr/Excutor/GetUserListExcutor.cs

@@ -27,9 +27,14 @@ namespace JLHHJSvr.Excutor
             {
                 con.Open();
 
+                var outerFields = "empid, userid, username, rightstring, descrp, deptstr, usermode, outrepstr, pricelist_seestr, pricelist_editstr,access_failed_count,last_failed_attempt_time";
+
+                if (request.simple != null && request.simple == 1)
+                {
+                    outerFields = "empid, userid, username";
+                }
                 rslt.userList = new List<u_user_jlhprice>();
-                DbSqlHelper.Select(cmd, "u_user_jlhprice", null, null, null, 0, 0, rslt.userList, null,
-                    "empid, userid, username, rightstring, descrp, deptstr, usermode, outrepstr, pricelist_seestr, pricelist_editstr,access_failed_count,last_failed_attempt_time");
+                DbSqlHelper.Select(cmd, "u_user_jlhprice", null, null, null, 0, 0, rslt.userList, null, outerFields);
             }
         }
     }

JLHHJSvr/Helper/MattressHelper.cs

@@ -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);