1、新增床垫清单补充，副规格类别默认带主规格类别

2、床垫清单新增业务下单日期，并按业务下单日期排序

JLHHJSvr/DataStore/web_mattress_interfacelist.xml

@@ -36,6 +36,7 @@ SELECT u_mattress.mattressid
 		,auditingdate
 		,createtime
 		,createby
+		,xd_auditingdate
 		,yw_flag
 		,yw_auditingrep
 		,yw_auditingdate
@@ -113,7 +114,7 @@ SELECT u_mattress.mattressid
 		(@arg_datetype = 2 AND u_mattress.js2_auditingdate <= @arg_enddate)
 	</when>
   </where>
-  <orderstr>mattressid DESC</orderstr>
+  <orderstr>xd_auditingdate DESC,mattressid DESC</orderstr>
   <displayfields>
     <field field="yw_flag" datatype="checkbox">业务审核</field>
     <field field="js1_flag" datatype="checkbox">产品补充审核</field>
@@ -148,5 +149,6 @@ SELECT u_mattress.mattressid
     <field field="taxes" datatype="number">税金</field>
     <field field="erp_mtrlengname">原物料编码</field>
     <field field="erp_configcodetype">ERP配置类型</field>
+    <field field="xd_auditingdate" datatype="datetime">业务下单日期</field>
   </displayfields>
 </select>

JLHHJSvr/Excutor/GetMattressInterfaceListExcutor.cs

@@ -152,18 +152,38 @@ namespace JLHHJSvr.Excutor
 
                     if (rslt.mattress.erp_mtrltypeid <= 0)
                     {
-                        cmd.CommandText = @"SELECT itemvalue FROM sys_user_filestring WHERE dwname = @dwname AND itemname = @itemname AND empid = @empid";
-                        cmd.Parameters.Clear();
-                        cmd.Parameters.AddWithValue("@empid", tokendata.empid);
-                        cmd.Parameters.AddWithValue("@dwname", "dw_mattress_interface_yw_edit");
-                        cmd.Parameters.AddWithValue("@itemname", "mtrltypeid");
-                        using (var readerItem = cmd.ExecuteReader())
+                        int mtrltypeid = 0;
+                        if(rslt.mattress.parentid > 0)
                         {
-                            if (readerItem.Read())
+                            cmd.CommandText = @"SELECT erp_mtrltypeid FROM u_mattress WHERE mattressid = @mattressid";
+                            cmd.Parameters.Clear();
+                            cmd.Parameters.AddWithValue("@mattressid", rslt.mattress.parentid);
+                            using (var reader = cmd.ExecuteReader())
                             {
-                                rslt.mattress.erp_mtrltypeid = Convert.ToInt32(readerItem["itemvalue"]);
+                                if (reader.Read())
+                                {
+                                    mtrltypeid = Convert.ToInt32(reader["erp_mtrltypeid"]);
+                                }
                             }
                         }
+
+                        if(mtrltypeid == 0)
+                        {
+                            cmd.CommandText = @"SELECT itemvalue FROM sys_user_filestring WHERE dwname = @dwname AND itemname = @itemname AND empid = @empid";
+                            cmd.Parameters.Clear();
+                            cmd.Parameters.AddWithValue("@empid", tokendata.empid);
+                            cmd.Parameters.AddWithValue("@dwname", "dw_mattress_interface_yw_edit");
+                            cmd.Parameters.AddWithValue("@itemname", "mtrltypeid");
+                            using (var readerItem = cmd.ExecuteReader())
+                            {
+                                if (readerItem.Read())
+                                {
+                                    mtrltypeid = Convert.ToInt32(readerItem["itemvalue"]);
+                                }
+                            }
+                        }
+
+                        rslt.mattress.erp_mtrltypeid = mtrltypeid;
                     }
 
                     if (rslt.mattress.erp_mtrlunit == "")