Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -211,7 +211,7 @@ namespace UAS_MES.Make
 
         private void Make_FuselageLabelPrint_FormClosing(object sender, FormClosingEventArgs e)
         {
-            lbl.Quit();
+            BaseUtil.ClosePrint(lbl);
         }
 
         private void Make_FuselageLabelPrint_SizeChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -89,6 +89,7 @@ namespace UAS_MES.Make
         private void Make_RePrintLabel_FormClosing(object sender, FormClosingEventArgs e)
         {
             //窗口关闭的时候
+            BaseUtil.ClosePrint(lbl);
         }
 
         private void radioButton_CheckedChange(object sender, EventArgs e)

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1403,7 +1403,7 @@ namespace UAS_MES.PublicMethod
                     break;
                 case "RULE":
                     int sp_length = int.Parse(iLength != "" ? iLength : "0");
-                    if (iSN.Substring(0, iPrefix.Length) == iPrefix || iPrefix == "")
+                    if (iSN.StartsWith(iPrefix) || iPrefix == "")
                     {
                         //进行长度匹配
                         if (iSN.Length == sp_length || sp_length == 0)