故障品装箱确认使用参数配置

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -214,11 +214,14 @@ namespace UAS_MES.Make
                                 return;
                             }
                         }
-                        //if (dt.Rows[0]["ms_checkpack"].ToString() != "0")
-                        //{
-                        //    OperateResult.AppendText(sn_code.Text+ "处于故障品完工装箱限制状态,不允许采集装箱\n", Color.Red);
-                        //    return;
-                        //}
+                        if (dh.CheckExist("configs", "code = 'checkpack' and data = '1'"))
+                        {
+                            if (dt.Rows[0]["ms_checkpack"].ToString() != "0")
+                            {
+                                OperateResult.AppendText(sn_code.Text + "处于故障品完工装箱限制状态,不允许采集装箱\n", Color.Red);
+                                return;
+                            }
+                        }
                         string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
                         if (nextstepcode != "" && nextstepcode != User.CurrentStepCode)
                         {

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -284,11 +284,14 @@ namespace UAS_MES.Make
                                 return;
                             }
                         }
-                        //if (dt.Rows[0]["ms_checkpack"].ToString() != "0")
-                        //{
-                        //    OperateResult.AppendText(sn_code.Text + "处于故障品完工装箱限制状态,不允许采集装箱\n", Color.Red);
-                        //    return;
-                        //}
+                        if (dh.CheckExist("configs", "code = 'checkpack' and data = '1'"))
+                        {
+                            if (dt.Rows[0]["ms_checkpack"].ToString() != "0")
+                            { 
+                                OperateResult.AppendText(sn_code.Text + "处于故障品完工装箱限制状态,不允许采集装箱\n", Color.Red);
+                                return;
+                            }
+                        }
                         string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
                         if (nextstepcode != "" && nextstepcode != User.CurrentStepCode)
                         {