Explorar el Código

1、修复分享报价出现主键冲突问题

MY hace 12 horas
padre
commit
a607e89272
Se han modificado 1 ficheros con 19 adiciones y 3 borrados
  1. 19 3
      JLHHJSvr/Helper/MattressHelper.cs

+ 19 - 3
JLHHJSvr/Helper/MattressHelper.cs

@@ -2027,21 +2027,22 @@ namespace JLHHJSvr.Helper
                 }
 
                 // 判断copy_bedNet.bednetcode是否存在@@字符串,如果存在,则删除@@后面的字符串,包括@@
+                var copy_time = DateTime.Now.ToString("yyyMMdd_mmhhss");
                 if (mattress_copy.mattresscode.IndexOf("@@") > -1)
                 {
                     mattress_copy.mattresscode = mattress_copy.mattresscode.Substring(mattress_copy.mattresscode.IndexOf("@@"));
                 }
 
                 mattress_copy.mattresscode += " @@";
-                mattress_copy.mattresscode += DateTime.Now.ToString("yyyMMdd_mmhhss");
+                mattress_copy.mattresscode += copy_time;
 
                 if (mattress_copy.mattressrelcode.IndexOf("@@") > -1)
                 {
-                    mattress_copy.mattressrelcode = mattress_copy.mattressrelcode.Substring(mattress_copy.mattressrelcode.IndexOf("@@"));
+                    mattress_copy.mattressrelcode = mattress_copy.mattressrelcode.Substring(mattress_copy.mattressrelcode.IndexOf("@@"));;
                 }
 
                 mattress_copy.mattressrelcode += " @@";
-                mattress_copy.mattressrelcode += DateTime.Now.ToString("yyyMMdd_mmhhss");
+                mattress_copy.mattressrelcode += copy_time;
 
                 mattress_copy.mattressid = 0;
 
@@ -2842,6 +2843,21 @@ 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(child.mattresscode.IndexOf("@@"));
+                        child.mattresscode += " @@";
+                        child.mattresscode += copy_time;
+                    }
+
+                    if (child.mattressrelcode.IndexOf("@@") > -1)
+                    {
+                        child.mattressrelcode = child.mattressrelcode.Substring(child.mattressrelcode.IndexOf("@@"));
+                        child.mattressrelcode += " @@";
+                        child.mattressrelcode += copy_time;
+                    }
                 }
                 else InitMattressSubSpecs(parent, child);