核价后台：1、生成物料后，更新相关信息

JLHHJSvr/Excutor/CreatMtrldefExcutor.cs

@@ -68,17 +68,20 @@ namespace JLHHJSvr.Excutor
 
                 l1Helper.CheckLogin();
 
-                if (mattress.erp_mtrlid <= 0)
-                {
-                    mattress = l1Helper.GetMattressMsg(mattress, interfaceList);
+                mattress = l1Helper.GetMattressMsg(mattress, interfaceList);
 
-                    var errMsg = l1Helper.SaveMtrldef(mattress, interfaceList);
-                    if (!string.IsNullOrEmpty(errMsg))
-                    {
-                        rslt.ErrMsg = errMsg;
-                        return;
-                    }
+                var errMsg = l1Helper.SaveMtrldef(mattress, interfaceList);
+                if (!string.IsNullOrEmpty(errMsg))
+                {
+                    rslt.ErrMsg = errMsg;
+                    return;
                 }
+                mattress.mattressid = request.mattressid;
+                mattress.creatmtrl_flag = 1;
+
+                DbSqlHelper.Update(cmd, mattress, "erp_mtrlid, creatmtrl_flag, erp_mtrlcode");
+
+                rslt.mattress = mattress;
             }
         }
 

JLHHJSvr/Excutor/CreatPrdPfExcutor.cs

@@ -150,6 +150,13 @@ namespace JLHHJSvr.Excutor
 
                 var l1Rslt = l1Helper.DoExecute("SavePrdPf", JObject.FromObject(l1Req));
                 rslt.ErrMsg = $"{l1Rslt.GetValue("ErrMsg")}";
+
+                if (!string.IsNullOrEmpty(rslt.ErrMsg))
+                {
+                    mattress.creatmtrlqd_flag = 1;
+                    mattress.mattressid = request.mattressid;
+                    DbSqlHelper.Update(cmd, mattress, "creatmtrlqd_flag");
+                }
             }
         }
 

JLHHJSvr/Excutor/GetMattressInterfaceListExcutor.cs

@@ -56,6 +56,9 @@ namespace JLHHJSvr.Excutor
 		                                END AS erp_mtrlengname
 	                                ,old_mtrlname AS old_mtrlname
                                     ,deptid
+                                    ,yw_flag
+                                    ,js1_flag
+                                    ,js2_flag
                                 FROM u_mattress
                                 WHERE u_mattress.mattressid = @mattressid";
                 cmd.Parameters.Clear();
@@ -70,6 +73,12 @@ namespace JLHHJSvr.Excutor
                             _mtrlmode = Convert.ToInt32(reader["mattress_width"]) + "*" + Convert.ToInt32(reader["mattress_length"]) + "*" + Convert.ToInt32(reader["mattress_height"]);
                         }
 
+                        var _mtrlname = Convert.ToString(reader["erp_mtrlname"]);
+                        if (string.IsNullOrEmpty(_mtrlname))
+                        {
+                            _mtrlname = Convert.ToString(reader["mattressname"]);
+                        }
+
                         rslt.mattress = new u_mattress()
                         {
                             mattressid = request.mattressid.Value,
@@ -81,12 +90,15 @@ namespace JLHHJSvr.Excutor
                             erp_configcodetype = Convert.ToInt32(reader["erp_configcodetype"]),
                             erp_mtrltypeid = Convert.ToInt32(reader["erp_mtrltypeid"]),
                             erp_mtrlcode = Convert.ToString(reader["erp_mtrlcode"]),
-                            erp_mtrlname = Convert.ToString(reader["erp_mtrlname"]),
+                            erp_mtrlname = _mtrlname,
                             erp_mtrlmode = _mtrlmode,
                             erp_mtrlunit = Convert.ToString(reader["erp_mtrlunit"]),
                             erp_mtrlengname = Convert.ToString(reader["erp_mtrlengname"]),
                             erp_mtrltype = Convert.ToString(reader["erp_mtrltype"]),
-                            old_mtrlname = Convert.ToString(reader["old_mtrlname"])
+                            old_mtrlname = Convert.ToString(reader["old_mtrlname"]),
+                            yw_flag = Convert.ToInt32(reader["yw_flag"]),
+                            js1_flag = Convert.ToInt32(reader["js1_flag"]),
+                            js2_flag = Convert.ToInt32(reader["js2_flag"])
                         };
                     }
                 }

JLHHJSvr/Helper/ERPHelper.cs

@@ -186,6 +186,7 @@ namespace JLHHJSvr.Helper
             if (string.IsNullOrEmpty(errMsg))
             {
                 mtrl.erp_mtrlid = (l1Rslt.GetValue("mtrlids") as JArray)[0].Value<int>();
+                mtrl.erp_mtrlcode = (l1Rslt.GetValue("mtrlcodes") as JArray)[0].Value<string>();
                 Trace.Write($"Update erp_mtrlid={mtrl.erp_mtrlid} WHERE mattressid={mtrl.mattressid} AND erp_mtrlcode={mtrl.erp_mtrlcode}");
                 DbSqlHelper.Update(cmd, mtrl, "erp_mtrlid");
             }

JLHHJSvr/Helper/InterfaceHelper.cs

@@ -36,12 +36,12 @@ namespace JLHHJSvr.Helper
                 throw new LJCommonException("错误的床垫id");
             }
 
-            AutoSetMtrlName(mattress, mxlist);
+            //AutoSetMtrlName(mattress, mxlist);
 
-            if (string.IsNullOrEmpty(mattress.erp_mtrlcode))
-            {
-                throw new LJCommonException("请输入物料名称!");
-            }
+            //if (string.IsNullOrEmpty(mattress.erp_mtrlcode))
+            //{
+            //    throw new LJCommonException("请输入物料名称!");
+            //}
 
             if (mattress.erp_mtrltypeid == null || mattress.erp_mtrltypeid <= 0)
             {