调整前端复核和后端采集

UAS-出货标签管理(吉利通)/UAS_出货标签管理.Designer.cs

@@ -36,7 +36,7 @@
             this.label22 = new System.Windows.Forms.Label();
             this.AutoMatch = new System.Windows.Forms.CheckBox();
             this.pr_code_label = new System.Windows.Forms.Label();
-            this.label24 = new System.Windows.Forms.Label();
+            this.后端复核 = new System.Windows.Forms.Label();
             this.CollectionUnit = new System.Windows.Forms.ComboBox();
             this.CollectionUnit_label = new System.Windows.Forms.Label();
             this.GenerateBarCode = new System.Windows.Forms.Button();
@@ -93,7 +93,7 @@
             this.CleanBarCode = new System.Windows.Forms.Button();
             this.ListButtonMenu = new System.Windows.Forms.ListBox();
             this.ButtonSetting = new System.Windows.Forms.Button();
-            this.FrontendCheck = new CustomControl.SerialPortWithTag();
+            this.FrontendCheck = new UAS_LabelMachine.CustomControl.SerialPortWithTag();
             this.groupBoxWithBorder1 = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.ExportData = new System.Windows.Forms.Button();
             this.label18 = new System.Windows.Forms.Label();
@@ -118,7 +118,7 @@
             this.Installed = new System.Windows.Forms.Label();
             this.Process = new System.Windows.Forms.Label();
             this.sg_separator = new UAS_LabelMachine.CustomControl.EnterTextBox();
-            this.Input = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.BackCheck = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.griddetno = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.sg_code = new UAS_LabelMachine.CustomControl.SearchTextBox();
             this.MessageLog = new UAS_LabelMachine.CustomControl.RichText.RichTextAutoBottom();
@@ -175,7 +175,9 @@
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
-            this.BackendCheck = new CustomControl.SerialPortWithTag();
+            this.BackendCheck = new UAS_LabelMachine.CustomControl.SerialPortWithTag();
+            this.label8 = new System.Windows.Forms.Label();
+            this.FrontCollect = new UAS_LabelMachine.CustomControl.EnterTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
@@ -250,15 +252,15 @@
             this.pr_code_label.TabIndex = 51;
             this.pr_code_label.Text = "物料编号";
             // 
-            // label24
+            // 后端复核
             // 
-            this.label24.AutoSize = true;
-            this.label24.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label24.Location = new System.Drawing.Point(9, 218);
-            this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(51, 20);
-            this.label24.TabIndex = 55;
-            this.label24.Text = "输入框";
+            this.后端复核.AutoSize = true;
+            this.后端复核.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.后端复核.Location = new System.Drawing.Point(7, 218);
+            this.后端复核.Name = "后端复核";
+            this.后端复核.Size = new System.Drawing.Size(65, 20);
+            this.后端复核.TabIndex = 55;
+            this.后端复核.Text = "后端复核";
             // 
             // CollectionUnit
             // 
@@ -759,6 +761,10 @@
             this.ButtonSetting.UseVisualStyleBackColor = true;
             this.ButtonSetting.Click += new System.EventHandler(this.ButtonSetting_Click);
             // 
+            // FrontendCheck
+            // 
+            this.FrontendCheck.Tag = null;
+            // 
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.Controls.Add(this.ExportData);
@@ -887,7 +893,7 @@
             this.pr_code.Condition = null;
             this.pr_code.DBTitle = null;
             this.pr_code.FormName = null;
-            this.pr_code.Location = new System.Drawing.Point(76, 182);
+            this.pr_code.Location = new System.Drawing.Point(290, 102);
             this.pr_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pr_code.Name = "pr_code";
             this.pr_code.Power = null;
@@ -898,6 +904,7 @@
             this.pr_code.TabIndex = 68;
             this.pr_code.TableName = null;
             this.pr_code.TextBoxEnable = false;
+            this.pr_code.Visible = false;
             this.pr_code.UserControlTextChanged += new UAS_LabelMachine.CustomControl.SearchTextBox.OnTextChange(this.pr_code_UserControlTextChanged);
             this.pr_code.SearchIconClick += new UAS_LabelMachine.CustomControl.SearchTextBox.Icon_Click(this.pr_code_SearchIconClick);
             // 
@@ -1046,18 +1053,19 @@
             this.sg_separator.Str2 = null;
             this.sg_separator.TabIndex = 62;
             // 
-            // Input
+            // BackCheck
             // 
-            this.Input.ID = null;
-            this.Input.Location = new System.Drawing.Point(76, 218);
-            this.Input.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Input.Name = "Input";
-            this.Input.Size = new System.Drawing.Size(150, 21);
-            this.Input.Str = null;
-            this.Input.Str1 = null;
-            this.Input.Str2 = null;
-            this.Input.TabIndex = 54;
-            this.Input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Input_KeyDown);
+            this.BackCheck.Enabled = false;
+            this.BackCheck.ID = null;
+            this.BackCheck.Location = new System.Drawing.Point(76, 218);
+            this.BackCheck.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.BackCheck.Name = "BackCheck";
+            this.BackCheck.Size = new System.Drawing.Size(150, 21);
+            this.BackCheck.Str = null;
+            this.BackCheck.Str1 = null;
+            this.BackCheck.Str2 = null;
+            this.BackCheck.TabIndex = 54;
+            this.BackCheck.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Input_KeyDown);
             // 
             // griddetno
             // 
@@ -1676,12 +1684,41 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
+            // BackendCheck
+            // 
+            this.BackendCheck.Tag = null;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label8.Location = new System.Drawing.Point(7, 192);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(65, 20);
+            this.label8.TabIndex = 91;
+            this.label8.Text = "前端采集";
+            // 
+            // FrontCollect
+            // 
+            this.FrontCollect.Enabled = false;
+            this.FrontCollect.ID = null;
+            this.FrontCollect.Location = new System.Drawing.Point(76, 192);
+            this.FrontCollect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.FrontCollect.Name = "FrontCollect";
+            this.FrontCollect.Size = new System.Drawing.Size(150, 21);
+            this.FrontCollect.Str = null;
+            this.FrontCollect.Str1 = null;
+            this.FrontCollect.Str2 = null;
+            this.FrontCollect.TabIndex = 90;
+            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(233)))), ((int)(((byte)(206)))));
             this.ClientSize = new System.Drawing.Size(1389, 711);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.FrontCollect);
             this.Controls.Add(this.ButtonSetting);
             this.Controls.Add(this.ListButtonMenu);
             this.Controls.Add(this.CleanBarCode);
@@ -1704,8 +1741,8 @@
             this.Controls.Add(this.GenerateBarCode);
             this.Controls.Add(this.CollectionUnit_label);
             this.Controls.Add(this.CollectionUnit);
-            this.Controls.Add(this.label24);
-            this.Controls.Add(this.Input);
+            this.Controls.Add(this.后端复核);
+            this.Controls.Add(this.BackCheck);
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.griddetno);
             this.Controls.Add(this.AutoMatch);
@@ -1803,8 +1840,8 @@
         private System.Windows.Forms.CheckBox AutoMatch;
         private CustomControl.EnterTextBox griddetno;
         private System.Windows.Forms.Label pr_code_label;
-        private CustomControl.EnterTextBox Input;
-        private System.Windows.Forms.Label label24;
+        private CustomControl.EnterTextBox BackCheck;
+        private System.Windows.Forms.Label 后端复核;
         private System.Windows.Forms.ComboBox CollectionUnit;
         private System.Windows.Forms.Label CollectionUnit_label;
         private System.Windows.Forms.Button GenerateBarCode;
@@ -1897,5 +1934,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
         private CustomControl.SerialPortWithTag FrontendCheck;
         private CustomControl.SerialPortWithTag BackendCheck;
+        private System.Windows.Forms.Label label8;
+        private CustomControl.EnterTextBox FrontCollect;
     }
 }

UAS-出货标签管理(吉利通)/UAS_出货标签管理.cs

@@ -242,8 +242,10 @@ namespace UAS_LabelMachine
                 switch (port.Tag)
                 {
                     case "FrontendCheck":
+                        FrontCollect.Text = msg;
                         break;
                     case "BackendCheck":
+                        BackCheck.Text = msg;
                         break;
                     default:
                         break;
@@ -380,7 +382,7 @@ namespace UAS_LabelMachine
         {
             if (e.KeyCode == Keys.Enter)
             {
-                if (Input.Text == "")
+                if (BackCheck.Text == "")
                 {
                     MessageBox.Show("采集的数据不能为空");
                     return;
@@ -406,12 +408,12 @@ namespace UAS_LabelMachine
             {
                 for (int i = 0; i < arr.Length; i++)
                 {
-                    arr[i] = Input.Text;
+                    arr[i] = BackCheck.Text;
                 }
             }
             else
             {
-                arr = Input.Text.Split(sg_separator.Text.ToCharArray()).ToArray();
+                arr = BackCheck.Text.Split(sg_separator.Text.ToCharArray()).ToArray();
             }
             bool FindAutoMatch = false;
             for (int i = 0; i < LabelInf.RowCount; i++)
@@ -435,7 +437,7 @@ namespace UAS_LabelMachine
         /// </summary>
         private void CollectInputData()
         {
-            LogManager.DoLog("采集数据【" + Input.Text + "】,使用采集策略编号【" + sg_code.Text + "】");
+            LogManager.DoLog("采集数据【" + BackCheck.Text + "】,使用采集策略编号【" + sg_code.Text + "】");
             //按DetNo排列之后的采集项
             ScanData = new ArrayList<ArrayList<string>>();
             //每个采集项目的子项
@@ -471,11 +473,11 @@ namespace UAS_LabelMachine
             if (sg_separator.Text == "")
             {
                 for (int i = 0; i < ItemData.Length; i++)
-                    CollectData.Add(ItemData[i].ToString().ToUpper(), Input.Text);
+                    CollectData.Add(ItemData[i].ToString().ToUpper(), BackCheck.Text);
             }
             else
             {
-                int DataCount = Input.Text.Split(sg_separator.Text.ToCharArray()).Length;
+                int DataCount = BackCheck.Text.Split(sg_separator.Text.ToCharArray()).Length;
                 if (DataCount > ItemData.Length)
                 {
                     MessageBox.Show("采集数据大于采集项次");
@@ -487,13 +489,13 @@ namespace UAS_LabelMachine
                     return;
                 }
                 for (int i = 0; i < DataCount; i++)
-                    CollectData.Add(ItemData[i].ToString().ToUpper(), Input.Text.Split(sg_separator.Text.ToCharArray())[i]);
+                    CollectData.Add(ItemData[i].ToString().ToUpper(), BackCheck.Text.Split(sg_separator.Text.ToCharArray())[i]);
             }
             //首先判断当前采集的个数，如果采集的个数为1则不对数据进行分隔符验证
             if (ItemData.Length == 1)
             {
                 CollectData.Clear();
-                CollectData.Add(ItemData[0].ToString().ToUpper(), Input.Text);
+                CollectData.Add(ItemData[0].ToString().ToUpper(), BackCheck.Text);
                 //勾选了自动匹配调用该函数
                 if (AutoMatch.Checked)
                     SetAutoMatchRow();
@@ -629,7 +631,7 @@ namespace UAS_LabelMachine
             //提醒用户需要采集的数据
             RemindUser();
             RefreshProcessData();
-            MessageLog.AppendText(">>扫描到数据" + Input.Text + "\n", Color.Blue);
+            MessageLog.AppendText(">>扫描到数据" + BackCheck.Text + "\n", Color.Blue);
             //如果所采集的行的物料不一样的话，重新计算箱内容量
             if (CurrentRowIndex - 1 > 0)
             {

UAS-出货标签管理(吉利通)/UAS_出货标签管理.resx

@@ -141,30 +141,6 @@
   <metadata name="si_expressionitem.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="si_detno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="si_index.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="si_kind.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="si_indexstring.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="si_length.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="si_expression.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <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>
@@ -210,39 +186,6 @@
   <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="pib_ifmodify.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pib_ifupload.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pib_madein.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pr_zxbzs.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pr_unit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pib_ifrecheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pib_datecode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pib_custbarcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_custprodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_custprodspec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="BackendCheck.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>584, 18</value>
   </metadata>