添加采集字段

UAS-出货标签管理/UAS_出货标签管理.cs

@@ -756,6 +756,18 @@ namespace UAS_LabelMachine
                             setdata.Remove("LOTNO");
                             length--;
                             break;
+                        case "REEL ID":
+                            cell = LabelInf.Rows[CurrentRowIndex].Cells["pib_barcode"];
+                            Matchstr = MatchStr(data[j], "REEL ID");
+                            setdata.Remove("REEL ID");
+                            length--;
+                            break;
+                        case "UPN":
+                            cell = LabelInf.Rows[CurrentRowIndex].Cells["pib_custbarcode"];
+                            Matchstr = MatchStr(data[j], "UPN");
+                            setdata.Remove("UPN");
+                            length--;
+                            break;
                         case "MPN":
                             cell = LabelInf.Rows[CurrentRowIndex].Cells["pr_vendprodcode"];
                             Matchstr = MatchStr(data[j], "MPN");
@@ -1100,7 +1112,7 @@ namespace UAS_LabelMachine
             GetSingleBoxData();
             GetMidBoxData();
         }
-
+        bool InitGetLabel = true;
         /// <summary>
         /// 出入库单录入框的回车事件
         /// </summary>
@@ -1115,7 +1127,9 @@ namespace UAS_LabelMachine
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                 if (dt.Rows.Count > 0)
                 {
+                    InitGetLabel = true;
                     cu_code.Text = dt.Rows[0]["pi_cardcode"].ToString();
+                    InitGetLabel = false;
                     pi_date.Text = dt.Rows[0]["pi_date"].ToString();
                     PI_ID = dt.Rows[0]["pi_id"].ToString();
                     if (dh.GetConfig("AutoBarcode", "ProdInOut!Sale").ToString() != "")
@@ -2608,7 +2622,8 @@ namespace UAS_LabelMachine
 
         private void cu_code_UserControlTextChanged(object sender, EventArgs e)
         {
-            GetInOutInfAndLabelFile();
+            if (!InitGetLabel)
+                GetInOutInfAndLabelFile();
         }
     }
 }

UAS-出货标签管理/采集策略.cs

@@ -18,6 +18,8 @@ namespace UAS_LabelMachine
 
         DataTable dt;
 
+        int ItemNum = 8;
+
         public 采集策略()
         {
             InitializeComponent();
@@ -26,6 +28,8 @@ namespace UAS_LabelMachine
             si_type4.CheckedChanged += CheckChanged;
             si_type2.CheckedChanged += CheckChanged;
             si_type5.CheckedChanged += CheckChanged;
+            si_type6.CheckedChanged += CheckChanged;
+            si_type7.CheckedChanged += CheckChanged;
         }
 
         public 采集策略(string SG_CODE)
@@ -37,6 +41,8 @@ namespace UAS_LabelMachine
             si_type4.CheckedChanged += CheckChanged;
             si_type2.CheckedChanged += CheckChanged;
             si_type5.CheckedChanged += CheckChanged;
+            si_type6.CheckedChanged += CheckChanged;
+            si_type7.CheckedChanged += CheckChanged;
         }
 
         private void 采集策略_Load(object sender, EventArgs e)
@@ -52,6 +58,8 @@ namespace UAS_LabelMachine
             si_kind3.Text = "全部";
             si_kind4.Text = "全部";
             si_kind5.Text = "全部";
+            si_kind6.Text = "全部";
+            si_kind7.Text = "全部";
             if (sg_code.Text != "")
             {
                 KeyEventArgs e2 = new KeyEventArgs(Keys.Enter);
@@ -78,7 +86,7 @@ namespace UAS_LabelMachine
                 sql.Append("update scangroup set sg_name='" + sg_name.Text + "',sg_code='" + sg_code.Text + "',sg_brand='" + pb_name.Text + "',");
                 sql.Append("sg_separator=:sg_separator where sg_id=" + sg_id.Text);
                 dh.ExecuteSql(sql.ToString(), "update", new string[] { sg_separator.Text });
-                for (int i = 1; i < 6; i++)
+                for (int i = 1; i < ItemNum; i++)
                 {
                     //如果从表的ID不为空则表示此条记录已存在需要更新
                     if (Controls["si_id" + i].Text != "")
@@ -110,7 +118,7 @@ namespace UAS_LabelMachine
                     sql.Append("'" + pb_name.Text + "',:sg_separator)");
                     dh.ExecuteSql(sql.ToString(), "insert", new string[] { sg_separator.Text });
                     //遍历需要采集的字段
-                    for (int i = 1; i < 6; i++)
+                    for (int i = 1; i < ItemNum; i++)
                     {
                         //保存四条记录，通过si_enable字段来判断是否启用
                         int Enable = 0;
@@ -174,6 +182,12 @@ namespace UAS_LabelMachine
                 case "品牌":
                     i = 5;
                     break;
+                case "UPN":
+                    i = 6;
+                    break;
+                case "REEL ID":
+                    i = 7;
+                    break;
                 default:
                     break;
             }
@@ -216,7 +230,7 @@ namespace UAS_LabelMachine
                     //通过匹配采集的字段名称给界面赋值
                     for (int i = 0; i < dt.Rows.Count; i++)
                     {
-                        for (int j = 1; j < 6; j++)
+                        for (int j = 1; j < ItemNum; j++)
                         {
                             //如果Item和CheckBox的文字相等
                             if (dt.Rows[i]["si_item"].ToString() == Controls["si_type" + j].Text)