修改原厂型号

UAS-出货标签管理(标签复核)/UAS_出货标签管理.Designer.cs

@@ -120,7 +120,7 @@
             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_orispeccode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_pocode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_custprodspec = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -142,10 +142,9 @@
             // 
             this.pi_inoutno_label.AutoSize = true;
             this.pi_inoutno_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_inoutno_label.Location = new System.Drawing.Point(6, 20);
-            this.pi_inoutno_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.pi_inoutno_label.Location = new System.Drawing.Point(3, 10);
             this.pi_inoutno_label.Name = "pi_inoutno_label";
-            this.pi_inoutno_label.Size = new System.Drawing.Size(127, 36);
+            this.pi_inoutno_label.Size = new System.Drawing.Size(65, 20);
             this.pi_inoutno_label.TabIndex = 3;
             this.pi_inoutno_label.Text = "出货单号";
             // 
@@ -153,10 +152,9 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(6, 132);
-            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label1.Location = new System.Drawing.Point(3, 66);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(127, 36);
+            this.label1.Size = new System.Drawing.Size(65, 20);
             this.label1.TabIndex = 31;
             this.label1.Text = "采集策略";
             // 
@@ -164,10 +162,9 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(10, 212);
-            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label2.Location = new System.Drawing.Point(5, 106);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(127, 36);
+            this.label2.Size = new System.Drawing.Size(65, 20);
             this.label2.TabIndex = 33;
             this.label2.Text = "当前采集";
             // 
@@ -175,10 +172,9 @@
             // 
             this.label22.AutoSize = true;
             this.label22.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label22.Location = new System.Drawing.Point(144, 212);
-            this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label22.Location = new System.Drawing.Point(72, 106);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(127, 36);
+            this.label22.Size = new System.Drawing.Size(65, 20);
             this.label22.TabIndex = 34;
             this.label22.Text = "明细序号";
             // 
@@ -186,10 +182,10 @@
             // 
             this.AutoMatch.AutoSize = true;
             this.AutoMatch.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoMatch.Location = new System.Drawing.Point(288, 212);
-            this.AutoMatch.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.AutoMatch.Location = new System.Drawing.Point(144, 106);
+            this.AutoMatch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AutoMatch.Name = "AutoMatch";
-            this.AutoMatch.Size = new System.Drawing.Size(159, 40);
+            this.AutoMatch.Size = new System.Drawing.Size(84, 24);
             this.AutoMatch.TabIndex = 49;
             this.AutoMatch.Text = "自动匹配";
             this.AutoMatch.UseVisualStyleBackColor = true;
@@ -198,10 +194,9 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(144, 316);
-            this.pr_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.pr_code_label.Location = new System.Drawing.Point(72, 158);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(127, 36);
+            this.pr_code_label.Size = new System.Drawing.Size(65, 20);
             this.pr_code_label.TabIndex = 51;
             this.pr_code_label.Text = "物料编号";
             // 
@@ -209,10 +204,9 @@
             // 
             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(18, 436);
-            this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label24.Location = new System.Drawing.Point(9, 218);
             this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(99, 36);
+            this.label24.Size = new System.Drawing.Size(51, 20);
             this.label24.TabIndex = 55;
             this.label24.Text = "输入框";
             // 
@@ -225,30 +219,29 @@
             "盘",
             "盒",
             "全部"});
-            this.CollectionUnit.Location = new System.Drawing.Point(592, 364);
-            this.CollectionUnit.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.CollectionUnit.Location = new System.Drawing.Point(296, 182);
+            this.CollectionUnit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CollectionUnit.Name = "CollectionUnit";
-            this.CollectionUnit.Size = new System.Drawing.Size(104, 39);
+            this.CollectionUnit.Size = new System.Drawing.Size(54, 25);
             this.CollectionUnit.TabIndex = 41;
             // 
             // CollectionUnit_label
             // 
             this.CollectionUnit_label.AutoSize = true;
             this.CollectionUnit_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CollectionUnit_label.Location = new System.Drawing.Point(456, 364);
-            this.CollectionUnit_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.CollectionUnit_label.Location = new System.Drawing.Point(228, 182);
             this.CollectionUnit_label.Name = "CollectionUnit_label";
-            this.CollectionUnit_label.Size = new System.Drawing.Size(127, 36);
+            this.CollectionUnit_label.Size = new System.Drawing.Size(65, 20);
             this.CollectionUnit_label.TabIndex = 56;
             this.CollectionUnit_label.Text = "采集单位";
             // 
             // GenerateBarCode
             // 
             this.GenerateBarCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.GenerateBarCode.Location = new System.Drawing.Point(748, 356);
-            this.GenerateBarCode.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.GenerateBarCode.Location = new System.Drawing.Point(374, 178);
+            this.GenerateBarCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.GenerateBarCode.Name = "GenerateBarCode";
-            this.GenerateBarCode.Size = new System.Drawing.Size(136, 52);
+            this.GenerateBarCode.Size = new System.Drawing.Size(68, 26);
             this.GenerateBarCode.TabIndex = 41;
             this.GenerateBarCode.Text = "生成条码";
             this.GenerateBarCode.UseVisualStyleBackColor = true;
@@ -257,10 +250,10 @@
             // SaveGrid
             // 
             this.SaveGrid.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SaveGrid.Location = new System.Drawing.Point(896, 432);
-            this.SaveGrid.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.SaveGrid.Location = new System.Drawing.Point(448, 216);
+            this.SaveGrid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SaveGrid.Name = "SaveGrid";
-            this.SaveGrid.Size = new System.Drawing.Size(136, 52);
+            this.SaveGrid.Size = new System.Drawing.Size(68, 26);
             this.SaveGrid.TabIndex = 59;
             this.SaveGrid.Text = "保存明细";
             this.SaveGrid.UseVisualStyleBackColor = true;
@@ -270,20 +263,19 @@
             // 
             this.sg_separator_label.AutoSize = true;
             this.sg_separator_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sg_separator_label.Location = new System.Drawing.Point(466, 132);
-            this.sg_separator_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.sg_separator_label.Location = new System.Drawing.Point(233, 66);
             this.sg_separator_label.Name = "sg_separator_label";
-            this.sg_separator_label.Size = new System.Drawing.Size(99, 36);
+            this.sg_separator_label.Size = new System.Drawing.Size(51, 20);
             this.sg_separator_label.TabIndex = 61;
             this.sg_separator_label.Text = "分隔符";
             // 
             // CollectionSetting
             // 
             this.CollectionSetting.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CollectionSetting.Location = new System.Drawing.Point(460, 208);
-            this.CollectionSetting.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.CollectionSetting.Location = new System.Drawing.Point(230, 104);
+            this.CollectionSetting.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CollectionSetting.Name = "CollectionSetting";
-            this.CollectionSetting.Size = new System.Drawing.Size(176, 52);
+            this.CollectionSetting.Size = new System.Drawing.Size(88, 26);
             this.CollectionSetting.TabIndex = 63;
             this.CollectionSetting.Text = "采集策略设置";
             this.CollectionSetting.UseVisualStyleBackColor = true;
@@ -303,11 +295,11 @@
             this.si_expression,
             this.si_item,
             this.si_expressionitem});
-            this.Si_ItemDGV.Location = new System.Drawing.Point(648, 28);
-            this.Si_ItemDGV.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.Si_ItemDGV.Location = new System.Drawing.Point(324, 14);
+            this.Si_ItemDGV.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Si_ItemDGV.Name = "Si_ItemDGV";
             this.Si_ItemDGV.RowTemplate.Height = 23;
-            this.Si_ItemDGV.Size = new System.Drawing.Size(268, 292);
+            this.Si_ItemDGV.Size = new System.Drawing.Size(134, 146);
             this.Si_ItemDGV.TabIndex = 65;
             // 
             // si_detno
@@ -375,10 +367,10 @@
             // CleanDetail
             // 
             this.CleanDetail.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CleanDetail.Location = new System.Drawing.Point(748, 432);
-            this.CleanDetail.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.CleanDetail.Location = new System.Drawing.Point(374, 216);
+            this.CleanDetail.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CleanDetail.Name = "CleanDetail";
-            this.CleanDetail.Size = new System.Drawing.Size(136, 52);
+            this.CleanDetail.Size = new System.Drawing.Size(68, 26);
             this.CleanDetail.TabIndex = 66;
             this.CleanDetail.Text = "清除明细";
             this.CleanDetail.UseVisualStyleBackColor = true;
@@ -388,10 +380,9 @@
             // 
             this.pib_id.AutoSize = true;
             this.pib_id.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pib_id.Location = new System.Drawing.Point(284, 320);
-            this.pib_id.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.pib_id.Location = new System.Drawing.Point(142, 160);
             this.pib_id.Name = "pib_id";
-            this.pib_id.Size = new System.Drawing.Size(0, 36);
+            this.pib_id.Size = new System.Drawing.Size(0, 20);
             this.pib_id.TabIndex = 69;
             this.pib_id.Visible = false;
             // 
@@ -399,20 +390,18 @@
             // 
             this.pi_cardcode_label.AutoSize = true;
             this.pi_cardcode_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_cardcode_label.Location = new System.Drawing.Point(6, 76);
-            this.pi_cardcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.pi_cardcode_label.Location = new System.Drawing.Point(3, 38);
             this.pi_cardcode_label.Name = "pi_cardcode_label";
-            this.pi_cardcode_label.Size = new System.Drawing.Size(127, 36);
+            this.pi_cardcode_label.Size = new System.Drawing.Size(65, 20);
             this.pi_cardcode_label.TabIndex = 72;
             this.pi_cardcode_label.Text = "客户编号";
             // 
             // Fresh
             // 
             this.Fresh.AutoSize = true;
-            this.Fresh.Location = new System.Drawing.Point(456, 28);
-            this.Fresh.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.Fresh.Location = new System.Drawing.Point(228, 14);
             this.Fresh.Name = "Fresh";
-            this.Fresh.Size = new System.Drawing.Size(58, 24);
+            this.Fresh.Size = new System.Drawing.Size(29, 12);
             this.Fresh.TabIndex = 73;
             this.Fresh.TabStop = true;
             this.Fresh.Text = "刷新";
@@ -422,10 +411,9 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(10, 1174);
-            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label3.Location = new System.Drawing.Point(5, 587);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(146, 41);
+            this.label3.Size = new System.Drawing.Size(74, 21);
             this.label3.TabIndex = 29;
             this.label3.Text = "输出日志";
             // 
@@ -433,10 +421,10 @@
             // 
             this.CleanInputAfterCollect.AutoSize = true;
             this.CleanInputAfterCollect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CleanInputAfterCollect.Location = new System.Drawing.Point(462, 436);
-            this.CleanInputAfterCollect.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.CleanInputAfterCollect.Location = new System.Drawing.Point(231, 218);
+            this.CleanInputAfterCollect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CleanInputAfterCollect.Name = "CleanInputAfterCollect";
-            this.CleanInputAfterCollect.Size = new System.Drawing.Size(238, 35);
+            this.CleanInputAfterCollect.Size = new System.Drawing.Size(123, 21);
             this.CleanInputAfterCollect.TabIndex = 74;
             this.CleanInputAfterCollect.Text = "采集后清除输入框";
             this.CleanInputAfterCollect.UseVisualStyleBackColor = true;
@@ -444,10 +432,10 @@
             // AllCollected
             // 
             this.AllCollected.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AllCollected.Location = new System.Drawing.Point(1044, 432);
-            this.AllCollected.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.AllCollected.Location = new System.Drawing.Point(522, 216);
+            this.AllCollected.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AllCollected.Name = "AllCollected";
-            this.AllCollected.Size = new System.Drawing.Size(136, 52);
+            this.AllCollected.Size = new System.Drawing.Size(68, 26);
             this.AllCollected.TabIndex = 75;
             this.AllCollected.Text = "全部已采";
             this.AllCollected.UseVisualStyleBackColor = true;
@@ -461,10 +449,10 @@
             // 
             this.GetGridOnly.AutoSize = true;
             this.GetGridOnly.Font = new System.Drawing.Font("微软雅黑", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.GetGridOnly.Location = new System.Drawing.Point(460, 76);
-            this.GetGridOnly.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.GetGridOnly.Location = new System.Drawing.Point(230, 38);
+            this.GetGridOnly.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.GetGridOnly.Name = "GetGridOnly";
-            this.GetGridOnly.Size = new System.Drawing.Size(144, 31);
+            this.GetGridOnly.Size = new System.Drawing.Size(77, 20);
             this.GetGridOnly.TabIndex = 82;
             this.GetGridOnly.Text = "仅获取表格";
             this.GetGridOnly.UseVisualStyleBackColor = true;
@@ -677,10 +665,10 @@
             // 
             // ChooseAll
             // 
-            this.ChooseAll.Location = new System.Drawing.Point(8, 504);
-            this.ChooseAll.Margin = new System.Windows.Forms.Padding(4);
+            this.ChooseAll.Location = new System.Drawing.Point(4, 252);
+            this.ChooseAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ChooseAll.Name = "ChooseAll";
-            this.ChooseAll.Size = new System.Drawing.Size(76, 44);
+            this.ChooseAll.Size = new System.Drawing.Size(38, 22);
             this.ChooseAll.TabIndex = 84;
             this.ChooseAll.Text = "全选";
             this.ChooseAll.UseVisualStyleBackColor = true;
@@ -690,20 +678,19 @@
             // 
             this.pi_date.AutoSize = true;
             this.pi_date.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_date.Location = new System.Drawing.Point(10, 316);
-            this.pi_date.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.pi_date.Location = new System.Drawing.Point(5, 158);
             this.pi_date.Name = "pi_date";
-            this.pi_date.Size = new System.Drawing.Size(0, 36);
+            this.pi_date.Size = new System.Drawing.Size(0, 20);
             this.pi_date.TabIndex = 86;
             this.pi_date.Visible = false;
             // 
             // CleanBarCode
             // 
             this.CleanBarCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CleanBarCode.Location = new System.Drawing.Point(896, 360);
-            this.CleanBarCode.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.CleanBarCode.Location = new System.Drawing.Point(448, 180);
+            this.CleanBarCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CleanBarCode.Name = "CleanBarCode";
-            this.CleanBarCode.Size = new System.Drawing.Size(136, 52);
+            this.CleanBarCode.Size = new System.Drawing.Size(68, 26);
             this.CleanBarCode.TabIndex = 87;
             this.CleanBarCode.Text = "清空条码";
             this.CleanBarCode.UseVisualStyleBackColor = true;
@@ -713,10 +700,10 @@
             // 
             this.ExportData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ExportData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ExportData.Location = new System.Drawing.Point(1044, 360);
-            this.ExportData.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.ExportData.Location = new System.Drawing.Point(522, 180);
+            this.ExportData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ExportData.Name = "ExportData";
-            this.ExportData.Size = new System.Drawing.Size(136, 52);
+            this.ExportData.Size = new System.Drawing.Size(68, 26);
             this.ExportData.TabIndex = 91;
             this.ExportData.Text = "导出数据";
             this.ExportData.UseVisualStyleBackColor = true;
@@ -729,14 +716,14 @@
             this.cu_code.Condition = null;
             this.cu_code.DBTitle = null;
             this.cu_code.FormName = null;
-            this.cu_code.Location = new System.Drawing.Point(150, 76);
-            this.cu_code.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.cu_code.Location = new System.Drawing.Point(75, 38);
+            this.cu_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cu_code.Name = "cu_code";
             this.cu_code.Power = null;
             this.cu_code.ReturnData = null;
             this.cu_code.SelectField = null;
             this.cu_code.SetValueField = null;
-            this.cu_code.Size = new System.Drawing.Size(298, 42);
+            this.cu_code.Size = new System.Drawing.Size(149, 21);
             this.cu_code.TabIndex = 88;
             this.cu_code.TableName = null;
             this.cu_code.TextBoxEnable = false;
@@ -748,14 +735,14 @@
             this.pr_code.Condition = null;
             this.pr_code.DBTitle = null;
             this.pr_code.FormName = null;
-            this.pr_code.Location = new System.Drawing.Point(152, 364);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.pr_code.Location = new System.Drawing.Point(76, 182);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pr_code.Name = "pr_code";
             this.pr_code.Power = null;
             this.pr_code.ReturnData = null;
             this.pr_code.SelectField = null;
             this.pr_code.SetValueField = null;
-            this.pr_code.Size = new System.Drawing.Size(298, 44);
+            this.pr_code.Size = new System.Drawing.Size(149, 22);
             this.pr_code.TabIndex = 68;
             this.pr_code.TableName = null;
             this.pr_code.TextBoxEnable = false;
@@ -775,11 +762,11 @@
             this.CollectionProcess.Controls.Add(this.label13);
             this.CollectionProcess.Controls.Add(this.Installed);
             this.CollectionProcess.Controls.Add(this.Process);
-            this.CollectionProcess.Location = new System.Drawing.Point(928, 20);
-            this.CollectionProcess.Margin = new System.Windows.Forms.Padding(4);
+            this.CollectionProcess.Location = new System.Drawing.Point(464, 10);
+            this.CollectionProcess.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.CollectionProcess.Name = "CollectionProcess";
-            this.CollectionProcess.Padding = new System.Windows.Forms.Padding(4);
-            this.CollectionProcess.Size = new System.Drawing.Size(260, 304);
+            this.CollectionProcess.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.CollectionProcess.Size = new System.Drawing.Size(130, 152);
             this.CollectionProcess.TabIndex = 80;
             this.CollectionProcess.TabStop = false;
             this.CollectionProcess.Text = " ";
@@ -788,20 +775,18 @@
             // 
             this.Capacity.AutoSize = true;
             this.Capacity.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Capacity.Location = new System.Drawing.Point(120, 128);
-            this.Capacity.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.Capacity.Location = new System.Drawing.Point(60, 64);
             this.Capacity.Name = "Capacity";
-            this.Capacity.Size = new System.Drawing.Size(0, 31);
+            this.Capacity.Size = new System.Drawing.Size(0, 17);
             this.Capacity.TabIndex = 75;
             // 
             // Process_midboxcode
             // 
             this.Process_midboxcode.AutoSize = true;
             this.Process_midboxcode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process_midboxcode.Location = new System.Drawing.Point(120, 218);
-            this.Process_midboxcode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.Process_midboxcode.Location = new System.Drawing.Point(60, 110);
             this.Process_midboxcode.Name = "Process_midboxcode";
-            this.Process_midboxcode.Size = new System.Drawing.Size(28, 31);
+            this.Process_midboxcode.Size = new System.Drawing.Size(15, 17);
             this.Process_midboxcode.TabIndex = 74;
             this.Process_midboxcode.Text = "0";
             // 
@@ -809,10 +794,9 @@
             // 
             this.Process_outboxcode.AutoSize = true;
             this.Process_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process_outboxcode.Location = new System.Drawing.Point(120, 170);
-            this.Process_outboxcode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.Process_outboxcode.Location = new System.Drawing.Point(60, 86);
             this.Process_outboxcode.Name = "Process_outboxcode";
-            this.Process_outboxcode.Size = new System.Drawing.Size(28, 31);
+            this.Process_outboxcode.Size = new System.Drawing.Size(15, 17);
             this.Process_outboxcode.TabIndex = 73;
             this.Process_outboxcode.Text = "0";
             // 
@@ -821,10 +805,9 @@
             this.TotalCount.AutoSize = true;
             this.TotalCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.TotalCount.ForeColor = System.Drawing.Color.Blue;
-            this.TotalCount.Location = new System.Drawing.Point(188, 32);
-            this.TotalCount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.TotalCount.Location = new System.Drawing.Point(94, 16);
             this.TotalCount.Name = "TotalCount";
-            this.TotalCount.Size = new System.Drawing.Size(28, 31);
+            this.TotalCount.Size = new System.Drawing.Size(15, 17);
             this.TotalCount.TabIndex = 72;
             this.TotalCount.Text = "0";
             // 
@@ -832,10 +815,9 @@
             // 
             this.label17.AutoSize = true;
             this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label17.Location = new System.Drawing.Point(162, 32);
-            this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label17.Location = new System.Drawing.Point(82, 16);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(24, 31);
+            this.label17.Size = new System.Drawing.Size(13, 17);
             this.label17.TabIndex = 71;
             this.label17.Text = "/";
             // 
@@ -844,10 +826,9 @@
             this.CollectedCount.AutoSize = true;
             this.CollectedCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.CollectedCount.ForeColor = System.Drawing.Color.Red;
-            this.CollectedCount.Location = new System.Drawing.Point(126, 32);
-            this.CollectedCount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.CollectedCount.Location = new System.Drawing.Point(64, 16);
             this.CollectedCount.Name = "CollectedCount";
-            this.CollectedCount.Size = new System.Drawing.Size(28, 31);
+            this.CollectedCount.Size = new System.Drawing.Size(15, 17);
             this.CollectedCount.TabIndex = 70;
             this.CollectedCount.Text = "0";
             // 
@@ -855,10 +836,9 @@
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(20, 172);
-            this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label14.Location = new System.Drawing.Point(10, 86);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(62, 31);
+            this.label14.Size = new System.Drawing.Size(32, 17);
             this.label14.TabIndex = 69;
             this.label14.Text = "箱号";
             // 
@@ -866,10 +846,9 @@
             // 
             this.label11.AutoSize = true;
             this.label11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label11.Location = new System.Drawing.Point(20, 218);
-            this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label11.Location = new System.Drawing.Point(10, 110);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(62, 31);
+            this.label11.Size = new System.Drawing.Size(32, 17);
             this.label11.TabIndex = 68;
             this.label11.Text = "盒号";
             // 
@@ -877,10 +856,9 @@
             // 
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label13.Location = new System.Drawing.Point(20, 90);
-            this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label13.Location = new System.Drawing.Point(10, 46);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(86, 31);
+            this.label13.Size = new System.Drawing.Size(44, 17);
             this.label13.TabIndex = 67;
             this.label13.Text = "当前盒";
             // 
@@ -888,20 +866,18 @@
             // 
             this.Installed.AutoSize = true;
             this.Installed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Installed.Location = new System.Drawing.Point(120, 90);
-            this.Installed.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.Installed.Location = new System.Drawing.Point(60, 46);
             this.Installed.Name = "Installed";
-            this.Installed.Size = new System.Drawing.Size(0, 31);
+            this.Installed.Size = new System.Drawing.Size(0, 17);
             this.Installed.TabIndex = 66;
             // 
             // Process
             // 
             this.Process.AutoSize = true;
             this.Process.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process.Location = new System.Drawing.Point(20, 32);
-            this.Process.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.Process.Location = new System.Drawing.Point(10, 16);
             this.Process.Name = "Process";
-            this.Process.Size = new System.Drawing.Size(86, 31);
+            this.Process.Size = new System.Drawing.Size(44, 17);
             this.Process.TabIndex = 65;
             this.Process.Text = "总进度";
             // 
@@ -909,10 +885,10 @@
             // 
             this.sg_separator.Enabled = false;
             this.sg_separator.ID = null;
-            this.sg_separator.Location = new System.Drawing.Point(580, 132);
-            this.sg_separator.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.sg_separator.Location = new System.Drawing.Point(290, 66);
+            this.sg_separator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.sg_separator.Name = "sg_separator";
-            this.sg_separator.Size = new System.Drawing.Size(52, 35);
+            this.sg_separator.Size = new System.Drawing.Size(28, 21);
             this.sg_separator.Str = null;
             this.sg_separator.Str1 = null;
             this.sg_separator.Str2 = null;
@@ -921,10 +897,10 @@
             // Input
             // 
             this.Input.ID = null;
-            this.Input.Location = new System.Drawing.Point(152, 436);
-            this.Input.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            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(296, 35);
+            this.Input.Size = new System.Drawing.Size(150, 21);
             this.Input.Str = null;
             this.Input.Str1 = null;
             this.Input.Str2 = null;
@@ -934,10 +910,10 @@
             // griddetno
             // 
             this.griddetno.ID = null;
-            this.griddetno.Location = new System.Drawing.Point(152, 264);
-            this.griddetno.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.griddetno.Location = new System.Drawing.Point(76, 132);
+            this.griddetno.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.griddetno.Name = "griddetno";
-            this.griddetno.Size = new System.Drawing.Size(200, 35);
+            this.griddetno.Size = new System.Drawing.Size(102, 21);
             this.griddetno.Str = null;
             this.griddetno.Str1 = null;
             this.griddetno.Str2 = null;
@@ -951,14 +927,14 @@
             this.sg_code.Condition = null;
             this.sg_code.DBTitle = null;
             this.sg_code.FormName = null;
-            this.sg_code.Location = new System.Drawing.Point(152, 132);
-            this.sg_code.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.sg_code.Location = new System.Drawing.Point(76, 66);
+            this.sg_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.sg_code.Name = "sg_code";
             this.sg_code.Power = null;
             this.sg_code.ReturnData = null;
             this.sg_code.SelectField = null;
             this.sg_code.SetValueField = null;
-            this.sg_code.Size = new System.Drawing.Size(298, 48);
+            this.sg_code.Size = new System.Drawing.Size(149, 24);
             this.sg_code.TabIndex = 32;
             this.sg_code.TableName = null;
             this.sg_code.TextBoxEnable = false;
@@ -969,10 +945,10 @@
             this.MessageLog.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.MessageLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MessageLog.Location = new System.Drawing.Point(8, 1220);
-            this.MessageLog.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.MessageLog.Location = new System.Drawing.Point(4, 610);
+            this.MessageLog.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MessageLog.Name = "MessageLog";
-            this.MessageLog.Size = new System.Drawing.Size(2494, 190);
+            this.MessageLog.Size = new System.Drawing.Size(1249, 97);
             this.MessageLog.TabIndex = 28;
             this.MessageLog.Text = "";
             // 
@@ -991,7 +967,7 @@
             this.pib_id1,
             this.pib_pdno,
             this.pib_prodcode,
-            this.pr_vendprodcode,
+            this.pr_orispeccode,
             this.pd_custprodcode,
             this.pd_pocode,
             this.pd_custprodspec,
@@ -1003,11 +979,11 @@
             this.pib_lotno,
             this.pib_datecode,
             this.pib_qty});
-            this.LabelInf.Location = new System.Drawing.Point(4, 504);
-            this.LabelInf.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.LabelInf.Location = new System.Drawing.Point(2, 252);
+            this.LabelInf.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.LabelInf.Name = "LabelInf";
             this.LabelInf.RowTemplate.Height = 23;
-            this.LabelInf.Size = new System.Drawing.Size(2502, 652);
+            this.LabelInf.Size = new System.Drawing.Size(1251, 326);
             this.LabelInf.TabIndex = 27;
             this.LabelInf.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.LabelInf_CellPainting);
             this.LabelInf.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.LabelInf_DataError);
@@ -1015,10 +991,10 @@
             // pi_inoutno
             // 
             this.pi_inoutno.ID = null;
-            this.pi_inoutno.Location = new System.Drawing.Point(152, 20);
-            this.pi_inoutno.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.pi_inoutno.Location = new System.Drawing.Point(76, 10);
+            this.pi_inoutno.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pi_inoutno.Name = "pi_inoutno";
-            this.pi_inoutno.Size = new System.Drawing.Size(296, 35);
+            this.pi_inoutno.Size = new System.Drawing.Size(150, 21);
             this.pi_inoutno.Str = null;
             this.pi_inoutno.Str1 = null;
             this.pi_inoutno.Str2 = null;
@@ -1058,7 +1034,7 @@
             this.pib_id1.HeaderText = "pib_id";
             this.pib_id1.Name = "pib_id1";
             this.pib_id1.Visible = false;
-            this.pib_id1.Width = 127;
+            this.pib_id1.Width = 66;
             // 
             // pib_pdno
             // 
@@ -1078,14 +1054,14 @@
             this.pib_prodcode.Name = "pib_prodcode";
             this.pib_prodcode.ReadOnly = true;
             // 
-            // pr_vendprodcode
+            // pr_orispeccode
             // 
-            this.pr_vendprodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
-            this.pr_vendprodcode.DataPropertyName = "pr_vendprodcode";
-            this.pr_vendprodcode.HeaderText = "MPN";
-            this.pr_vendprodcode.MinimumWidth = 100;
-            this.pr_vendprodcode.Name = "pr_vendprodcode";
-            this.pr_vendprodcode.ReadOnly = true;
+            this.pr_orispeccode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
+            this.pr_orispeccode.DataPropertyName = "pr_orispeccode";
+            this.pr_orispeccode.HeaderText = "MPN";
+            this.pr_orispeccode.MinimumWidth = 100;
+            this.pr_orispeccode.Name = "pr_orispeccode";
+            this.pr_orispeccode.ReadOnly = true;
             // 
             // pd_custprodcode
             // 
@@ -1102,7 +1078,7 @@
             this.pd_pocode.HeaderText = "客户PO";
             this.pd_pocode.Name = "pd_pocode";
             this.pd_pocode.ReadOnly = true;
-            this.pd_pocode.Width = 97;
+            this.pd_pocode.Width = 66;
             // 
             // pd_custprodspec
             // 
@@ -1110,7 +1086,7 @@
             this.pd_custprodspec.HeaderText = "客户型号";
             this.pd_custprodspec.Name = "pd_custprodspec";
             this.pd_custprodspec.ReadOnly = true;
-            this.pd_custprodspec.Width = 97;
+            this.pd_custprodspec.Width = 78;
             // 
             // pr_spec
             // 
@@ -1118,7 +1094,7 @@
             this.pr_spec.HeaderText = "规格";
             this.pr_spec.Name = "pr_spec";
             this.pr_spec.Visible = false;
-            this.pr_spec.Width = 97;
+            this.pr_spec.Width = 54;
             // 
             // pib_brand
             // 
@@ -1126,14 +1102,14 @@
             this.pib_brand.HeaderText = "品牌";
             this.pib_brand.Name = "pib_brand";
             this.pib_brand.ReadOnly = true;
-            this.pib_brand.Width = 97;
+            this.pib_brand.Width = 54;
             // 
             // pib_madein
             // 
             this.pib_madein.DataPropertyName = "pib_madein";
             this.pib_madein.HeaderText = "产地";
             this.pib_madein.Name = "pib_madein";
-            this.pib_madein.Width = 97;
+            this.pib_madein.Width = 54;
             // 
             // pr_zxbzs
             // 
@@ -1141,7 +1117,7 @@
             this.pr_zxbzs.HeaderText = "最小包装数";
             this.pr_zxbzs.Name = "pr_zxbzs";
             this.pr_zxbzs.Visible = false;
-            this.pr_zxbzs.Width = 118;
+            this.pr_zxbzs.Width = 90;
             // 
             // pr_unit
             // 
@@ -1149,21 +1125,21 @@
             this.pr_unit.HeaderText = "单位";
             this.pr_unit.Name = "pr_unit";
             this.pr_unit.Visible = false;
-            this.pr_unit.Width = 97;
+            this.pr_unit.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 = 115;
+            this.pib_lotno.Width = 60;
             // 
             // pib_datecode
             // 
             this.pib_datecode.DataPropertyName = "pib_datecode";
             this.pib_datecode.HeaderText = "DC";
             this.pib_datecode.Name = "pib_datecode";
-            this.pib_datecode.Width = 79;
+            this.pib_datecode.Width = 42;
             // 
             // pib_qty
             // 
@@ -1171,14 +1147,14 @@
             this.pib_qty.HeaderText = "数量";
             this.pib_qty.Name = "pib_qty";
             this.pib_qty.ReadOnly = true;
-            this.pib_qty.Width = 97;
+            this.pib_qty.Width = 54;
             // 
             // UAS_出货标签打印
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            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(2514, 1422);
+            this.ClientSize = new System.Drawing.Size(962, 530);
             this.Controls.Add(this.ExportData);
             this.Controls.Add(this.cu_code);
             this.Controls.Add(this.CleanBarCode);
@@ -1217,7 +1193,7 @@
             this.Controls.Add(this.pi_inoutno);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "UAS_出货标签打印";
             this.Text = " UAS-出货标签管理";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -1226,10 +1202,10 @@
             this.SizeChanged += new System.EventHandler(this.贴标机条码打印_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).EndInit();
-            this.CollectionProcess.ResumeLayout(true);
+            this.CollectionProcess.ResumeLayout(false);
             this.CollectionProcess.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LabelInf)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -1325,7 +1301,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_id1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_pdno;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_prodcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pr_vendprodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_orispeccode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_custprodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_pocode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_custprodspec;

UAS-出货标签管理(标签复核)/UAS_出货标签管理.cs

@@ -9,7 +9,6 @@ using System.Linq;
 using System.Diagnostics;
 using UAS_LabelMachine.PublicMethod;
 using UAS_LabelMachine.Entity;
-using System.Globalization;
 using System.Reflection;
 
 namespace UAS_LabelMachine
@@ -295,7 +294,7 @@ namespace UAS_LabelMachine
             {
                 for (int j = 0; j < arr.Length; j++)
                 {
-                    if (LabelInf.Rows[i].Cells["pr_vendprodcode"].Value.ToString() == MatchStr(arr[j].ToString(), "MPN") && LabelInf.Rows[i].Cells["pib_ifpick"].FormattedValue.ToString() != "True")
+                    if (LabelInf.Rows[i].Cells["pr_orispeccode"].Value.ToString() == MatchStr(arr[j].ToString(), "MPN") && LabelInf.Rows[i].Cells["pib_ifpick"].FormattedValue.ToString() != "True")
                     {
                         CurrentRowIndex = i;
                         FindAutoMatch = true;
@@ -552,20 +551,8 @@ 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"];
+                            cell = LabelInf.Rows[CurrentRowIndex].Cells["pr_orispeccode"];
                             Matchstr = MatchStr(data[j], "MPN");
                             //采集的供应商号不匹配的话
                             if (cell.Value.ToString() != Matchstr)
@@ -601,8 +588,8 @@ namespace UAS_LabelMachine
                             setdata.Remove("QTY");
                             length--;
                             break;
-                        case "品牌":
-                            cell = LabelInf.Rows[CurrentRowIndex].Cells["pib_brand"];
+                        case "客户料号":
+                            cell = LabelInf.Rows[CurrentRowIndex].Cells["pd_custprodcode"];
                             Matchstr = MatchStr(data[j], "品牌");
                             //如果采集的数量不相等的话
                             if (cell.Value.ToString() != Matchstr)
@@ -824,7 +811,7 @@ namespace UAS_LabelMachine
         {
             AllCollect = false;
             sql.Clear();
-            sql.Append("select 0 choose,pd_custprodcode,pd_custprodspec,pd_pocode,pib_madein,pib_custbarcode,pib_custoutboxcode,pib_id,pib_datecode1,pib_pdid,pib_piid,pib_pdno,pib_prodcode,nvl(nvl(pd_brand,pib_brand),pr_brand)pib_brand, pr_vendprodcode,");
+            sql.Append("select 0 choose,pd_custprodcode,pd_custprodspec,pr_orispeccode,pd_pocode,pib_madein,pib_custbarcode,pib_custoutboxcode,pib_id,pib_datecode1,pib_pdid,pib_piid,pib_pdno,pib_prodcode,nvl(nvl(pd_brand,pib_brand),pr_brand)pib_brand, pr_vendprodcode,");
             sql.Append("pib_lotno,pib_datecode,pib_qty,pr_spec,pr_zxbzs,pr_unit,pib_barcode,pib_outboxcode1,pib_outboxcode2,nvl(pib_ifpick,0)pib_ifpick,nvl(pib_ifprint,0)pib_ifprint");
             sql.Append(" from prodiobarcode left join prodiodetail on pib_piid=pd_piid and pd_pdno=pib_pdno and ");
             sql.Append(" pd_prodcode=pib_prodcode left join product on pr_code=pib_prodcode left join sale on sa_code=pib_ordercode ");