修改生成箱号的方法，去除限制

UAS-MES/PublicMethod/BaseUtil.cs

@@ -122,7 +122,7 @@ namespace UAS_MES.PublicMethod
                     string controlName = collection[i].Name;
                     string controlsTag = collection[i].Tag == null ? "" : collection[i].Tag.ToString();
                     //默认给TextBox和Label赋值
-                    if (collection[i] is TextBox || collection[i] is Label || collection[i] is SearchTextBox || collection[i] is MaCodeSearchTextBox)
+                    if (collection[i] is TextBox || collection[i] is Label || collection[i] is SearchTextBox || collection[i] is MaCodeSearchTextBox||collection[i] is EnterTextBox ||collection[i] is TextBoxGeneratePaCode)
                     {
                         for (int j = 0; j < dt.Columns.Count; j++)
                         {

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1402,10 +1402,10 @@ namespace UAS_MES.PublicMethod
         {
             StringBuilder code = new StringBuilder();
             object pr_kind = dh.getFieldDataByCondition("product", "pr_tracekind", "pr_id=" + pr_id);
-            if (pr_kind.ToString() != "")
-            {
-                if ((kind.Equals("1") && pr_kind.ToString() == "1") || (kind.Equals("2") && pr_kind.ToString() == "2"))
-                {
+            //if (pr_kind.ToString() != "")
+            //{
+                //if ((kind.Equals("1") && pr_kind.ToString() == "1") || (kind.Equals("2") && pr_kind.ToString() == "2"))
+                //{
                     // 单间管控或者批管控
                     DataTable dt = dh.getFieldsDataByCondition("barcodeSet", new string[] { "bs_id ,bs_lenprid,bs_lennum,bs_maxnum" }, "bs_type='PACK'");
                     if (dt.Rows.Count > 0)
@@ -1415,9 +1415,9 @@ namespace UAS_MES.PublicMethod
                         dh.UpdateByCondition("barcodeSet", "bs_maxnum=bs_maxnum+1", "bs_type='PACK' and  bs_id=" + dt.Rows[0]["bs_id"]);// 流水号增加1
                     }
                     else BaseUtil.ShowError("未定义包装箱号产生规则或规则未审核");
-                }
-                else BaseUtil.ShowError("物料管控类型错误！该物料管控类型为不管控");
-            }
+                //}
+                //else BaseUtil.ShowError("物料管控类型错误！该物料管控类型为不管控");
+            //}
             return code.ToString();
         }
     }