Browse Source

装箱不限制出入库

callm 6 days ago
parent
commit
021aee2038

+ 9 - 9
UAS_MES_JWS/FunctionCode/Packing/Packing_PackageCollection.cs

@@ -316,15 +316,15 @@ namespace UAS_MES_NEW.Packing
                             }
                             return;
                         }
-                        if (dt.Rows[0]["ms_iostatus"].ToString() != "0")
-                        {
-                            OperateResult.AppendText(">>序列号" + sn_code.Text + "已入库不允许采集\n", Color.Red, sn_code);
-                            if (md.IsOpen)
-                            {
-                                md.SendOrder("M502_ON");
-                            }
-                            return;
-                        }
+                        //if (dt.Rows[0]["ms_iostatus"].ToString() != "0")
+                        //{
+                        //    OperateResult.AppendText(">>序列号" + sn_code.Text + "已入库不允许采集\n", Color.Red, sn_code);
+                        //    if (md.IsOpen)
+                        //    {
+                        //        md.SendOrder("M502_ON");
+                        //    }
+                        //    return;
+                        //}
                         //保证箱内容量不会被重置
                         if (pa_standardqty.Text != "0" && pa_standardqty.Text != "")
                         {

+ 9 - 9
UAS_MES_JWS/FunctionCode/Packing/Packing_PackageCollection1.cs

@@ -271,15 +271,15 @@ namespace UAS_MES_NEW.Packing
                             }
                             return;
                         }
-                        if (dt.Rows[0]["ms_iostatus"].ToString() != "0")
-                        {
-                            OperateResult.AppendText(">>序列号" + sn_code.Text + "已入库不允许采集\n", Color.Red, sn_code);
-                            if (md.IsOpen)
-                            {
-                                md.SendOrder("M502_ON");
-                            }
-                            return;
-                        }
+                        //if (dt.Rows[0]["ms_iostatus"].ToString() != "0")
+                        //{
+                        //    OperateResult.AppendText(">>序列号" + sn_code.Text + "已入库不允许采集\n", Color.Red, sn_code);
+                        //    if (md.IsOpen)
+                        //    {
+                        //        md.SendOrder("M502_ON");
+                        //    }
+                        //    return;
+                        //}
                         //保证箱内容量不会被重置
                         if (pa_standardqty.Text != "0" && pa_standardqty.Text != "")
                         {

+ 9 - 9
UAS_MES_JWS/FunctionCode/Packing/Packing_PackageCollection_T.cs

@@ -321,15 +321,15 @@ namespace UAS_MES_NEW.Packing
                             }
                             return;
                         }
-                        if (dt.Rows[0]["ms_iostatus"].ToString() != "0")
-                        {
-                            OperateResult.AppendText(">>序列号" + sn_code.Text + "已入库不允许采集\n", Color.Red, sn_code);
-                            if (md.IsOpen)
-                            {
-                                md.SendOrder("M502_ON");
-                            }
-                            return;
-                        }
+                        //if (dt.Rows[0]["ms_iostatus"].ToString() != "0")
+                        //{
+                        //    OperateResult.AppendText(">>序列号" + sn_code.Text + "已入库不允许采集\n", Color.Red, sn_code);
+                        //    if (md.IsOpen)
+                        //    {
+                        //        md.SendOrder("M502_ON");
+                        //    }
+                        //    return;
+                        //}
                         //保证箱内容量不会被重置
                         if (pa_standardqty.Text != "0" && pa_standardqty.Text != "")
                         {

+ 9 - 0
UAS_MES_JWS/UAS_MES_JWS.csproj

@@ -763,6 +763,12 @@
     <Compile Include="FunctionCode\Make\Make_ProductTest.Designer.cs">
       <DependentUpon>Make_ProductTest.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_ChangeCode.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_ChangeCode.Designer.cs">
+      <DependentUpon>Make_ChangeCode.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\OQC\OQC_SamplingDataCollection_OffLine.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1747,6 +1753,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_ProductTest.resx">
       <DependentUpon>Make_ProductTest.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_ChangeCode.resx">
+      <DependentUpon>Make_ChangeCode.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\OQC\OQC_SamplingDataCollection_OffLine.resx">
       <DependentUpon>OQC_SamplingDataCollection_OffLine.cs</DependentUpon>
     </EmbeddedResource>