核价后台： 1、修改床垫清单，编辑时默认带出erp_mtrlname逻辑

JLHHJSvr/Excutor/GetMattressInterfaceListExcutor.cs

@@ -79,18 +79,6 @@ namespace JLHHJSvr.Excutor
                 {
                     if (reader.Read()) {
 
-                        var _mtrlmode = Convert.ToString(reader["erp_mtrlmode"]);
-                        if (string.IsNullOrEmpty(_mtrlmode))
-                        {
-                            _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,
@@ -105,8 +93,8 @@ 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 = _mtrlname,
-                            erp_mtrlmode = _mtrlmode,
+                            erp_mtrlname = Convert.ToString(reader["erp_mtrlname"]),
+                            erp_mtrlmode = Convert.ToString(reader["erp_mtrlmode"]),
                             erp_mtrlunit = Convert.ToString(reader["erp_mtrlunit"]),
                             erp_mtrlengname = Convert.ToString(reader["erp_mtrlengname"]),
                             erp_mtrltype = Convert.ToString(reader["erp_mtrltype"]),
@@ -127,6 +115,17 @@ namespace JLHHJSvr.Excutor
 
                 if(request.isEdit == 1)
                 {
+                    if (string.IsNullOrEmpty(rslt.mattress.erp_mtrlmode))
+                    {
+                        rslt.mattress.erp_mtrlmode = rslt.mattress.mattress_width + "*" + rslt.mattress.mattress_length + "*" + rslt.mattress.mattress_height;
+                    }
+
+                    if (string.IsNullOrEmpty(rslt.mattress.erp_mtrlname))
+                    {
+                        rslt.mattress.erp_mtrlname = rslt.mattress.mattressname;
+                    }
+
+
                     if (rslt.mattress.erp_configcodetype <= 0)
                     {
                         cmd.CommandText = @"SELECT TOP 1 u_configure_type.contfigtypeid