浏览代码

核价后台:1、主副规格创建时,副规格的登记人与主规格保持一致
2、生成L1物料新flag、secflag字段信息
3、

chen_yjin 1 天之前
父节点
当前提交
e525bfecf1

+ 1 - 0
JLHHJSvr/DataStore/web_mattress.xml

@@ -58,6 +58,7 @@
 		qr_auditingrep,
 		qr_auditingdate,
 		js1_flag ,
+		yw_flag,
 		erp_mtrlcode,
 		erp_cb_updatetime,
 		if_bcp_type,

+ 1 - 0
JLHHJSvr/Excutor/SaveMattressExcutor.cs

@@ -118,6 +118,7 @@ namespace JLHHJSvr.Excutor
                             {
                                 var _mattress = ObjectHelper.DeepCopy(request.mattress);
                                 _mattress.parentid = request.mattress.mattressid;
+                                _mattress.createby = request.mattress.createby;
                                 _mattress.mattressid = 0;
                                 _mattress.mattresscode = "";
                                 _mattress.mattress_width = Convert.ToInt32(submx["mattress_width"]);

+ 4 - 2
JLHHJSvr/Helper/ERPHelper.cs

@@ -342,7 +342,7 @@ namespace JLHHJSvr.Helper
         /// </summary>
         /// <param name="mtrl">核价物料资料</param>
         /// <returns>错误信息</returns>
-        public string SaveMtrldef(u_mattress mtrl, List<u_mattress_interface> interfaceList = null, string fields = "mtrlname,mtrlmode,mtrltypeid,mtrltype,unit,mtrlengname,configcode,configname,model,configcodetype,moddate,modemp,ifautodd,piccode,zxmtrlmode")
+        public string SaveMtrldef(u_mattress mtrl, List<u_mattress_interface> interfaceList = null, string fields = "mtrlname,mtrlmode,mtrltypeid,mtrltype,unit,mtrlengname,configcode,configname,model,configcodetype,moddate,modemp,ifautodd,piccode,zxmtrlmode,flag,secflag")
         {
             var errMsg = string.Empty;
 
@@ -396,7 +396,9 @@ namespace JLHHJSvr.Helper
                         ["modemp"] = context.tokendata.username,
                         ["ifautodd"] = 1,
                         ["zxmtrlmode"] = mtrl.old_mtrlname,
-                        ["piccode"] = mtrl.mattresscode
+                        ["piccode"] = mtrl.mattresscode,
+                        ["flag"] = 1,
+                        ["secflag"] = 1,
                     }
                 },
                 ["updateFields"] = fields

+ 1 - 1
JLHHJSvr/Helper/MattressHelper.cs

@@ -1599,7 +1599,7 @@ namespace JLHHJSvr.Helper
             {
                 //新建
                 mattress.createtime = context.opdate;
-                mattress.createby = context.tokendata.username;
+                if (mattress.parentid == null || mattress.parentid == 0) mattress.createby = context.tokendata.username;
 
                 mattress.mattressid = BllHelper.GetID(cmd, "u_mattress");
                 fields = "mattressid," + fields;