[万利达MES]OQC断批规则增加按工单断批

UAS-MES/CustomControl/TextBoxWithIcon/SnCollectionBox.cs

@@ -71,8 +71,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                         return ;
                     }
                     else
-                    {
-                        
+                    {    
                         if (SystemInf.UpperCollection)
                             base.Text =  sn.ToUpper();
                         else

UAS-MES/FunctionCode/Make/Make_CartonBoxSNWeigh.cs

@@ -367,6 +367,10 @@ namespace UAS_MES.Make
             {
                 condition += " and ob_salecode='" + ma_salecode.Text + "'";
             }
+            else if (pr_sendchecktype.Text == "MakeCode")
+            {
+                condition += " and ob_makecode='" + ma_code.Text + "'";
+            }
             sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
             sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + pr_code.Text + "' and ");
             sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -355,6 +355,10 @@ namespace UAS_MES.Make
             {
                 condition += " and ob_salecode='" + ma_salecode.Text + "'";
             }
+            else if (pr_sendchecktype.Text == "MakeCode")
+            {
+                condition += " and ob_makecode='" + ma_code.Text + "'";
+            }
             sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
             sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + pr_code.Text + "' and ");
             sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -372,6 +372,10 @@ namespace UAS_MES.Make
             {
                 condition += " and ob_salecode='" + ma_salecode.Text + "'";
             }
+            else if (pr_sendchecktype.Text == "MakeCode")
+            {
+                condition += " and ob_makecode='" + ms_makecode.Text + "'";
+            }
             sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
             sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + pr_code.Text + "' and ");
             sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -736,6 +736,10 @@ namespace UAS_MES.Make
             {
                 condition += " and ob_salecode='" + ms_salecode.Text + "'";
             }
+            else if (pr_sendchecktype.Text == "MakeCode")
+            {
+                condition += " and ob_makecode='" + ms_makecode.Text + "'";
+            }
             sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
             sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + pr_code.Text + "' and ");
             sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -775,6 +775,10 @@ namespace UAS_MES.Make
             {
                 condition += " and ob_salecode='" + ms_salecode.Text + "'";
             }
+            else if (pr_sendchecktype.Text == "MakeCode")
+            {
+                condition += " and ob_makecode='" + ms_makecode.Text + "'";
+            }
             sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
             sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + pr_code.Text + "' and ");
             sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);

UAS-MES/FunctionCode/Make/Make_SmtTestCollection.cs

@@ -810,6 +810,10 @@ namespace UAS_MES.Make
             {
                 condition += " and ob_salecode='" + ma_salecode.Text + "'";
             }
+            else if (pr_sendchecktype.Text == "MakeCode")
+            {
+                condition += " and ob_makecode='" + ma_code.Text + "'";
+            }
             sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
             sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + ma_prodcode.Text + "' and ");
             sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);

UAS-MES/FunctionCode/Make/Make_SmtbdTestCollection.cs

@@ -783,6 +783,10 @@ namespace UAS_MES.Make
             {
                 condition += " and ob_salecode='" + ma_salecode.Text + "'";
             }
+            else if (pr_sendchecktype.Text == "MakeCode")
+            {
+                condition += " and ob_makecode='" + ma_code.Text + "'";
+            }
             sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
             sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + ma_prodcode.Text + "' and ");
             sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -483,6 +483,10 @@ namespace UAS_MES.Make
             {
                 condition += " and ob_salecode='" + ms_salecode.Text + "'";
             }
+            else if (pr_sendchecktype.Text == "MakeCode")
+            {
+                condition += " and ob_makecode='" + ms_makecode.Text + "'";
+            }
             sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
             sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + pr_code.Text + "' and ");
             sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);

UAS-MES/FunctionCode/Make/Make_SpiTestCollection.cs

@@ -784,6 +784,10 @@ namespace UAS_MES.Make
             {
                 condition += " and ob_salecode='" + ma_salecode.Text + "'";
             }
+            else if (pr_sendchecktype.Text == "MakeCode")
+            {
+                condition += " and ob_makecode='" + ma_code.Text + "'";
+            }
             sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
             sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + ma_prodcode.Text + "' and ");
             sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -638,6 +638,10 @@ namespace UAS_MES.Make
             {
                 condition += " and ob_salecode='" + ma_salecode.Text + "'";
             }
+            else if (pr_sendchecktype.Text == "MakeCode")
+            {
+                condition += " and ob_makecode='" + ma_code.Text + "'";
+            }
             sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
             sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + ma_prodcode.Text + "' and ");
             sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);

UAS-MES/FunctionCode/Make/Make_XrayTestCollection.cs

@@ -790,6 +790,10 @@ namespace UAS_MES.Make
             {
                 condition += " and ob_salecode='" + ma_salecode.Text + "'";
             }
+            else if (pr_sendchecktype.Text == "MakeCode")
+            {
+                condition += " and ob_makecode='" + ma_code.Text + "'";
+            }
             sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
             sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + ma_prodcode.Text + "' and ");
             sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);