1、优化主副规格排序获取

2、修复床垫分享报价问题

JLHHJSvr/DataStore/web_mattress.xml

@@ -153,7 +153,7 @@
 		</when>
 	</where>
 	<orderstr>
-		mattressid DESC
+		mattressid DESC,parentid
 	</orderstr>
 	<displayfields>
 		<field field="mattresscode">报价唯一码</field>

JLHHJSvr/Helper/MattressHelper.cs

@@ -2037,7 +2037,7 @@ namespace JLHHJSvr.Helper
 
                 if (mattress_copy.mattressrelcode.IndexOf("@@") > -1)
                 {
-                    mattress_copy.mattresscode = mattress_copy.mattresscode.Substring(0, mattress_copy.mattresscode.IndexOf("@@"));
+                    mattress_copy.mattressrelcode = mattress_copy.mattressrelcode.Substring(0, mattress_copy.mattressrelcode.IndexOf("@@"));
                 }
 
                 mattress_copy.mattressrelcode += " @@";
@@ -2115,20 +2115,18 @@ namespace JLHHJSvr.Helper
 
                     if (sub.mattresscode.IndexOf("@@") > -1)
                     {
-                        sub.mattresscode = sub.mattresscode.Substring(sub.mattresscode.IndexOf("@@"));
+                        sub.mattresscode = sub.mattresscode.Substring(0, sub.mattresscode.IndexOf("@@")).Trim();
+                        sub.mattresscode += " @@";
+                        sub.mattresscode += copy_time;
                     }
 
-                    sub.mattresscode += " @@";
-                    sub.mattresscode += DateTime.Now.ToString("yyyMMdd_mmhhss");
-
                     if (sub.mattressrelcode.IndexOf("@@") > -1)
                     {
-                        sub.mattressrelcode = sub.mattressrelcode.Substring(sub.mattressrelcode.IndexOf("@@"));
+                        sub.mattressrelcode = sub.mattressrelcode.Substring(0, sub.mattressrelcode.IndexOf("@@")).Trim();
+                        sub.mattressrelcode += " @@";
+                        sub.mattressrelcode += copy_time;
                     }
 
-                    sub.mattressrelcode += " @@";
-                    sub.mattressrelcode += DateTime.Now.ToString("yyyMMdd_mmhhss");
-
                     sub.mattress_width = mattress.mattress_width > 0 ? mattress.mattress_width : sub.mattress_width;
                     sub.mattress_length = mattress.mattress_length > 0 ? mattress.mattress_length : sub.mattress_length;
 
@@ -2842,21 +2840,6 @@ namespace JLHHJSvr.Helper
                         mx.mattressid = 0;
                         mx.mattressmxid = 0;
                     }
-
-                    var copy_time = DateTime.Now.ToString("yyyMMdd_mmhhss");
-                    if (child.mattresscode.IndexOf("@@") > -1)
-                    {
-                        child.mattresscode = child.mattresscode.Substring(0, child.mattresscode.IndexOf("@@")).Trim();
-                        child.mattresscode += " @@";
-                        child.mattresscode += copy_time;
-                    }
-
-                    if (child.mattressrelcode.IndexOf("@@") > -1)
-                    {
-                        child.mattresscode = child.mattressrelcode.Substring(0, child.mattressrelcode.IndexOf("@@")).Trim();
-                        child.mattressrelcode += " @@";
-                        child.mattressrelcode += copy_time;
-                    }
                 }
                 else InitMattressSubSpecs(parent, child);