Merge branch 'master' of ssh://10.10.100.21/source/mes-client

PLCDataReader/ClassFile/ModeBusTCPServer.cs

@@ -192,7 +192,7 @@ namespace ClassFile
                 int clientPort = (connection.RemoteEndPoint as IPEndPoint).Port;
 
                 //让客户显示"连接成功的"的信息  
-                string sendmsg = "连接服务端成功！\r\n" + "本地IP:" + clientIP + "，本地端口" + clientPort.ToString();
+                string sendmsg = "Connect Success!" + "LocalIP:" + clientIP + ",LocalPort" + clientPort.ToString();
                 byte[] arrSendMsg = Encoding.UTF8.GetBytes(sendmsg);
                 connection.Send(arrSendMsg);
 

PLCDataReader/MainWindow.Designer.cs

@@ -100,6 +100,7 @@
             // 
             // SelectIP
             // 
+            this.SelectIP.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.SelectIP.FormattingEnabled = true;
             this.SelectIP.Location = new System.Drawing.Point(533, 39);
             this.SelectIP.Name = "SelectIP";
@@ -135,6 +136,7 @@
             // 
             // Encoding
             // 
+            this.Encoding.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.Encoding.FormattingEnabled = true;
             this.Encoding.Items.AddRange(new object[] {
             "UTF-8",

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

@@ -45,13 +45,6 @@
             this.sg_separator_label = new System.Windows.Forms.Label();
             this.CollectionSetting = new System.Windows.Forms.Button();
             this.Si_ItemDGV = new System.Windows.Forms.DataGridView();
-            this.si_detno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.si_index = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.si_kind = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.si_indexstring = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.si_length = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.si_expression = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.si_item = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.CleanDetail = new System.Windows.Forms.Button();
             this.pib_id = new System.Windows.Forms.Label();
             this.pi_cardcode = new System.Windows.Forms.Label();
@@ -121,6 +114,28 @@
             this.sg_code = new UAS_LabelMachine.CustomControl.SearchTextBox();
             this.MessageLog = new UAS_LabelMachine.CustomControl.RichText.RichTextAutoBottom();
             this.LabelInf = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
+            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_ifpick = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_ifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_id1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_vendprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_madein = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_cusbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_cusoutboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_datecode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_custbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_pocode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodspec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_outboxcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pi_inoutno = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.SingleLabel = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.ViVoPlate = new System.Windows.Forms.Button();
@@ -154,28 +169,14 @@
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
-            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_ifpick = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_ifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_id1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_vendprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_madein = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_cusbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_cusoutboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_datecode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_custbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_pocode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custprodspec = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_outboxcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.si_detno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.si_index = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.si_kind = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.si_indexstring = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.si_length = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.si_expression = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.si_item = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.si_expressionitem = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
@@ -355,7 +356,8 @@
             this.si_indexstring,
             this.si_length,
             this.si_expression,
-            this.si_item});
+            this.si_item,
+            this.si_expressionitem});
             this.Si_ItemDGV.Location = new System.Drawing.Point(324, 16);
             this.Si_ItemDGV.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Si_ItemDGV.Name = "Si_ItemDGV";
@@ -363,58 +365,6 @@
             this.Si_ItemDGV.Size = new System.Drawing.Size(134, 144);
             this.Si_ItemDGV.TabIndex = 65;
             // 
-            // si_detno
-            // 
-            this.si_detno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.si_detno.DataPropertyName = "si_detno";
-            this.si_detno.HeaderText = "顺序";
-            this.si_detno.Name = "si_detno";
-            this.si_detno.ReadOnly = true;
-            this.si_detno.Width = 60;
-            // 
-            // si_index
-            // 
-            this.si_index.DataPropertyName = "si_index";
-            this.si_index.HeaderText = "起始位置";
-            this.si_index.Name = "si_index";
-            this.si_index.Visible = false;
-            // 
-            // si_kind
-            // 
-            this.si_kind.DataPropertyName = "si_kind";
-            this.si_kind.HeaderText = "解析方式";
-            this.si_kind.Name = "si_kind";
-            this.si_kind.Visible = false;
-            // 
-            // si_indexstring
-            // 
-            this.si_indexstring.DataPropertyName = "si_indexstring";
-            this.si_indexstring.HeaderText = "索引字符";
-            this.si_indexstring.Name = "si_indexstring";
-            this.si_indexstring.Visible = false;
-            // 
-            // si_length
-            // 
-            this.si_length.DataPropertyName = "si_length";
-            this.si_length.HeaderText = "长度";
-            this.si_length.Name = "si_length";
-            this.si_length.Visible = false;
-            // 
-            // si_expression
-            // 
-            this.si_expression.DataPropertyName = "si_expression";
-            this.si_expression.HeaderText = "正则表达式";
-            this.si_expression.Name = "si_expression";
-            this.si_expression.Visible = false;
-            // 
-            // si_item
-            // 
-            this.si_item.DataPropertyName = "si_item";
-            this.si_item.HeaderText = "采集项目";
-            this.si_item.Name = "si_item";
-            this.si_item.ReadOnly = true;
-            this.si_item.Width = 80;
-            // 
             // CleanDetail
             // 
             this.CleanDetail.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1116,6 +1066,179 @@
             this.LabelInf.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelInf_CellValueChanged);
             this.LabelInf.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.LabelInf_DataError);
             // 
+            // Choose
+            // 
+            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Choose.HeaderText = "勾选";
+            this.Choose.Name = "Choose";
+            this.Choose.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.Choose.Width = 55;
+            // 
+            // pib_ifpick
+            // 
+            this.pib_ifpick.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_ifpick.DataPropertyName = "pib_ifpick";
+            this.pib_ifpick.HeaderText = "已采集";
+            this.pib_ifpick.Name = "pib_ifpick";
+            this.pib_ifpick.Width = 60;
+            // 
+            // pib_ifprint
+            // 
+            this.pib_ifprint.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_ifprint.DataPropertyName = "pib_ifprint";
+            this.pib_ifprint.HeaderText = "已打印";
+            this.pib_ifprint.Name = "pib_ifprint";
+            this.pib_ifprint.Width = 60;
+            // 
+            // pib_id1
+            // 
+            this.pib_id1.DataPropertyName = "pib_id";
+            this.pib_id1.HeaderText = "pib_id";
+            this.pib_id1.Name = "pib_id1";
+            this.pib_id1.Visible = false;
+            this.pib_id1.Width = 66;
+            // 
+            // pib_pdno
+            // 
+            this.pib_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_pdno.DataPropertyName = "pib_pdno";
+            this.pib_pdno.HeaderText = "明细序号";
+            this.pib_pdno.Name = "pib_pdno";
+            this.pib_pdno.ReadOnly = true;
+            this.pib_pdno.Width = 96;
+            // 
+            // pib_prodcode
+            // 
+            this.pib_prodcode.DataPropertyName = "pib_prodcode";
+            this.pib_prodcode.HeaderText = "物料编号";
+            this.pib_prodcode.Name = "pib_prodcode";
+            this.pib_prodcode.ReadOnly = true;
+            this.pib_prodcode.Width = 78;
+            // 
+            // pr_vendprodcode
+            // 
+            this.pr_vendprodcode.DataPropertyName = "pr_vendprodcode";
+            this.pr_vendprodcode.HeaderText = "MPN";
+            this.pr_vendprodcode.Name = "pr_vendprodcode";
+            this.pr_vendprodcode.ReadOnly = true;
+            this.pr_vendprodcode.Width = 48;
+            // 
+            // pr_brand
+            // 
+            this.pr_brand.DataPropertyName = "pr_brand";
+            this.pr_brand.HeaderText = "品牌";
+            this.pr_brand.Name = "pr_brand";
+            this.pr_brand.ReadOnly = true;
+            this.pr_brand.Width = 54;
+            // 
+            // pib_madein
+            // 
+            this.pib_madein.DataPropertyName = "pib_madein";
+            this.pib_madein.HeaderText = "产地";
+            this.pib_madein.Name = "pib_madein";
+            this.pib_madein.Visible = false;
+            this.pib_madein.Width = 54;
+            // 
+            // pib_lotno
+            // 
+            this.pib_lotno.DataPropertyName = "pib_lotno";
+            this.pib_lotno.HeaderText = "LotNo";
+            this.pib_lotno.Name = "pib_lotno";
+            this.pib_lotno.Width = 60;
+            // 
+            // pib_datecode
+            // 
+            this.pib_datecode.DataPropertyName = "pib_datecode";
+            this.pib_datecode.HeaderText = "DateCode";
+            this.pib_datecode.Name = "pib_datecode";
+            this.pib_datecode.Width = 78;
+            // 
+            // pib_cusbarcode
+            // 
+            this.pib_cusbarcode.DataPropertyName = "pib_cusbarcode";
+            this.pib_cusbarcode.HeaderText = "ViVo条码号";
+            this.pib_cusbarcode.Name = "pib_cusbarcode";
+            this.pib_cusbarcode.Width = 90;
+            // 
+            // pib_cusoutboxcode
+            // 
+            this.pib_cusoutboxcode.DataPropertyName = "pib_cusoutboxcode";
+            this.pib_cusoutboxcode.HeaderText = "ViVo外箱";
+            this.pib_cusoutboxcode.Name = "pib_cusoutboxcode";
+            this.pib_cusoutboxcode.Width = 78;
+            // 
+            // pib_datecode1
+            // 
+            this.pib_datecode1.DataPropertyName = "pib_datecode1";
+            this.pib_datecode1.HeaderText = "DateCode1";
+            this.pib_datecode1.Name = "pib_datecode1";
+            this.pib_datecode1.Visible = false;
+            this.pib_datecode1.Width = 84;
+            // 
+            // pib_qty
+            // 
+            this.pib_qty.DataPropertyName = "pib_qty";
+            this.pib_qty.HeaderText = "数量";
+            this.pib_qty.Name = "pib_qty";
+            this.pib_qty.ReadOnly = true;
+            this.pib_qty.Width = 54;
+            // 
+            // pib_barcode
+            // 
+            this.pib_barcode.DataPropertyName = "pib_barcode";
+            this.pib_barcode.HeaderText = "唯一条码";
+            this.pib_barcode.Name = "pib_barcode";
+            this.pib_barcode.ReadOnly = true;
+            this.pib_barcode.Width = 78;
+            // 
+            // pib_custbarcode
+            // 
+            this.pib_custbarcode.DataPropertyName = "pib_custbarcode";
+            this.pib_custbarcode.HeaderText = "客户条码";
+            this.pib_custbarcode.Name = "pib_custbarcode";
+            this.pib_custbarcode.Width = 78;
+            // 
+            // pd_pocode
+            // 
+            this.pd_pocode.DataPropertyName = "pd_pocode";
+            this.pd_pocode.HeaderText = "客户PO";
+            this.pd_pocode.Name = "pd_pocode";
+            this.pd_pocode.ReadOnly = true;
+            this.pd_pocode.Width = 66;
+            // 
+            // pd_custprodcode
+            // 
+            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
+            this.pd_custprodcode.HeaderText = "客户料号";
+            this.pd_custprodcode.Name = "pd_custprodcode";
+            this.pd_custprodcode.ReadOnly = true;
+            this.pd_custprodcode.Width = 78;
+            // 
+            // pd_custprodspec
+            // 
+            this.pd_custprodspec.DataPropertyName = "pd_custprodspec";
+            this.pd_custprodspec.HeaderText = "客户型号";
+            this.pd_custprodspec.Name = "pd_custprodspec";
+            this.pd_custprodspec.ReadOnly = true;
+            this.pd_custprodspec.Width = 78;
+            // 
+            // pib_outboxcode1
+            // 
+            this.pib_outboxcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_outboxcode1.DataPropertyName = "pib_outboxcode1";
+            this.pib_outboxcode1.HeaderText = "中盒号";
+            this.pib_outboxcode1.Name = "pib_outboxcode1";
+            this.pib_outboxcode1.Width = 90;
+            // 
+            // pib_outboxcode2
+            // 
+            this.pib_outboxcode2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_outboxcode2.DataPropertyName = "pib_outboxcode2";
+            this.pib_outboxcode2.HeaderText = "外箱号";
+            this.pib_outboxcode2.Name = "pib_outboxcode2";
+            this.pib_outboxcode2.Width = 90;
+            // 
             // pi_inoutno
             // 
             this.pi_inoutno.ID = null;
@@ -1523,178 +1646,63 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
-            // Choose
-            // 
-            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.Choose.HeaderText = "勾选";
-            this.Choose.Name = "Choose";
-            this.Choose.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.Choose.Width = 55;
-            // 
-            // pib_ifpick
-            // 
-            this.pib_ifpick.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_ifpick.DataPropertyName = "pib_ifpick";
-            this.pib_ifpick.HeaderText = "已采集";
-            this.pib_ifpick.Name = "pib_ifpick";
-            this.pib_ifpick.Width = 60;
-            // 
-            // pib_ifprint
-            // 
-            this.pib_ifprint.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_ifprint.DataPropertyName = "pib_ifprint";
-            this.pib_ifprint.HeaderText = "已打印";
-            this.pib_ifprint.Name = "pib_ifprint";
-            this.pib_ifprint.Width = 60;
-            // 
-            // pib_id1
-            // 
-            this.pib_id1.DataPropertyName = "pib_id";
-            this.pib_id1.HeaderText = "pib_id";
-            this.pib_id1.Name = "pib_id1";
-            this.pib_id1.Visible = false;
-            this.pib_id1.Width = 66;
-            // 
-            // pib_pdno
-            // 
-            this.pib_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_pdno.DataPropertyName = "pib_pdno";
-            this.pib_pdno.HeaderText = "明细序号";
-            this.pib_pdno.Name = "pib_pdno";
-            this.pib_pdno.ReadOnly = true;
-            this.pib_pdno.Width = 96;
-            // 
-            // pib_prodcode
-            // 
-            this.pib_prodcode.DataPropertyName = "pib_prodcode";
-            this.pib_prodcode.HeaderText = "物料编号";
-            this.pib_prodcode.Name = "pib_prodcode";
-            this.pib_prodcode.ReadOnly = true;
-            this.pib_prodcode.Width = 78;
-            // 
-            // pr_vendprodcode
-            // 
-            this.pr_vendprodcode.DataPropertyName = "pr_vendprodcode";
-            this.pr_vendprodcode.HeaderText = "MPN";
-            this.pr_vendprodcode.Name = "pr_vendprodcode";
-            this.pr_vendprodcode.ReadOnly = true;
-            this.pr_vendprodcode.Width = 48;
-            // 
-            // pr_brand
-            // 
-            this.pr_brand.DataPropertyName = "pr_brand";
-            this.pr_brand.HeaderText = "品牌";
-            this.pr_brand.Name = "pr_brand";
-            this.pr_brand.ReadOnly = true;
-            this.pr_brand.Width = 54;
-            // 
-            // pib_madein
-            // 
-            this.pib_madein.DataPropertyName = "pib_madein";
-            this.pib_madein.HeaderText = "产地";
-            this.pib_madein.Name = "pib_madein";
-            this.pib_madein.Visible = false;
-            this.pib_madein.Width = 54;
-            // 
-            // pib_lotno
-            // 
-            this.pib_lotno.DataPropertyName = "pib_lotno";
-            this.pib_lotno.HeaderText = "LotNo";
-            this.pib_lotno.Name = "pib_lotno";
-            this.pib_lotno.Width = 60;
-            // 
-            // pib_datecode
-            // 
-            this.pib_datecode.DataPropertyName = "pib_datecode";
-            this.pib_datecode.HeaderText = "DateCode";
-            this.pib_datecode.Name = "pib_datecode";
-            this.pib_datecode.Width = 78;
-            // 
-            // pib_cusbarcode
-            // 
-            this.pib_cusbarcode.DataPropertyName = "pib_cusbarcode";
-            this.pib_cusbarcode.HeaderText = "ViVo条码号";
-            this.pib_cusbarcode.Name = "pib_cusbarcode";
-            this.pib_cusbarcode.Width = 90;
-            // 
-            // pib_cusoutboxcode
-            // 
-            this.pib_cusoutboxcode.DataPropertyName = "pib_cusoutboxcode";
-            this.pib_cusoutboxcode.HeaderText = "ViVo外箱";
-            this.pib_cusoutboxcode.Name = "pib_cusoutboxcode";
-            this.pib_cusoutboxcode.Width = 78;
-            // 
-            // pib_datecode1
-            // 
-            this.pib_datecode1.DataPropertyName = "pib_datecode1";
-            this.pib_datecode1.HeaderText = "DateCode1";
-            this.pib_datecode1.Name = "pib_datecode1";
-            this.pib_datecode1.Visible = false;
-            this.pib_datecode1.Width = 84;
-            // 
-            // pib_qty
+            // si_detno
             // 
-            this.pib_qty.DataPropertyName = "pib_qty";
-            this.pib_qty.HeaderText = "数量";
-            this.pib_qty.Name = "pib_qty";
-            this.pib_qty.ReadOnly = true;
-            this.pib_qty.Width = 54;
+            this.si_detno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.si_detno.DataPropertyName = "si_detno";
+            this.si_detno.HeaderText = "顺序";
+            this.si_detno.Name = "si_detno";
+            this.si_detno.ReadOnly = true;
+            this.si_detno.Width = 60;
             // 
-            // pib_barcode
+            // si_index
             // 
-            this.pib_barcode.DataPropertyName = "pib_barcode";
-            this.pib_barcode.HeaderText = "唯一条码";
-            this.pib_barcode.Name = "pib_barcode";
-            this.pib_barcode.ReadOnly = true;
-            this.pib_barcode.Width = 78;
+            this.si_index.DataPropertyName = "si_index";
+            this.si_index.HeaderText = "起始位置";
+            this.si_index.Name = "si_index";
+            this.si_index.Visible = false;
             // 
-            // pib_custbarcode
+            // si_kind
             // 
-            this.pib_custbarcode.DataPropertyName = "pib_custbarcode";
-            this.pib_custbarcode.HeaderText = "客户条码";
-            this.pib_custbarcode.Name = "pib_custbarcode";
-            this.pib_custbarcode.Width = 78;
+            this.si_kind.DataPropertyName = "si_kind";
+            this.si_kind.HeaderText = "解析方式";
+            this.si_kind.Name = "si_kind";
+            this.si_kind.Visible = false;
             // 
-            // pd_pocode
+            // si_indexstring
             // 
-            this.pd_pocode.DataPropertyName = "pd_pocode";
-            this.pd_pocode.HeaderText = "客户PO";
-            this.pd_pocode.Name = "pd_pocode";
-            this.pd_pocode.ReadOnly = true;
-            this.pd_pocode.Width = 66;
+            this.si_indexstring.DataPropertyName = "si_indexstring";
+            this.si_indexstring.HeaderText = "索引字符";
+            this.si_indexstring.Name = "si_indexstring";
+            this.si_indexstring.Visible = false;
             // 
-            // pd_custprodcode
+            // si_length
             // 
-            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
-            this.pd_custprodcode.HeaderText = "客户料号";
-            this.pd_custprodcode.Name = "pd_custprodcode";
-            this.pd_custprodcode.ReadOnly = true;
-            this.pd_custprodcode.Width = 78;
+            this.si_length.DataPropertyName = "si_length";
+            this.si_length.HeaderText = "长度";
+            this.si_length.Name = "si_length";
+            this.si_length.Visible = false;
             // 
-            // pd_custprodspec
+            // si_expression
             // 
-            this.pd_custprodspec.DataPropertyName = "pd_custprodspec";
-            this.pd_custprodspec.HeaderText = "客户型号";
-            this.pd_custprodspec.Name = "pd_custprodspec";
-            this.pd_custprodspec.ReadOnly = true;
-            this.pd_custprodspec.Width = 78;
+            this.si_expression.DataPropertyName = "si_expression";
+            this.si_expression.HeaderText = "正则表达式";
+            this.si_expression.Name = "si_expression";
+            this.si_expression.Visible = false;
             // 
-            // pib_outboxcode1
+            // si_item
             // 
-            this.pib_outboxcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_outboxcode1.DataPropertyName = "pib_outboxcode1";
-            this.pib_outboxcode1.HeaderText = "中盒号";
-            this.pib_outboxcode1.Name = "pib_outboxcode1";
-            this.pib_outboxcode1.Width = 90;
+            this.si_item.DataPropertyName = "si_item";
+            this.si_item.HeaderText = "采集项目";
+            this.si_item.Name = "si_item";
+            this.si_item.ReadOnly = true;
+            this.si_item.Width = 80;
             // 
-            // pib_outboxcode2
+            // si_expressionitem
             // 
-            this.pib_outboxcode2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_outboxcode2.DataPropertyName = "pib_outboxcode2";
-            this.pib_outboxcode2.HeaderText = "外箱号";
-            this.pib_outboxcode2.Name = "pib_outboxcode2";
-            this.pib_outboxcode2.Width = 90;
+            this.si_expressionitem.DataPropertyName = "si_expressionitem";
+            this.si_expressionitem.HeaderText = "正则项次";
+            this.si_expressionitem.Name = "si_expressionitem";
             // 
             // UAS_出货标签打印
             // 
@@ -1864,13 +1872,6 @@
         private System.Windows.Forms.Button PowerSetting;
         private System.Windows.Forms.Button GetOutBoxCode;
         private System.Windows.Forms.LinkLabel LogingOut;
-        private System.Windows.Forms.DataGridViewTextBoxColumn si_detno;
-        private System.Windows.Forms.DataGridViewTextBoxColumn si_index;
-        private System.Windows.Forms.DataGridViewTextBoxColumn si_kind;
-        private System.Windows.Forms.DataGridViewTextBoxColumn si_indexstring;
-        private System.Windows.Forms.DataGridViewTextBoxColumn si_length;
-        private System.Windows.Forms.DataGridViewTextBoxColumn si_expression;
-        private System.Windows.Forms.DataGridViewTextBoxColumn si_item;
         private System.Windows.Forms.Timer RefreshDBConnect;
         private System.Windows.Forms.CheckBox GetGridOnly;
         private System.Windows.Forms.Button ViVoPlate;
@@ -1917,5 +1918,13 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_custprodspec;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn si_detno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn si_index;
+        private System.Windows.Forms.DataGridViewTextBoxColumn si_kind;
+        private System.Windows.Forms.DataGridViewTextBoxColumn si_indexstring;
+        private System.Windows.Forms.DataGridViewTextBoxColumn si_length;
+        private System.Windows.Forms.DataGridViewTextBoxColumn si_expression;
+        private System.Windows.Forms.DataGridViewTextBoxColumn si_item;
+        private System.Windows.Forms.DataGridViewTextBoxColumn si_expressionitem;
     }
 }

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

@@ -303,7 +303,7 @@ namespace UAS_LabelMachine
         private void sg_code_UserControlTextChanged(object sender, EventArgs e)
         {
             //取已启用的的按照采集次序排序
-            dt = (DataTable)dh.ExecuteSql("select si_item,si_detno,sg_separator,si_kind,si_expression,si_index,si_indexstring,si_length from scanitem left join scangroup on si_sgid=sg_id where sg_code='" + sg_code.Text + "' and si_enable<>0 order by si_detno", "select");
+            dt = (DataTable)dh.ExecuteSql("select si_item,si_detno,sg_separator,si_kind,si_expression,si_expressionitem,si_index,si_indexstring,si_length from scanitem left join scangroup on si_sgid=sg_id where sg_code='" + sg_code.Text + "' and si_enable<>0 order by si_detno", "select");
             BaseUtil.FillDgvWithDataTable(Si_ItemDGV, dt);
             if (dt.Rows.Count > 0)
             {
@@ -973,7 +973,14 @@ namespace UAS_LabelMachine
             {
                 string log = "使用正则表达式" + SiItem[item]["si_expression"] + "匹配数据" + str;
                 reg = new Regex(SiItem[item]["si_expression"]);
-                str = reg.Match(str).Value;
+                try
+                {
+                    str = reg.Matches(str)[int.Parse(SiItem[item]["si_expressionitem"].ToString()) - 1].Value;
+                }
+                catch (Exception)
+                {
+
+                }
                 log += "，匹配后数据" + str;
                 LogManager.DoLog(log);
             }
@@ -1151,7 +1158,7 @@ namespace UAS_LabelMachine
             string LabelUrl = dh.getFieldDataByCondition("label left join customerlabel on la_code=cl_labelcode", "cl_labelurl", "la_id='" + la_id + "' and cl_labelname='" + cl_labelname + "'").ToString();
             //查询该模板维护的所有参数
             dt = (DataTable)dh.ExecuteSql("select lp_name,lp_sql from label left join LABELPARAMETER on la_id= lp_laid where la_id=" + la_id, "select");
-            if (dt.Rows.Count > 0)
+            if (dt.Rows.Count > 0 && LabelInf.Rows.Count > 0)
             {
                 //每次打印清除之前缓存的行号和ID，后面会判断需要打印的数据重新加载
                 MidIDAndOutboxcode.Clear();
@@ -1286,7 +1293,7 @@ namespace UAS_LabelMachine
             }
             else
             {
-                MessageBox.Show("此模板尚未维护参数");
+                MessageBox.Show("此模板尚未维护参数或不存在打印明细");
                 return;
             }
         }

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

@@ -138,6 +138,9 @@
   <metadata name="si_item.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="si_expressionitem.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="RefreshDBConnect.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

UAS-出货标签管理/生成条码.cs

@@ -181,6 +181,7 @@ namespace UAS_LabelMachine
             }
             //有错误需要提醒的内容
             int CheckedRowCount = 0;
+            string ErrRowIndex = "";
             //遍历整个Grid，勾选的项目全部进行条码生成
             for (int i = 0; i < ProdIoInfDGV.RowCount; i++)
             {
@@ -249,17 +250,30 @@ namespace UAS_LabelMachine
                             pib_inqty.Add(AddNum.ToString());
                         }
                     }
-                    //插入条码
-                    sql.Clear();
-                    sql.Append("insert into prodiobarcode (PIB_ID,PIB_PRODCODE,PIB_INDATE,PIB_INOUTNO,PIB_PIID,PIB_BARCODE,PIB_CUSTBARCODE,PIB_PDNO,");
-                    sql.Append("PIB_PDID,PIB_PICLASS,PIB_QTY,PIB_PRODID,PIB_OUTBOXCODE1,PIB_IFPRINT,PIB_IFPICK,PIB_ORDERCODE,PIB_CUSTPO,pib_orderdetno)");
-                    sql.Append(" values (prodiobarcode_seq.nextval,'" + pd_prodcode + "',sysdate,'" + pi_inoutno.Text + "'," + pi_id + ",:barcode,:custbarcode,'" + pd_pdno + "','" + pd_id + "',");
-                    sql.Append("'" + pi_class.Text + "',:pib_inqty,'" + pr_id + "',:midcode,0,0,'" + pd_ordercode + "','','" + pd_orderdetno + "')");
-                    dh.BatchInsert(sql.ToString(), new string[] { "barcode", "custbarcode", "pib_inqty", "midcode" }, barcode.ToArray(), custbarcode.ToArray(), pib_inqty.ToArray(), midcode.ToArray());
-                    //更新最大流水号
-                    dh.UpdateByCondition("RuleMaxNum", "rmn_maxnumber='" + custserialnum + "'", "rmn_nrcode='" + NrCode + "' and rmn_prefix='" + Prefix + "'");
+                    if (barcode.Count > 0)
+                    {
+                        //插入条码
+                        sql.Clear();
+                        sql.Append("insert into prodiobarcode (PIB_ID,PIB_PRODCODE,PIB_INDATE,PIB_INOUTNO,PIB_PIID,PIB_BARCODE,PIB_CUSTBARCODE,PIB_PDNO,");
+                        sql.Append("PIB_PDID,PIB_PICLASS,PIB_QTY,PIB_PRODID,PIB_OUTBOXCODE1,PIB_IFPRINT,PIB_IFPICK,PIB_ORDERCODE,PIB_CUSTPO,pib_orderdetno)");
+                        sql.Append(" values (prodiobarcode_seq.nextval,'" + pd_prodcode + "',sysdate,'" + pi_inoutno.Text + "'," + pi_id + ",:barcode,:custbarcode,'" + pd_pdno + "','" + pd_id + "',");
+                        sql.Append("'" + pi_class.Text + "',:pib_inqty,'" + pr_id + "',:midcode,0,0,'" + pd_ordercode + "','','" + pd_orderdetno + "')");
+                        dh.BatchInsert(sql.ToString(), new string[] { "barcode", "custbarcode", "pib_inqty", "midcode" }, barcode.ToArray(), custbarcode.ToArray(), pib_inqty.ToArray(), midcode.ToArray());
+                        //更新最大流水号
+                        dh.UpdateByCondition("RuleMaxNum", "rmn_maxnumber='" + custserialnum + "'", "rmn_nrcode='" + NrCode + "' and rmn_prefix='" + Prefix + "'");
+                    }
+                    else
+                    {
+                        ErrRowIndex += (i + 1) + ",";
+
+                    }
                 }
             }
+            if (ErrRowIndex != "")
+            {
+                MessageBox.Show(ErrRowIndex + "行无可用条码，请检查本次数量");
+                return;
+            }
             if (CheckedRowCount > 0)
             {
                 LoadData();

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

@@ -105,6 +105,14 @@
             this.sg_name = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.sg_code = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.si_length1 = new UAS_LabelMachine.CustomControl.NumOnlyTextBox();
+            this.si_expressionitem4 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.si_expressionitem3 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.si_expressionitem1 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.si_expressionitem2 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.si_expressionitem4_label = new System.Windows.Forms.Label();
+            this.si_expressionitem3_label = new System.Windows.Forms.Label();
+            this.si_expressionitem1_label = new System.Windows.Forms.Label();
+            this.si_expressionitem2_label = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // sg_name_label
@@ -989,11 +997,111 @@
             this.si_length1.Size = new System.Drawing.Size(157, 21);
             this.si_length1.TabIndex = 14;
             // 
+            // si_expressionitem4
+            // 
+            this.si_expressionitem4.Enabled = false;
+            this.si_expressionitem4.ID = null;
+            this.si_expressionitem4.Location = new System.Drawing.Point(831, 134);
+            this.si_expressionitem4.Name = "si_expressionitem4";
+            this.si_expressionitem4.Size = new System.Drawing.Size(157, 21);
+            this.si_expressionitem4.Str = null;
+            this.si_expressionitem4.Str1 = null;
+            this.si_expressionitem4.Str2 = null;
+            this.si_expressionitem4.TabIndex = 112;
+            // 
+            // si_expressionitem3
+            // 
+            this.si_expressionitem3.Enabled = false;
+            this.si_expressionitem3.ID = null;
+            this.si_expressionitem3.Location = new System.Drawing.Point(831, 450);
+            this.si_expressionitem3.Name = "si_expressionitem3";
+            this.si_expressionitem3.Size = new System.Drawing.Size(157, 21);
+            this.si_expressionitem3.Str = null;
+            this.si_expressionitem3.Str1 = null;
+            this.si_expressionitem3.Str2 = null;
+            this.si_expressionitem3.TabIndex = 113;
+            // 
+            // si_expressionitem1
+            // 
+            this.si_expressionitem1.Enabled = false;
+            this.si_expressionitem1.ID = null;
+            this.si_expressionitem1.Location = new System.Drawing.Point(831, 338);
+            this.si_expressionitem1.Name = "si_expressionitem1";
+            this.si_expressionitem1.Size = new System.Drawing.Size(157, 21);
+            this.si_expressionitem1.Str = null;
+            this.si_expressionitem1.Str1 = null;
+            this.si_expressionitem1.Str2 = null;
+            this.si_expressionitem1.TabIndex = 114;
+            // 
+            // si_expressionitem2
+            // 
+            this.si_expressionitem2.Enabled = false;
+            this.si_expressionitem2.ID = null;
+            this.si_expressionitem2.Location = new System.Drawing.Point(831, 234);
+            this.si_expressionitem2.Name = "si_expressionitem2";
+            this.si_expressionitem2.Size = new System.Drawing.Size(157, 21);
+            this.si_expressionitem2.Str = null;
+            this.si_expressionitem2.Str1 = null;
+            this.si_expressionitem2.Str2 = null;
+            this.si_expressionitem2.TabIndex = 115;
+            // 
+            // si_expressionitem4_label
+            // 
+            this.si_expressionitem4_label.AutoSize = true;
+            this.si_expressionitem4_label.BackColor = System.Drawing.Color.Transparent;
+            this.si_expressionitem4_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_expressionitem4_label.Location = new System.Drawing.Point(783, 134);
+            this.si_expressionitem4_label.Name = "si_expressionitem4_label";
+            this.si_expressionitem4_label.Size = new System.Drawing.Size(42, 21);
+            this.si_expressionitem4_label.TabIndex = 116;
+            this.si_expressionitem4_label.Text = "项次";
+            // 
+            // si_expressionitem3_label
+            // 
+            this.si_expressionitem3_label.AutoSize = true;
+            this.si_expressionitem3_label.BackColor = System.Drawing.Color.Transparent;
+            this.si_expressionitem3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_expressionitem3_label.Location = new System.Drawing.Point(783, 450);
+            this.si_expressionitem3_label.Name = "si_expressionitem3_label";
+            this.si_expressionitem3_label.Size = new System.Drawing.Size(42, 21);
+            this.si_expressionitem3_label.TabIndex = 117;
+            this.si_expressionitem3_label.Text = "项次";
+            // 
+            // si_expressionitem1_label
+            // 
+            this.si_expressionitem1_label.AutoSize = true;
+            this.si_expressionitem1_label.BackColor = System.Drawing.Color.Transparent;
+            this.si_expressionitem1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_expressionitem1_label.Location = new System.Drawing.Point(783, 339);
+            this.si_expressionitem1_label.Name = "si_expressionitem1_label";
+            this.si_expressionitem1_label.Size = new System.Drawing.Size(42, 21);
+            this.si_expressionitem1_label.TabIndex = 118;
+            this.si_expressionitem1_label.Text = "项次";
+            // 
+            // si_expressionitem2_label
+            // 
+            this.si_expressionitem2_label.AutoSize = true;
+            this.si_expressionitem2_label.BackColor = System.Drawing.Color.Transparent;
+            this.si_expressionitem2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_expressionitem2_label.Location = new System.Drawing.Point(783, 234);
+            this.si_expressionitem2_label.Name = "si_expressionitem2_label";
+            this.si_expressionitem2_label.Size = new System.Drawing.Size(42, 21);
+            this.si_expressionitem2_label.TabIndex = 119;
+            this.si_expressionitem2_label.Text = "项次";
+            // 
             // 采集策略
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1082, 576);
+            this.Controls.Add(this.si_expressionitem2_label);
+            this.Controls.Add(this.si_expressionitem1_label);
+            this.Controls.Add(this.si_expressionitem3_label);
+            this.Controls.Add(this.si_expressionitem4_label);
+            this.Controls.Add(this.si_expressionitem2);
+            this.Controls.Add(this.si_expressionitem1);
+            this.Controls.Add(this.si_expressionitem3);
+            this.Controls.Add(this.si_expressionitem4);
             this.Controls.Add(this.Add);
             this.Controls.Add(this.si_id1);
             this.Controls.Add(this.si_id2);
@@ -1157,5 +1265,13 @@
         private CustomControl.EnterTextBox si_id1;
         private CustomControl.NormalButton Add;
         private CustomControl.NumOnlyTextBox si_length1;
+        private CustomControl.EnterTextBox si_expressionitem4;
+        private CustomControl.EnterTextBox si_expressionitem3;
+        private CustomControl.EnterTextBox si_expressionitem1;
+        private CustomControl.EnterTextBox si_expressionitem2;
+        private System.Windows.Forms.Label si_expressionitem4_label;
+        private System.Windows.Forms.Label si_expressionitem3_label;
+        private System.Windows.Forms.Label si_expressionitem1_label;
+        private System.Windows.Forms.Label si_expressionitem2_label;
     }
 }

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

@@ -87,7 +87,7 @@ namespace UAS_LabelMachine
                         sql.Clear();
                         sql.Append("update scanitem set si_item='" + Controls["si_item" + i].Text + "',si_detno='" + Controls["si_detno" + i].Text + "',");
                         sql.Append("si_index='" + Controls["si_index" + i].Text + "',si_indexstring='" + Controls["si_indexstring" + i].Text + "',");
-                        sql.Append("si_kind='" + Controls["si_kind" + i].Text + "', si_length='" + Controls["si_length" + i].Text + "',");
+                        sql.Append("si_kind='" + Controls["si_kind" + i].Text + "', si_length='" + Controls["si_length" + i].Text + "',si_expressionitem='" + Controls["si_expressionitem" + i].Text + "',");
                         sql.Append("si_expression=:si_expression,si_enable=" + Enable + " where si_id=" + Controls["si_id" + i].Text);
                         dh.ExecuteSql(sql.ToString(), "update", new string[] { Controls["si_expression" + i].Text });
                     }
@@ -116,9 +116,9 @@ namespace UAS_LabelMachine
                         }
                         string si_id = dh.GetSEQ("scanitem_seq");
                         sql.Clear();
-                        sql.Append("insert into scanitem(si_id,si_sgid,si_detno,si_item,si_kind,si_indexstring,si_index,si_expression,si_enable) values(" + si_id + "," + sg_id1);
+                        sql.Append("insert into scanitem(si_id,si_sgid,si_detno,si_item,si_kind,si_indexstring,si_index,si_expressionitem,si_expression,si_enable) values(" + si_id + "," + sg_id1);
                         sql.Append(",'" + Controls["si_detno" + i].Text + "','" + Controls["si_item" + i].Text + "','" + Controls["si_kind" + i].Text + "',");
-                        sql.Append("'" + Controls["si_indexstring" + i].Text + "','" + Controls["si_index" + i].Text + "',:si_expression," + Enable + ")");
+                        sql.Append("'" + Controls["si_indexstring" + i].Text + "','" + Controls["si_index" + i].Text + "','" + Controls["si_expressionitem" + i].Text + "',:si_expression," + Enable + ")");
                         dh.ExecuteSql(sql.ToString(), "insert", new string[] { Controls["si_expression" + i].Text });
                         Controls["si_id" + i].Text = si_id;
                     }
@@ -126,7 +126,8 @@ namespace UAS_LabelMachine
                     //保存成功后将值更新回界面，再次点击保存就是更新操作
                     sg_id.Text = sg_id1;
                 }
-                else {
+                else
+                {
                     MessageBox.Show("策略编号" + sg_code.Text + "已存在！");
                 }
             }
@@ -176,15 +177,18 @@ namespace UAS_LabelMachine
                 Controls["si_item" + i].Text = cb.Text;
                 Controls["si_kind" + i].Enabled = true;
                 Controls["si_expression" + i].Enabled = true;
+                Controls["si_expressionitem" + i].Enabled = true;
                 Controls["si_index" + i].Enabled = true;
                 Controls["si_indexstring" + i].Enabled = true;
                 Controls["si_length" + i].Enabled = true;
             }
-            else {
+            else
+            {
                 Controls["si_detno" + i].Enabled = false;
                 Controls["si_item" + i].Enabled = false;
                 Controls["si_kind" + i].Enabled = false;
                 Controls["si_expression" + i].Enabled = false;
+                Controls["si_expressionitem" + i].Enabled = false;
                 Controls["si_index" + i].Enabled = false;
                 Controls["si_indexstring" + i].Enabled = false;
                 Controls["si_length" + i].Enabled = false;
@@ -222,6 +226,7 @@ namespace UAS_LabelMachine
                                 Controls["si_kind" + j].Text = dt.Rows[i]["si_kind"].ToString();
                                 Controls["si_length" + j].Text = dt.Rows[i]["si_length"].ToString();
                                 Controls["si_expression" + j].Text = dt.Rows[i]["si_expression"].ToString();
+                                Controls["si_expressionitem" + j].Text = dt.Rows[i]["si_expressionitem"].ToString();
                             }
                         }
                     }