核价后台：1、删除床垫报价时，增加检测副规格状态；

2、修复旧数据导入时显示未实例化提示
3、床垫报价保存时，副规格床网匹配尺寸取消跟随主规格的规格与其床网规格的差值

JLHHJSvr/Excutor/DelMattressExcutor.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
+using DirectService.Tools;
 using JLHHJSvr.BLL;
 using JLHHJSvr.Com;
 using JLHHJSvr.Com.Model;
@@ -45,7 +46,7 @@ namespace JLHHJSvr.Excutor
                         foreach (int itemid in request.mattressids)
                         {
                             var mattressInfo = new u_mattress() { mattressid = itemid };
-                            if (DbSqlHelper.SelectOne(cmd, mattressInfo, "flag, js1_flag") != 1)
+                            if (DbSqlHelper.SelectOne(cmd, mattressInfo, "flag, js1_flag, mattresscode, parentid") != 1)
                             {
                                 rslt.ErrMsg = "查找报价单据失败：" + itemid;
                                 return;
@@ -53,13 +54,41 @@ namespace JLHHJSvr.Excutor
 
                             if (mattressInfo.flag == 1)
                             {
-                                rslt.ErrMsg = "床垫已审核，不能删除！（" + itemid + ")";
-                                return;
+                                throw new LJCommonException("床垫已审核，不能删除！（" + mattressInfo.mattresscode + ")");
                             }
                             if (mattressInfo.js1_flag == 1)
                             {
-                                rslt.ErrMsg = "资料已技术审核不能删除！（" + itemid + ")";
-                                return;
+                                throw new LJCommonException("资料已技术审核不能删除！（" + mattressInfo.mattresscode + ")");
+                            }
+
+                            if (mattressInfo.parentid == null || mattressInfo.parentid == 0)
+                            {
+
+                                var list = new List<u_mattress>();
+                                var outputFields = @"flag, js1_flag, mattresscode,";
+                                var selectStr = @" SELECT flag, js1_flag, mattresscode, parentid FROM u_mattress";
+
+                                var whereList = new List<string>();
+                                whereList.Add("parentid = @parentid");
+
+
+                                DbSqlHelper.SelectJoin(cmd, selectStr, ListEx.GetWhereStr(whereList), new Dictionary<string, object>() { { "@parentid", mattressInfo.mattressid } }, "mattressid", outputFields, 0, 0, list);
+
+                                if (list.Count > 0)
+                                {
+                                    foreach(var mtitem in list)
+                                    {
+
+                                        if (mtitem.flag == 1)
+                                        {
+                                            throw new LJCommonException("副规格床垫已审核，不能删除！（" + mtitem.mattresscode + ")");
+                                        }
+                                        if (mtitem.js1_flag == 1)
+                                        {
+                                            throw new LJCommonException("副规格床垫资料已技术审核不能删除！（" + mtitem.mattresscode + ")");
+                                        }
+                                    }
+                                }
                             }
 
                             if (DbSqlHelper.Delete(cmd, mattressInfo) <= 0)

JLHHJSvr/Excutor/SaveMattressExcutor.cs

@@ -75,7 +75,6 @@ namespace JLHHJSvr.Excutor
                 else
                 {
                     #region 状态判断
-                    Trace.Write($"状态判断save mattress={request.mattress.mattressid}, mattressid={request.mattress.ToString()}");
                     if (request.mattress.mattressid > 0) {
                         var mattressInfo = new u_mattress() { mattressid = request.mattress.mattressid };
                         if (DbSqlHelper.SelectOne(cmd, mattressInfo, "flag, xd_flag, yw_flag, mattresscode, parentid") == 1)
@@ -87,7 +86,7 @@ namespace JLHHJSvr.Excutor
                             }
                         }
                     }
-                    if (request.subspecs.Count > 0)
+                    if (request.subspecs != null && request.subspecs.Count > 0)
                     {
                         foreach (var submx in request.subspecs)
                         {
@@ -206,8 +205,10 @@ namespace JLHHJSvr.Excutor
                                             var _bednetMx = helperBednet.GetBedNetMxList(item.mtrlid.Value);
                                             var _bednetSpring = helperBednet.GetBedNetSpringList(item.mtrlid.Value);
 
-                                            _bednet.mattress_width = Convert.ToInt32(submx["mattress_width"]) - (request.mattress.mattress_width - _bednet.mattress_width);
-                                            _bednet.mattress_length = Convert.ToInt32(submx["mattress_length"]) - (request.mattress.mattress_length - _bednet.mattress_length);
+                                            //_bednet.mattress_width = Convert.ToInt32(submx["mattress_width"]) - (request.mattress.mattress_width - _bednet.mattress_width);
+                                            //_bednet.mattress_length = Convert.ToInt32(submx["mattress_length"]) - (request.mattress.mattress_length - _bednet.mattress_length);
+                                            _bednet.mattress_width = Convert.ToInt32(submx["mattress_width"]);
+                                            _bednet.mattress_length = Convert.ToInt32(submx["mattress_length"]);
 
                                             var _spring_qty_width = Convert.ToInt32(submx["spring_qty_width_" + bednetIndex]);
                                             var _spring_qty_length = Convert.ToInt32(submx["spring_qty_length_" + bednetIndex]);

JLHHJSvr/Excutor/SaveMattressInterfaceExcutor.cs

@@ -69,7 +69,6 @@ namespace JLHHJSvr.Excutor
                 {
                     try
                     {
-                        Trace.Write($"SaveMattressInterface={request.mattress.mattressid},mattressid={request.mattress.ToString()}");
                         interfaceHelper.SaveMattressInterface(request.mattress, request.interfaceList, request.qdList);
 
                         cmd.Transaction.Commit();