栈板采集增加在栈板号录入卡通箱与大箱的防呆

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -99,11 +99,6 @@ namespace UAS_MES.Make
                     OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "为大箱,不可进行操作\n", Color.Red, pa_outboxcode);
                     return;
                 }
-                else if (pa_type != "3")
-                {
-                    OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "没有记录,不可进行操作\n", Color.Red, pa_outboxcode);
-                    return;
-                }
                 LoadGridData();
                 sql.Clear();
                 sql.Append("select pa_makecode,pa_id,pa_status,nvl(pa_standardqty,PR_PALLETQTY)pa_standardqty,pa_prodcode,pa_packageqty,pa_totalqty,pa_salecode,pa_currentqty,pr_code pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode ");

UAS-MES/UAS-MES.csproj

@@ -38,11 +38,11 @@
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
-    <MinimumRequiredVersion>1.0.0.604</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.606</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>605</ApplicationRevision>
+    <ApplicationRevision>607</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>