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

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -99,7 +99,8 @@ namespace UAS_MES.Make
                     OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "为大箱,不可进行操作\n", Color.Red, pa_outboxcode);
                     return;
                 }
-                else {
+                else if (pa_type != "3")
+                {
                     OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "没有记录,不可进行操作\n", Color.Red, pa_outboxcode);
                     return;
                 }