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

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -101,7 +101,7 @@ namespace UAS_MES.Make
                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
                 clearAll();
             }
-            else if (btn.Name == "CartonBox" || btn.Checked)
+            else if (btn.Name == "CartonBox" && btn.Checked)
             {
                 OperateResult.AppendText(">>请输入卡通箱号\n", Color.Black);
                 clearAll();