callm 3 недель назад
Родитель
Сommit
8c3450ded7

+ 17 - 14
UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -43,15 +43,15 @@ namespace UAS_MES.Make
         //创建打印进程
         private void NewPrint()
         {
-            try
-            {
-                lbl = new ApplicationClass();
-                BaseUtil.WriteLbl();
-            }
-            catch (Exception ex)
-            {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
-            }
+            //try
+            //{
+            //    lbl = new ApplicationClass();
+            //    BaseUtil.WriteLbl();
+            //}
+            //catch (Exception ex)
+            //{
+            //    OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+            //}
         }
 
         private void PackCollection_Load(object sender, EventArgs e)
@@ -197,11 +197,14 @@ namespace UAS_MES.Make
                     {
                         sn_code.Text = sn_code.Text.Split(':')[1];
                     }
-                    //else
-                    //{
-                    //    sn_code.Clear();
-                    //    return;
-                    //}
+                    else if (sn_code.Text.Contains("S/N:")) { 
+                    
+                    }
+                    else
+                    {
+                        sn_code.Clear();
+                        return;
+                    }
                 }
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {

+ 9 - 5
UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -187,11 +187,15 @@ namespace UAS_MES.Make
                     {
                         ms_sncode.Text = ms_sncode.Text.Split(':')[1];
                     }
-                    //else
-                    //{
-                    //    ms_sncode.Clear();
-                    //    return;
-                    //}
+                    else if (ms_sncode.Text.Contains("S/N:"))
+                    {
+
+                    }
+                    else
+                    {
+                        ms_sncode.Clear();
+                        return;
+                    }
                 }
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {