修改内容提交

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

@@ -91,6 +91,10 @@
             this.sg_code = new System.Windows.Forms.Label();
             this.pi_inoutno = new System.Windows.Forms.Label();
             this.AllCollect = new System.Windows.Forms.Button();
+            this.cu_needrecheck = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.needcheck = new System.Windows.Forms.Label();
             this.cu_code = new UAS_LabelMachine.CustomControl.SearchTextBox();
             this.pr_code = new UAS_LabelMachine.CustomControl.SearchTextBox();
             this.CollectionProcess = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
@@ -111,6 +115,7 @@
             this.sg_brand = new UAS_LabelMachine.CustomControl.SearchTextBox();
             this.MessageLog = new UAS_LabelMachine.CustomControl.RichText.RichTextAutoBottom();
             this.LabelInf = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
+            this.pi_invoicecode = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.pib_ifpick = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.pib_ifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
@@ -119,6 +124,7 @@
             this.pib_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_orispeccode = 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();
@@ -130,11 +136,6 @@
             this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pi_invoicecode = new UAS_LabelMachine.CustomControl.EnterTextBox();
-            this.cu_needrecheck = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.needcheck = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             this.CollectionProcess.SuspendLayout();
@@ -145,9 +146,10 @@
             // 
             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(3, 10);
+            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.Name = "pi_inoutno_label";
-            this.pi_inoutno_label.Size = new System.Drawing.Size(51, 20);
+            this.pi_inoutno_label.Size = new System.Drawing.Size(99, 36);
             this.pi_inoutno_label.TabIndex = 3;
             this.pi_inoutno_label.Text = "发票号";
             // 
@@ -155,9 +157,10 @@
             // 
             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(3, 95);
+            this.label1.Location = new System.Drawing.Point(6, 190);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(65, 20);
+            this.label1.Size = new System.Drawing.Size(127, 36);
             this.label1.TabIndex = 31;
             this.label1.Text = "采集策略";
             // 
@@ -165,9 +168,10 @@
             // 
             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(5, 135);
+            this.label2.Location = new System.Drawing.Point(10, 270);
+            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(65, 20);
+            this.label2.Size = new System.Drawing.Size(127, 36);
             this.label2.TabIndex = 33;
             this.label2.Text = "当前采集";
             // 
@@ -175,9 +179,10 @@
             // 
             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(72, 135);
+            this.label22.Location = new System.Drawing.Point(144, 270);
+            this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(65, 20);
+            this.label22.Size = new System.Drawing.Size(127, 36);
             this.label22.TabIndex = 34;
             this.label22.Text = "明细序号";
             // 
@@ -185,10 +190,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(144, 135);
-            this.AutoMatch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.AutoMatch.Location = new System.Drawing.Point(288, 270);
+            this.AutoMatch.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.AutoMatch.Name = "AutoMatch";
-            this.AutoMatch.Size = new System.Drawing.Size(84, 24);
+            this.AutoMatch.Size = new System.Drawing.Size(159, 40);
             this.AutoMatch.TabIndex = 49;
             this.AutoMatch.Text = "自动匹配";
             this.AutoMatch.UseVisualStyleBackColor = true;
@@ -197,9 +202,10 @@
             // 
             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(9, 187);
+            this.pr_code_label.Location = new System.Drawing.Point(18, 374);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(65, 20);
+            this.pr_code_label.Size = new System.Drawing.Size(127, 36);
             this.pr_code_label.TabIndex = 51;
             this.pr_code_label.Text = "物料编号";
             // 
@@ -207,19 +213,20 @@
             // 
             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, 224);
+            this.label24.Location = new System.Drawing.Point(18, 448);
+            this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(51, 20);
+            this.label24.Size = new System.Drawing.Size(99, 36);
             this.label24.TabIndex = 55;
             this.label24.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(374, 186);
-            this.GenerateBarCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.GenerateBarCode.Location = new System.Drawing.Point(748, 372);
+            this.GenerateBarCode.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.GenerateBarCode.Name = "GenerateBarCode";
-            this.GenerateBarCode.Size = new System.Drawing.Size(68, 26);
+            this.GenerateBarCode.Size = new System.Drawing.Size(136, 52);
             this.GenerateBarCode.TabIndex = 41;
             this.GenerateBarCode.Text = "生成条码";
             this.GenerateBarCode.UseVisualStyleBackColor = true;
@@ -228,10 +235,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(448, 222);
-            this.SaveGrid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.SaveGrid.Location = new System.Drawing.Point(896, 444);
+            this.SaveGrid.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.SaveGrid.Name = "SaveGrid";
-            this.SaveGrid.Size = new System.Drawing.Size(68, 26);
+            this.SaveGrid.Size = new System.Drawing.Size(136, 52);
             this.SaveGrid.TabIndex = 59;
             this.SaveGrid.Text = "保存明细";
             this.SaveGrid.UseVisualStyleBackColor = true;
@@ -241,19 +248,20 @@
             // 
             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(243, 98);
+            this.sg_separator_label.Location = new System.Drawing.Point(486, 196);
+            this.sg_separator_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.sg_separator_label.Name = "sg_separator_label";
-            this.sg_separator_label.Size = new System.Drawing.Size(51, 20);
+            this.sg_separator_label.Size = new System.Drawing.Size(99, 36);
             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(246, 133);
-            this.CollectionSetting.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.CollectionSetting.Location = new System.Drawing.Point(492, 266);
+            this.CollectionSetting.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.CollectionSetting.Name = "CollectionSetting";
-            this.CollectionSetting.Size = new System.Drawing.Size(88, 26);
+            this.CollectionSetting.Size = new System.Drawing.Size(176, 52);
             this.CollectionSetting.TabIndex = 63;
             this.CollectionSetting.Text = "采集策略设置";
             this.CollectionSetting.UseVisualStyleBackColor = true;
@@ -273,11 +281,11 @@
             this.si_expression,
             this.si_item,
             this.si_expressionitem});
-            this.Si_ItemDGV.Location = new System.Drawing.Point(340, 14);
-            this.Si_ItemDGV.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Si_ItemDGV.Location = new System.Drawing.Point(680, 28);
+            this.Si_ItemDGV.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.Si_ItemDGV.Name = "Si_ItemDGV";
             this.Si_ItemDGV.RowTemplate.Height = 23;
-            this.Si_ItemDGV.Size = new System.Drawing.Size(134, 146);
+            this.Si_ItemDGV.Size = new System.Drawing.Size(268, 292);
             this.Si_ItemDGV.TabIndex = 65;
             // 
             // si_detno
@@ -345,10 +353,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(374, 222);
-            this.CleanDetail.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.CleanDetail.Location = new System.Drawing.Point(748, 444);
+            this.CleanDetail.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.CleanDetail.Name = "CleanDetail";
-            this.CleanDetail.Size = new System.Drawing.Size(68, 26);
+            this.CleanDetail.Size = new System.Drawing.Size(136, 52);
             this.CleanDetail.TabIndex = 66;
             this.CleanDetail.Text = "清除明细";
             this.CleanDetail.UseVisualStyleBackColor = true;
@@ -358,9 +366,10 @@
             // 
             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(142, 166);
+            this.pib_id.Location = new System.Drawing.Point(284, 332);
+            this.pib_id.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pib_id.Name = "pib_id";
-            this.pib_id.Size = new System.Drawing.Size(0, 20);
+            this.pib_id.Size = new System.Drawing.Size(0, 36);
             this.pib_id.TabIndex = 69;
             this.pib_id.Visible = false;
             // 
@@ -368,18 +377,20 @@
             // 
             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(3, 67);
+            this.pi_cardcode_label.Location = new System.Drawing.Point(6, 134);
+            this.pi_cardcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pi_cardcode_label.Name = "pi_cardcode_label";
-            this.pi_cardcode_label.Size = new System.Drawing.Size(65, 20);
+            this.pi_cardcode_label.Size = new System.Drawing.Size(127, 36);
             this.pi_cardcode_label.TabIndex = 72;
             this.pi_cardcode_label.Text = "客户编号";
             // 
             // Fresh
             // 
             this.Fresh.AutoSize = true;
-            this.Fresh.Location = new System.Drawing.Point(228, 14);
+            this.Fresh.Location = new System.Drawing.Point(456, 28);
+            this.Fresh.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Fresh.Name = "Fresh";
-            this.Fresh.Size = new System.Drawing.Size(29, 12);
+            this.Fresh.Size = new System.Drawing.Size(58, 24);
             this.Fresh.TabIndex = 73;
             this.Fresh.TabStop = true;
             this.Fresh.Text = "刷新";
@@ -389,9 +400,10 @@
             // 
             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(5, 587);
+            this.label3.Location = new System.Drawing.Point(10, 1174);
+            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(74, 21);
+            this.label3.Size = new System.Drawing.Size(146, 41);
             this.label3.TabIndex = 29;
             this.label3.Text = "输出日志";
             // 
@@ -401,10 +413,10 @@
             this.CleanInputAfterCollect.Checked = true;
             this.CleanInputAfterCollect.CheckState = System.Windows.Forms.CheckState.Checked;
             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(232, 224);
-            this.CleanInputAfterCollect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.CleanInputAfterCollect.Location = new System.Drawing.Point(464, 448);
+            this.CleanInputAfterCollect.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.CleanInputAfterCollect.Name = "CleanInputAfterCollect";
-            this.CleanInputAfterCollect.Size = new System.Drawing.Size(123, 21);
+            this.CleanInputAfterCollect.Size = new System.Drawing.Size(238, 35);
             this.CleanInputAfterCollect.TabIndex = 74;
             this.CleanInputAfterCollect.Text = "采集后清除输入框";
             this.CleanInputAfterCollect.UseVisualStyleBackColor = true;
@@ -617,10 +629,10 @@
             // 
             // ChooseAll
             // 
-            this.ChooseAll.Location = new System.Drawing.Point(4, 252);
-            this.ChooseAll.Margin = new System.Windows.Forms.Padding(2);
+            this.ChooseAll.Location = new System.Drawing.Point(8, 504);
+            this.ChooseAll.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseAll.Name = "ChooseAll";
-            this.ChooseAll.Size = new System.Drawing.Size(38, 22);
+            this.ChooseAll.Size = new System.Drawing.Size(76, 44);
             this.ChooseAll.TabIndex = 84;
             this.ChooseAll.Text = "全选";
             this.ChooseAll.UseVisualStyleBackColor = true;
@@ -630,19 +642,20 @@
             // 
             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(5, 158);
+            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.Name = "pi_date";
-            this.pi_date.Size = new System.Drawing.Size(0, 20);
+            this.pi_date.Size = new System.Drawing.Size(0, 36);
             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(448, 186);
-            this.CleanBarCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.CleanBarCode.Location = new System.Drawing.Point(896, 372);
+            this.CleanBarCode.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.CleanBarCode.Name = "CleanBarCode";
-            this.CleanBarCode.Size = new System.Drawing.Size(68, 26);
+            this.CleanBarCode.Size = new System.Drawing.Size(136, 52);
             this.CleanBarCode.TabIndex = 87;
             this.CleanBarCode.Text = "清空条码";
             this.CleanBarCode.UseVisualStyleBackColor = true;
@@ -651,10 +664,10 @@
             // ExportData
             // 
             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(522, 186);
-            this.ExportData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.ExportData.Location = new System.Drawing.Point(1044, 372);
+            this.ExportData.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.ExportData.Name = "ExportData";
-            this.ExportData.Size = new System.Drawing.Size(68, 26);
+            this.ExportData.Size = new System.Drawing.Size(136, 52);
             this.ExportData.TabIndex = 91;
             this.ExportData.Text = "导出数据";
             this.ExportData.UseVisualStyleBackColor = true;
@@ -664,9 +677,10 @@
             // 
             this.sg_code.AutoSize = true;
             this.sg_code.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sg_code.Location = new System.Drawing.Point(324, 68);
+            this.sg_code.Location = new System.Drawing.Point(648, 136);
+            this.sg_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.sg_code.Name = "sg_code";
-            this.sg_code.Size = new System.Drawing.Size(0, 20);
+            this.sg_code.Size = new System.Drawing.Size(0, 36);
             this.sg_code.TabIndex = 92;
             this.sg_code.TextChanged += new System.EventHandler(this.sg_brand_UserControlTextChanged);
             // 
@@ -674,22 +688,66 @@
             // 
             this.pi_inoutno.AutoSize = true;
             this.pi_inoutno.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_inoutno.Location = new System.Drawing.Point(73, 40);
+            this.pi_inoutno.Location = new System.Drawing.Point(146, 80);
+            this.pi_inoutno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pi_inoutno.Name = "pi_inoutno";
-            this.pi_inoutno.Size = new System.Drawing.Size(0, 20);
+            this.pi_inoutno.Size = new System.Drawing.Size(0, 36);
             this.pi_inoutno.TabIndex = 93;
             // 
             // AllCollect
             // 
             this.AllCollect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AllCollect.Location = new System.Drawing.Point(522, 222);
-            this.AllCollect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.AllCollect.Location = new System.Drawing.Point(1044, 444);
+            this.AllCollect.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.AllCollect.Name = "AllCollect";
-            this.AllCollect.Size = new System.Drawing.Size(68, 26);
+            this.AllCollect.Size = new System.Drawing.Size(136, 52);
             this.AllCollect.TabIndex = 94;
             this.AllCollect.Text = "全部采集";
             this.AllCollect.UseVisualStyleBackColor = true;
             // 
+            // cu_needrecheck
+            // 
+            this.cu_needrecheck.AutoSize = true;
+            this.cu_needrecheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cu_needrecheck.Location = new System.Drawing.Point(1408, 240);
+            this.cu_needrecheck.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.cu_needrecheck.Name = "cu_needrecheck";
+            this.cu_needrecheck.Size = new System.Drawing.Size(0, 36);
+            this.cu_needrecheck.TabIndex = 95;
+            this.cu_needrecheck.Visible = false;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.Location = new System.Drawing.Point(6, 80);
+            this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(127, 36);
+            this.label4.TabIndex = 96;
+            this.label4.Text = "出货单号";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.Location = new System.Drawing.Point(486, 134);
+            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(127, 36);
+            this.label5.TabIndex = 97;
+            this.label5.Text = "是否复核";
+            // 
+            // needcheck
+            // 
+            this.needcheck.AutoSize = true;
+            this.needcheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.needcheck.Location = new System.Drawing.Point(612, 134);
+            this.needcheck.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.needcheck.Name = "needcheck";
+            this.needcheck.Size = new System.Drawing.Size(0, 36);
+            this.needcheck.TabIndex = 98;
+            // 
             // cu_code
             // 
             this.cu_code.AllPower = null;
@@ -697,14 +755,14 @@
             this.cu_code.Condition = null;
             this.cu_code.DBTitle = null;
             this.cu_code.FormName = null;
-            this.cu_code.Location = new System.Drawing.Point(75, 67);
-            this.cu_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cu_code.Location = new System.Drawing.Point(150, 134);
+            this.cu_code.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             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(149, 18);
+            this.cu_code.Size = new System.Drawing.Size(298, 36);
             this.cu_code.TabIndex = 88;
             this.cu_code.TableName = null;
             this.cu_code.TextBoxEnable = false;
@@ -716,14 +774,14 @@
             this.pr_code.Condition = null;
             this.pr_code.DBTitle = null;
             this.pr_code.FormName = null;
-            this.pr_code.Location = new System.Drawing.Point(76, 188);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pr_code.Location = new System.Drawing.Point(152, 376);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             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(148, 22);
+            this.pr_code.Size = new System.Drawing.Size(296, 44);
             this.pr_code.TabIndex = 68;
             this.pr_code.TableName = null;
             this.pr_code.TextBoxEnable = false;
@@ -743,11 +801,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(480, 10);
-            this.CollectionProcess.Margin = new System.Windows.Forms.Padding(2);
+            this.CollectionProcess.Location = new System.Drawing.Point(960, 20);
+            this.CollectionProcess.Margin = new System.Windows.Forms.Padding(4);
             this.CollectionProcess.Name = "CollectionProcess";
-            this.CollectionProcess.Padding = new System.Windows.Forms.Padding(2);
-            this.CollectionProcess.Size = new System.Drawing.Size(171, 152);
+            this.CollectionProcess.Padding = new System.Windows.Forms.Padding(4);
+            this.CollectionProcess.Size = new System.Drawing.Size(342, 304);
             this.CollectionProcess.TabIndex = 80;
             this.CollectionProcess.TabStop = false;
             this.CollectionProcess.Text = " ";
@@ -756,18 +814,20 @@
             // 
             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(62, 66);
+            this.Capacity.Location = new System.Drawing.Point(124, 132);
+            this.Capacity.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Capacity.Name = "Capacity";
-            this.Capacity.Size = new System.Drawing.Size(0, 17);
+            this.Capacity.Size = new System.Drawing.Size(0, 31);
             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(62, 112);
+            this.Process_midboxcode.Location = new System.Drawing.Point(124, 224);
+            this.Process_midboxcode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Process_midboxcode.Name = "Process_midboxcode";
-            this.Process_midboxcode.Size = new System.Drawing.Size(15, 17);
+            this.Process_midboxcode.Size = new System.Drawing.Size(28, 31);
             this.Process_midboxcode.TabIndex = 74;
             this.Process_midboxcode.Text = "0";
             // 
@@ -775,9 +835,10 @@
             // 
             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(62, 88);
+            this.Process_outboxcode.Location = new System.Drawing.Point(124, 176);
+            this.Process_outboxcode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Process_outboxcode.Name = "Process_outboxcode";
-            this.Process_outboxcode.Size = new System.Drawing.Size(15, 17);
+            this.Process_outboxcode.Size = new System.Drawing.Size(28, 31);
             this.Process_outboxcode.TabIndex = 73;
             this.Process_outboxcode.Text = "0";
             // 
@@ -786,9 +847,10 @@
             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(117, 18);
+            this.TotalCount.Location = new System.Drawing.Point(234, 36);
+            this.TotalCount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.TotalCount.Name = "TotalCount";
-            this.TotalCount.Size = new System.Drawing.Size(15, 17);
+            this.TotalCount.Size = new System.Drawing.Size(28, 31);
             this.TotalCount.TabIndex = 72;
             this.TotalCount.Text = "0";
             // 
@@ -796,9 +858,10 @@
             // 
             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(95, 18);
+            this.label17.Location = new System.Drawing.Point(190, 36);
+            this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(13, 17);
+            this.label17.Size = new System.Drawing.Size(24, 31);
             this.label17.TabIndex = 71;
             this.label17.Text = "/";
             // 
@@ -807,9 +870,10 @@
             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(66, 18);
+            this.CollectedCount.Location = new System.Drawing.Point(132, 36);
+            this.CollectedCount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.CollectedCount.Name = "CollectedCount";
-            this.CollectedCount.Size = new System.Drawing.Size(15, 17);
+            this.CollectedCount.Size = new System.Drawing.Size(28, 31);
             this.CollectedCount.TabIndex = 70;
             this.CollectedCount.Text = "0";
             // 
@@ -817,9 +881,10 @@
             // 
             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(12, 88);
+            this.label14.Location = new System.Drawing.Point(24, 176);
+            this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(32, 17);
+            this.label14.Size = new System.Drawing.Size(62, 31);
             this.label14.TabIndex = 69;
             this.label14.Text = "箱号";
             // 
@@ -827,9 +892,10 @@
             // 
             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(12, 112);
+            this.label11.Location = new System.Drawing.Point(24, 224);
+            this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(32, 17);
+            this.label11.Size = new System.Drawing.Size(62, 31);
             this.label11.TabIndex = 68;
             this.label11.Text = "盒号";
             // 
@@ -837,9 +903,10 @@
             // 
             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(12, 48);
+            this.label13.Location = new System.Drawing.Point(24, 96);
+            this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(44, 17);
+            this.label13.Size = new System.Drawing.Size(86, 31);
             this.label13.TabIndex = 67;
             this.label13.Text = "当前盒";
             // 
@@ -847,18 +914,20 @@
             // 
             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(62, 48);
+            this.Installed.Location = new System.Drawing.Point(124, 96);
+            this.Installed.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Installed.Name = "Installed";
-            this.Installed.Size = new System.Drawing.Size(0, 17);
+            this.Installed.Size = new System.Drawing.Size(0, 31);
             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(12, 18);
+            this.Process.Location = new System.Drawing.Point(24, 36);
+            this.Process.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Process.Name = "Process";
-            this.Process.Size = new System.Drawing.Size(44, 17);
+            this.Process.Size = new System.Drawing.Size(86, 31);
             this.Process.TabIndex = 65;
             this.Process.Text = "总进度";
             // 
@@ -866,10 +935,10 @@
             // 
             this.sg_separator.Enabled = false;
             this.sg_separator.ID = null;
-            this.sg_separator.Location = new System.Drawing.Point(304, 98);
-            this.sg_separator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.sg_separator.Location = new System.Drawing.Point(608, 196);
+            this.sg_separator.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.sg_separator.Name = "sg_separator";
-            this.sg_separator.Size = new System.Drawing.Size(28, 21);
+            this.sg_separator.Size = new System.Drawing.Size(52, 35);
             this.sg_separator.Str = null;
             this.sg_separator.Str1 = null;
             this.sg_separator.Str2 = null;
@@ -878,10 +947,10 @@
             // Input
             // 
             this.Input.ID = null;
-            this.Input.Location = new System.Drawing.Point(76, 224);
-            this.Input.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Input.Location = new System.Drawing.Point(152, 448);
+            this.Input.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.Input.Name = "Input";
-            this.Input.Size = new System.Drawing.Size(150, 21);
+            this.Input.Size = new System.Drawing.Size(296, 35);
             this.Input.Str = null;
             this.Input.Str1 = null;
             this.Input.Str2 = null;
@@ -891,10 +960,10 @@
             // griddetno
             // 
             this.griddetno.ID = null;
-            this.griddetno.Location = new System.Drawing.Point(76, 161);
-            this.griddetno.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.griddetno.Location = new System.Drawing.Point(152, 322);
+            this.griddetno.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.griddetno.Name = "griddetno";
-            this.griddetno.Size = new System.Drawing.Size(102, 21);
+            this.griddetno.Size = new System.Drawing.Size(200, 35);
             this.griddetno.Str = null;
             this.griddetno.Str1 = null;
             this.griddetno.Str2 = null;
@@ -908,14 +977,14 @@
             this.sg_brand.Condition = null;
             this.sg_brand.DBTitle = null;
             this.sg_brand.FormName = null;
-            this.sg_brand.Location = new System.Drawing.Point(75, 96);
-            this.sg_brand.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.sg_brand.Location = new System.Drawing.Point(150, 192);
+            this.sg_brand.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.sg_brand.Name = "sg_brand";
             this.sg_brand.Power = null;
             this.sg_brand.ReturnData = null;
             this.sg_brand.SelectField = null;
             this.sg_brand.SetValueField = null;
-            this.sg_brand.Size = new System.Drawing.Size(149, 18);
+            this.sg_brand.Size = new System.Drawing.Size(298, 36);
             this.sg_brand.TabIndex = 32;
             this.sg_brand.TableName = null;
             this.sg_brand.TextBoxEnable = false;
@@ -926,10 +995,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(4, 610);
-            this.MessageLog.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.MessageLog.Location = new System.Drawing.Point(8, 1220);
+            this.MessageLog.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.MessageLog.Name = "MessageLog";
-            this.MessageLog.Size = new System.Drawing.Size(1642, 97);
+            this.MessageLog.Size = new System.Drawing.Size(3280, 190);
             this.MessageLog.TabIndex = 28;
             this.MessageLog.Text = "";
             // 
@@ -950,6 +1019,7 @@
             this.pib_prodcode,
             this.pr_detail,
             this.pr_spec,
+            this.pd_orispeccode,
             this.pr_orispeccode,
             this.pd_custprodcode,
             this.pd_pocode,
@@ -961,15 +1031,28 @@
             this.pib_lotno,
             this.pib_datecode,
             this.pib_qty});
-            this.LabelInf.Location = new System.Drawing.Point(2, 252);
-            this.LabelInf.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.LabelInf.Location = new System.Drawing.Point(4, 504);
+            this.LabelInf.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.LabelInf.Name = "LabelInf";
             this.LabelInf.RowTemplate.Height = 23;
-            this.LabelInf.Size = new System.Drawing.Size(1304, 326);
+            this.LabelInf.Size = new System.Drawing.Size(2608, 652);
             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);
             // 
+            // pi_invoicecode
+            // 
+            this.pi_invoicecode.ID = null;
+            this.pi_invoicecode.Location = new System.Drawing.Point(152, 20);
+            this.pi_invoicecode.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.pi_invoicecode.Name = "pi_invoicecode";
+            this.pi_invoicecode.Size = new System.Drawing.Size(296, 35);
+            this.pi_invoicecode.Str = null;
+            this.pi_invoicecode.Str1 = null;
+            this.pi_invoicecode.Str2 = null;
+            this.pi_invoicecode.TabIndex = 2;
+            this.pi_invoicecode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pi_inoutno_KeyDown);
+            // 
             // Choose
             // 
             this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
@@ -1003,7 +1086,7 @@
             this.pib_id1.HeaderText = "pib_id";
             this.pib_id1.Name = "pib_id1";
             this.pib_id1.Visible = false;
-            this.pib_id1.Width = 66;
+            this.pib_id1.Width = 127;
             // 
             // pib_pdno
             // 
@@ -1029,7 +1112,7 @@
             this.pr_detail.DataPropertyName = "pr_detail";
             this.pr_detail.HeaderText = "物料名称";
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Width = 78;
+            this.pr_detail.Width = 97;
             // 
             // pr_spec
             // 
@@ -1040,11 +1123,20 @@
             this.pr_spec.Name = "pr_spec";
             this.pr_spec.Width = 150;
             // 
+            // pd_orispeccode
+            // 
+            this.pd_orispeccode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
+            this.pd_orispeccode.DataPropertyName = "pd_orispeccode";
+            this.pd_orispeccode.HeaderText = "MPN(新)";
+            this.pd_orispeccode.MinimumWidth = 150;
+            this.pd_orispeccode.Name = "pd_orispeccode";
+            this.pd_orispeccode.Width = 150;
+            // 
             // pr_orispeccode
             // 
             this.pr_orispeccode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
-            this.pr_orispeccode.DataPropertyName = "pr_orispeccode";
-            this.pr_orispeccode.HeaderText = "MPN";
+            this.pr_orispeccode.DataPropertyName = "pr_orispeccodej_user";
+            this.pr_orispeccode.HeaderText = "MPN(旧）";
             this.pr_orispeccode.MinimumWidth = 150;
             this.pr_orispeccode.Name = "pr_orispeccode";
             this.pr_orispeccode.ReadOnly = true;
@@ -1074,7 +1166,7 @@
             this.pd_custprodspec.HeaderText = "客户型号";
             this.pd_custprodspec.Name = "pd_custprodspec";
             this.pd_custprodspec.ReadOnly = true;
-            this.pd_custprodspec.Width = 78;
+            this.pd_custprodspec.Width = 97;
             // 
             // pib_brand
             // 
@@ -1082,14 +1174,14 @@
             this.pib_brand.HeaderText = "品牌";
             this.pib_brand.Name = "pib_brand";
             this.pib_brand.ReadOnly = true;
-            this.pib_brand.Width = 54;
+            this.pib_brand.Width = 97;
             // 
             // pib_madein
             // 
             this.pib_madein.DataPropertyName = "pib_madein";
             this.pib_madein.HeaderText = "产地";
             this.pib_madein.Name = "pib_madein";
-            this.pib_madein.Width = 54;
+            this.pib_madein.Width = 97;
             // 
             // pr_zxbzs
             // 
@@ -1097,7 +1189,7 @@
             this.pr_zxbzs.HeaderText = "最小包装数";
             this.pr_zxbzs.Name = "pr_zxbzs";
             this.pr_zxbzs.Visible = false;
-            this.pr_zxbzs.Width = 90;
+            this.pr_zxbzs.Width = 118;
             // 
             // pr_unit
             // 
@@ -1105,21 +1197,21 @@
             this.pr_unit.HeaderText = "单位";
             this.pr_unit.Name = "pr_unit";
             this.pr_unit.Visible = false;
-            this.pr_unit.Width = 54;
+            this.pr_unit.Width = 97;
             // 
             // pib_lotno
             // 
             this.pib_lotno.DataPropertyName = "pib_lotno";
             this.pib_lotno.HeaderText = "LotNo";
             this.pib_lotno.Name = "pib_lotno";
-            this.pib_lotno.Width = 60;
+            this.pib_lotno.Width = 115;
             // 
             // pib_datecode
             // 
             this.pib_datecode.DataPropertyName = "pib_datecode";
             this.pib_datecode.HeaderText = "DC";
             this.pib_datecode.Name = "pib_datecode";
-            this.pib_datecode.Width = 42;
+            this.pib_datecode.Width = 79;
             // 
             // pib_qty
             // 
@@ -1129,64 +1221,12 @@
             this.pib_qty.Name = "pib_qty";
             this.pib_qty.ReadOnly = true;
             // 
-            // pi_invoicecode
-            // 
-            this.pi_invoicecode.ID = null;
-            this.pi_invoicecode.Location = new System.Drawing.Point(76, 10);
-            this.pi_invoicecode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.pi_invoicecode.Name = "pi_invoicecode";
-            this.pi_invoicecode.Size = new System.Drawing.Size(150, 21);
-            this.pi_invoicecode.Str = null;
-            this.pi_invoicecode.Str1 = null;
-            this.pi_invoicecode.Str2 = null;
-            this.pi_invoicecode.TabIndex = 2;
-            this.pi_invoicecode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pi_inoutno_KeyDown);
-            // 
-            // cu_needrecheck
-            // 
-            this.cu_needrecheck.AutoSize = true;
-            this.cu_needrecheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_needrecheck.Location = new System.Drawing.Point(704, 120);
-            this.cu_needrecheck.Name = "cu_needrecheck";
-            this.cu_needrecheck.Size = new System.Drawing.Size(0, 20);
-            this.cu_needrecheck.TabIndex = 95;
-            this.cu_needrecheck.Visible = false;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(3, 40);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(65, 20);
-            this.label4.TabIndex = 96;
-            this.label4.Text = "出货单号";
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(243, 67);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(65, 20);
-            this.label5.TabIndex = 97;
-            this.label5.Text = "是否复核";
-            // 
-            // needcheck
-            // 
-            this.needcheck.AutoSize = true;
-            this.needcheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.needcheck.Location = new System.Drawing.Point(306, 67);
-            this.needcheck.Name = "needcheck";
-            this.needcheck.Size = new System.Drawing.Size(0, 20);
-            this.needcheck.TabIndex = 98;
-            // 
             // UAS_出货标签打印
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             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(1305, 710);
+            this.ClientSize = new System.Drawing.Size(2610, 1420);
             this.Controls.Add(this.needcheck);
             this.Controls.Add(this.label5);
             this.Controls.Add(this.label4);
@@ -1228,7 +1268,7 @@
             this.Controls.Add(this.pi_invoicecode);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.Name = "UAS_出货标签打印";
             this.Text = " UAS-出货标签管理";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -1325,6 +1365,13 @@
         private System.Windows.Forms.Label pi_date;
         private System.Windows.Forms.Button CleanBarCode;
         private CustomControl.SearchTextBox cu_code;
+        private System.Windows.Forms.Label sg_code;
+        private System.Windows.Forms.Label pi_inoutno;
+        private System.Windows.Forms.Button AllCollect;
+        private System.Windows.Forms.Label cu_needrecheck;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label needcheck;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
         private System.Windows.Forms.DataGridViewCheckBoxColumn pib_ifpick;
         private System.Windows.Forms.DataGridViewCheckBoxColumn pib_ifprint;
@@ -1333,6 +1380,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_prodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_orispeccode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_orispeccode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_custprodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_pocode;
@@ -1344,12 +1392,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_lotno;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_datecode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_qty;
-        private System.Windows.Forms.Label sg_code;
-        private System.Windows.Forms.Label pi_inoutno;
-        private System.Windows.Forms.Button AllCollect;
-        private System.Windows.Forms.Label cu_needrecheck;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label needcheck;
     }
 }

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

@@ -290,6 +290,7 @@ namespace UAS_LabelMachine
                 for (int j = 0; j < arr.Length; j++)
                 {
                     string orispeccode = LabelInf.Rows[i].Cells["pr_orispeccode"].Value.ToString();
+                    string pd_orispeccode = LabelInf.Rows[i].Cells["pd_orispeccode"].Value.ToString();
                     if ((MatchStr(arr[j].ToString(), "MPN").Contains(orispeccode) || MatchStr(arr[j].ToString(), "MPN").Trim().Replace(" ", "").Contains(orispeccode) || orispeccode == MatchStr(arr[j].ToString(), "MPN") ||( LabelInf.Rows[i].Cells["pd_custprodcode"].Value.ToString() == MatchStr(arr[j].ToString(), "CPN")|| MatchStr(arr[j].ToString(), "CPN").Contains(LabelInf.Rows[i].Cells["pd_custprodcode"].Value.ToString()))) && LabelInf.Rows[i].Cells["pib_ifpick"].FormattedValue.ToString() != "True")
                     {
                         if (!Checking)
@@ -319,6 +320,35 @@ namespace UAS_LabelMachine
                         }
                         break;
                     }
+                    if ((MatchStr(arr[j].ToString(), "MPN").Contains(pd_orispeccode) || MatchStr(arr[j].ToString(), "MPN").Trim().Replace(" ", "").Contains(pd_orispeccode) || pd_orispeccode == MatchStr(arr[j].ToString(), "MPN") || (LabelInf.Rows[i].Cells["pd_custprodcode"].Value.ToString() == MatchStr(arr[j].ToString(), "CPN") || MatchStr(arr[j].ToString(), "CPN").Contains(LabelInf.Rows[i].Cells["pd_custprodcode"].Value.ToString()))) && LabelInf.Rows[i].Cells["pib_ifpick"].FormattedValue.ToString() != "True")
+                    {
+                        if (!Checking)
+                        {
+                            CurrentRowIndex = i;
+                            Checking = true;
+                        }
+                        if (CurrentRowIndex - 5 > 0)
+                            LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 5;
+                        else
+                            LabelInf.FirstDisplayedScrollingRowIndex = 0;
+                        Brand = LabelInf.Rows[CurrentRowIndex].Cells["pib_brand"].FormattedValue.ToString();
+                        if (Brand != "")
+                            sg_brand.Text = Brand;
+                        FindAutoMatch = true;
+                        if ((MatchStr(arr[j].ToString(), "MPN").Contains(pd_orispeccode) || MatchStr(arr[j].ToString(), "MPN").Trim().Replace(" ", "").Contains(pd_orispeccode) || pd_orispeccode == MatchStr(arr[j].ToString(), "MPN")))
+                        {
+                            if (LastSpec == "")
+                            {
+                                LastSpec = pd_orispeccode;
+                            }
+                            if (LastSpec != pd_orispeccode)
+                            {
+                                LastSpec = pd_orispeccode;
+                                MessageBox.Show("切换扫描型号" + pd_orispeccode);
+                            }
+                        }
+                        break;
+                    }
                 }
                 if (FindAutoMatch)
                     break;
@@ -520,6 +550,7 @@ namespace UAS_LabelMachine
                 for (int i = 0; i < data.Length; i++)
                 {
                     DataGridViewCell cell = null;
+                    DataGridViewCell cell1 = null;
                     string Matchstr = "";
                     switch (kind.ToString().ToUpper())
                     {
@@ -537,6 +568,7 @@ namespace UAS_LabelMachine
                             break;
                         case "MPN":
                             cell = LabelInf.Rows[CurrentRowIndex].Cells["pr_orispeccode"];
+                            cell1 = LabelInf.Rows[CurrentRowIndex].Cells["pd_orispeccode"];
                             Matchstr = MatchStr(data[j], "MPN");
                             //采集的供应商号不匹配的话
                             if (cell.Value.ToString() == Matchstr || Matchstr.Trim().Replace(" ", "").Contains(cell.Value.ToString()) || Matchstr.Contains(cell.Value.ToString()))
@@ -548,12 +580,21 @@ namespace UAS_LabelMachine
                             }
                             else
                             {
-                                ErrorType.Add("NG_MPN");
-                                CollectVeProdCodePass = false;
-                                BaseUtil.PlaySound("NG.wav");
-                                //添加需要重绘的Cell
-                                LabelInf.Refresh();
-                                MessageLog.AppendText(">>供应商物料编号不匹配\n", Color.Red);
+                                if (cell1.Value.ToString() == Matchstr || Matchstr.Trim().Replace(" ", "").Contains(cell1.Value.ToString()) || Matchstr.Contains(cell1.Value.ToString()))
+                                {
+                                    ErrorType.Add("OK_MPN");
+                                    BaseUtil.PlaySound("OK.wav");
+                                    LabelInf.Refresh();
+                                    CollectVeProdCodePass = true;
+                                }
+                                else {
+                                    ErrorType.Add("NG_MPN");
+                                    CollectVeProdCodePass = false;
+                                    BaseUtil.PlaySound("NG.wav");
+                                    //添加需要重绘的Cell
+                                    LabelInf.Refresh();
+                                    MessageLog.AppendText(">>供应商物料编号不匹配\n", Color.Red);
+                                }
                             }
                             setdata.Remove("MPN");
                             length--;
@@ -859,7 +900,7 @@ namespace UAS_LabelMachine
                 }
                 if (e.RowIndex == CurrentRowIndex)
                 {
-                    if (LabelInf.Columns[e.ColumnIndex].Name == "pr_orispeccode")
+                    if (LabelInf.Columns[e.ColumnIndex].Name == "pr_orispeccode"|| LabelInf.Columns[e.ColumnIndex].Name == "pd_orispeccode")
                     {
                         SolidBrush solidBrush = new SolidBrush(Color.FromArgb(51, 153, 255));
                         if (ErrorType.Count > 0)

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

@@ -153,6 +153,9 @@
   <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pd_orispeccode.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>

UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -503,6 +503,7 @@ namespace UAS_LabelMachine
                 if (BoxNum + CodeCount > OutboxCapacity.Value && AutoSetOutBox.Checked)
                 {
                     OutBoxNum.Text = "新增";
+                    BoxNum = 0;
                 }
                 if (OutBoxNum.Text == "新增")
                 {

UAS_MES_ODLF/FunctionCode/Make/Make_FeedingCollection.cs

@@ -216,7 +216,7 @@ namespace UAS_MES_NEW.Make
                             sql.Clear();
                             sql.Append("select ms_firstsn,cm_makecode,cm_craftcode,nvl(cm_status,0)cm_status,cm_id,cm_stepcode,");
                             sql.Append("ms_makecode,cm_mccode,cm_materialtype from craftmaterial left join makeserial on cm_makecode");
-                            sql.Append("=ms_makecode and cm_sncode=ms_sncode where cm_sncode='" + code.Text + "' and cm_makecode='" + oMakeCode + "'");
+                            sql.Append("=ms_makecode and cm_firstsn=ms_firstsn where cm_firstsn='" + code.Text + "' and cm_makecode='" + oMakeCode + "'");
                             sql.Append("and cm_materialtype=1");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)

UAS_MES_ODLF/FunctionCode/Make/Make_RePrintLabel.cs

@@ -175,7 +175,7 @@ namespace UAS_MES_NEW.Make
             else
                 type = "卡通箱标";
 
-            getlabel = "select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='" + type + "' and la_statuscode='AUDITED' order by la_isdefault";
+            getlabel = @"select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,'C:\打印标签\机身标.lab' la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='" + type + "' and la_statuscode='AUDITED' order by la_isdefault";
 
             listA = (DataTable)dh.ExecuteSql(getlabel, "select");
             if (listA.Rows.Count == 0)

UAS_MES_ODLF/PublicMethod/LogicHandler.cs

@@ -756,6 +756,12 @@ namespace UAS_MES_NEW.PublicMethod
             return result;
         }
 
+        public static bool SetStepResult1(string iMakeCode, string iSourceCode, string iSN, string iMPKind, string iResult, string iUserCode, out string oErrorMessage)
+        {
+            bool result = CS_SetResult(iMakeCode, iSourceCode, iSN, iUserCode, iResult, out oErrorMessage);
+            return result;
+        }
+
         public static bool CS_SetResult(string iMakeCode, string iSourceCode, string iSN, string iUserCode, string iResult, out string oErrorMessage)
         {
             oErrorMessage = "";

UAS_MES_ODLF/UAS_MES_ODLF.csproj

@@ -742,6 +742,12 @@
     <Compile Include="FunctionCode\Packing\Packing_PackageCollectionWeigh.Designer.cs">
       <DependentUpon>Packing_PackageCollectionWeigh.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Packing\Packing_PalletCollection1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Packing\Packing_PalletCollection1.Designer.cs">
+      <DependentUpon>Packing_PalletCollection1.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Packing\Packing_PalletCollection.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1411,6 +1417,9 @@
     <EmbeddedResource Include="FunctionCode\Packing\Packing_PackageCollectionWeigh.resx">
       <DependentUpon>Packing_PackageCollectionWeigh.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Packing\Packing_PalletCollection1.resx">
+      <DependentUpon>Packing_PalletCollection1.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Packing\Packing_PalletCollection.resx">
       <DependentUpon>Packing_PalletCollection.cs</DependentUpon>
     </EmbeddedResource>

UAS_MES_PW/FunctionCode/Make/Make_GetTestFileData.cs

@@ -77,141 +77,141 @@ namespace UAS_MES_NEW.Make
                 }
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
                 {
-                    if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
+                    //if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
+                    //{
+                    ma_code.Text = omakeCode;
+                    LoadCollectedNum();
+                    //发送对应平台的指令
+                    if (MTK.Checked)
                     {
-                        ma_code.Text = omakeCode;
-                        LoadCollectedNum();
-                        //发送对应平台的指令
-                        if (MTK.Checked)
-                        {
-                            BaseUtil.GetDataFromDevice("MTK");
-                        }
-                        else
-                        {
-                            BaseUtil.GetDataFromDevice("ZHANXUN");
-                        }
-                        string ms_prodcode = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsid + "'").ToString();
-                        DataTable dt = new DataTable();
-                        BaseUtil.GetDataFromDevice("GETFILE", WatchPath.Text + " ./" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text);
-                        string[] files = Directory.GetFiles(Application.StartupPath + "/" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text, "*.csv");
-                        BaseUtil.OpenCSVFile(ref dt, files[0]);
-                        //移除标题行
-                        dt.Rows.RemoveAt(0);
-                        //设置列名绑定数据
-                        dt.Columns[0].ColumnName = "std_class";
-                        dt.Columns[1].ColumnName = "std_testresult";
-                        dt.Columns[2].ColumnName = "std_sn";
-                        dt.Columns[3].ColumnName = "std_mac";
-                        dt.Columns[4].ColumnName = "std_bt";
-                        dt.Columns[5].ColumnName = "std_imei1";
-                        dt.Columns[6].ColumnName = "std_imei2";
-                        dt.Columns[7].ColumnName = "std_googlekey";
-                        dt.Columns[8].ColumnName = "std_videotest";
-                        dt.Columns[9].ColumnName = "std_version";
-                        dt.DefaultView.Sort = "std_testresult";
-                        CheckItemDGV.DataSource = dt;
-                        bool Result = true;
+                        BaseUtil.GetDataFromDevice("MTK");
+                    }
+                    else
+                    {
+                        BaseUtil.GetDataFromDevice("ZHANXUN");
+                    }
+                    string ms_prodcode = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsid + "'").ToString();
+                    DataTable dt = new DataTable();
+                    BaseUtil.GetDataFromDevice("GETFILE", WatchPath.Text + " ./" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text);
+                    string[] files = Directory.GetFiles(Application.StartupPath + "/" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text+"/factory", "*.csv");
+                    BaseUtil.OpenCSVFile(ref dt, files[0]);
+                    //移除标题行
+                    dt.Rows.RemoveAt(0);
+                    //设置列名绑定数据
+                    dt.Columns[0].ColumnName = "std_class";
+                    dt.Columns[1].ColumnName = "std_testresult";
+                    dt.Columns[2].ColumnName = "std_sn";
+                    dt.Columns[3].ColumnName = "std_mac";
+                    dt.Columns[4].ColumnName = "std_bt";
+                    dt.Columns[5].ColumnName = "std_imei1";
+                    dt.Columns[6].ColumnName = "std_imei2";
+                    dt.Columns[7].ColumnName = "std_googlekey";
+                    dt.Columns[8].ColumnName = "std_videotest";
+                    dt.Columns[9].ColumnName = "std_version";
+                    dt.DefaultView.Sort = "std_testresult";
+                    CheckItemDGV.DataSource = dt;
+                    bool Result = true;
 
-                        for (int i = 0; i < dt.Rows.Count; i++)
-                        {
-                            PSN.Text = dt.Rows[0]["std_sn"].ToString();
-                            MAC.Text = dt.Rows[0]["std_mac"].ToString().Replace(":", "").ToUpper();
-                            BT.Text = dt.Rows[0]["std_bt"].ToString().Replace(":", "").ToUpper();
-                            IMEI1.Text = dt.Rows[0]["std_imei1"].ToString().Replace("null", "").Replace("unknow", "");
-                            IMEI2.Text = dt.Rows[0]["std_imei2"].ToString().Replace("null", "").Replace("unknow", "");
-                            GoogleKey.Text = dt.Rows[0]["std_googlekey"].ToString().Replace("null", "").Replace("unknow", "").ToUpper();
-                            Aging.Text = dt.Rows[0]["std_videotest"].ToString().Replace("null", "").Replace("unknow", "").ToUpper();
-                            Version.Text = dt.Rows[0]["std_version"].ToString().Replace("null", "").Replace("unknow", "");
-                            if (dt.Rows[i]["std_testresult"].ToString() != "OK" || dt.Rows[i]["std_testresult"].ToString() == "NOTEST")
-                            {
-                                Result = false;
-                            }
-                            dh.ExecuteSql("insert into STEPTESTDETAIL(std_id,std_sn,std_indate,std_class,std_testtimes,std_testresult,std_badcode) values(STEPTESTDETAIL_seq.nextval,'" + sncode.Text + "',sysdate,'" + dt.Rows[i]["std_class"].ToString() + "','','" + dt.Rows[i]["std_testresult"].ToString() + "','')", "insert");
-                        }
-                        if (Aging.Text == "")
-                        {
-                            OperateResult.AppendText(">>" + sncode.Text + "设备未进行老化测试\n");
-                            return;
-                        }
-                        if (Result)
+                    for (int i = 0; i < dt.Rows.Count; i++)
+                    {
+                        PSN.Text = dt.Rows[0]["std_sn"].ToString();
+                        MAC.Text = dt.Rows[0]["std_mac"].ToString().Replace(":", "").ToUpper();
+                        BT.Text = dt.Rows[0]["std_bt"].ToString().Replace(":", "").ToUpper();
+                        IMEI1.Text = dt.Rows[0]["std_imei1"].ToString().Replace("null", "").Replace("unknow", "");
+                        IMEI2.Text = dt.Rows[0]["std_imei2"].ToString().Replace("null", "").Replace("unknow", "");
+                        GoogleKey.Text = dt.Rows[0]["std_googlekey"].ToString().Replace("null", "").Replace("unknow", "").ToUpper();
+                        Aging.Text = dt.Rows[0]["std_videotest"].ToString().Replace("null", "").Replace("unknow", "").ToUpper();
+                        Version.Text = dt.Rows[0]["std_version"].ToString().Replace("null", "").Replace("unknow", "");
+                        if (dt.Rows[i]["std_testresult"].ToString() != "OK" || dt.Rows[i]["std_testresult"].ToString() == "NOTEST")
                         {
-                            //提示正确返回时传递的信息
-                            if (oErrorMessage.Contains("AFTERSUCCESS"))
-                                OperateResult.AppendText(">>" + oErrorMessage + "\n");
-                            //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
-                            sql.Clear();
-                            sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
-                            sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
-                            sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "'  and mcd_stepcode='" + User.CurrentStepCode + "'");
-                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                            BaseUtil.SetFormValue(Controls, dt);
-                            //将SN,时间，结果记录在页面1
-                            //记录日志
-                            ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
-                            //SN核对成功
-                            //>> 请输入SN
-                            OperateResult.AppendText("<<" + sncode.Text + "信息核对成功,转换SN" + PSN.Text + "\n", Color.Green, sncode);
-                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                            SetCheck set = new SetCheck("OK", Color.Green);
-                            BaseUtil.SetFormCenter(set);
-                            set.ShowDialog();
-                            if (ReSet.Checked)
-                            {
-                                BaseUtil.GetDataFromDevice("RESET");
-                            }
-                            //if (LogicHandler.snChangeAndBurn(sncode.Text, PSN.Text, User.UserSourceCode, User.UserCode, omakeCode, 0, IMEI1.Text, IMEI2.Text, "", "", "", "", "", "", "", MAC.Text, BT.Text, "", "", "", out oErrorMessage))
-                            //{
-                              
-                            //}
-                            //else
-                            //{
-                            //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                            //}
-                            //if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, sncode.Text, "", "OK", User.UserCode, out oErrorMessage))
-                            //{
-                            //    //提示正确返回时传递的信息
-                            //    if (oErrorMessage.Contains("AFTERSUCCESS"))
-                            //        OperateResult.AppendText(">>" + oErrorMessage + "\n");
-                            //    //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
-                            //    sql.Clear();
-                            //    sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
-                            //    sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
-                            //    sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "'  and mcd_stepcode='" + User.CurrentStepCode + "'");
-                            //    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                            //    BaseUtil.SetFormValue(Controls, dt);
-                            //    //将SN,时间，结果记录在页面
-                            //    //记录日志
-                            //    //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
-                            //    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
-                            //    //SN核对成功
-                            //    //>> 请输入SN
-                            //    OperateResult.AppendText("<<" + sncode.Text + "信息核对成功\n", Color.Green, sncode);
-                            //    OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                            //    SetCheck set = new SetCheck("OK", Color.Green);
-                            //    BaseUtil.SetFormCenter(set);
-                            //    set.ShowDialog();
-                            //    if (ReSet.Checked)
-                            //    {
-                            //        BaseUtil.GetDataFromDevice("RESET");
-                            //    }
-                            //}
-                            //else
-                            //{
-                            //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                            //}
+                            Result = false;
                         }
-                        else
+                        dh.ExecuteSql("insert into STEPTESTDETAIL(std_id,std_sn,std_indate,std_class,std_testtimes,std_testresult,std_badcode) values(STEPTESTDETAIL_seq.nextval,'" + sncode.Text + "',sysdate,'" + dt.Rows[i]["std_class"].ToString() + "','','" + dt.Rows[i]["std_testresult"].ToString() + "','')", "insert");
+                    }
+                    //if (Aging.Text == "")
+                    //{
+                    //    OperateResult.AppendText(">>" + sncode.Text + "设备未进行老化测试\n");
+                    //    return;
+                    //}
+                    if (true)
+                    {
+                        //提示正确返回时传递的信息
+                        if (oErrorMessage.Contains("AFTERSUCCESS"))
+                            OperateResult.AppendText(">>" + oErrorMessage + "\n");
+                        //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
+                        sql.Clear();
+                        sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
+                        sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
+                        sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "'  and mcd_stepcode='" + User.CurrentStepCode + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        BaseUtil.SetFormValue(Controls, dt);
+                        //将SN,时间，结果记录在页面1
+                        //记录日志
+                        //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
+                        //SN核对成功
+                        //>> 请输入SN
+                        OperateResult.AppendText("<<" + sncode.Text + "信息核对成功,转换SN" + PSN.Text + "\n", Color.Green, sncode);
+                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        SetCheck set = new SetCheck("OK", Color.Green);
+                        BaseUtil.SetFormCenter(set);
+                        set.ShowDialog();
+                        if (ReSet.Checked)
                         {
-                            //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
-                            OperateResult.AppendText(">>序列号" + sncode.Text + "测试不通过\n", Color.Red, sncode);
+                            BaseUtil.GetDataFromDevice("RESET");
                         }
+                        //if (LogicHandler.snChangeAndBurn(sncode.Text, PSN.Text, User.UserSourceCode, User.UserCode, omakeCode, 0, IMEI1.Text, IMEI2.Text, "", "", "", "", "", "", "", MAC.Text, BT.Text, "", "", "", out oErrorMessage))
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                        //}
+                        //if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, sncode.Text, "", "OK", User.UserCode, out oErrorMessage))
+                        //{
+                        //    //提示正确返回时传递的信息
+                        //    if (oErrorMessage.Contains("AFTERSUCCESS"))
+                        //        OperateResult.AppendText(">>" + oErrorMessage + "\n");
+                        //    //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
+                        //    sql.Clear();
+                        //    sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
+                        //    sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
+                        //    sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "'  and mcd_stepcode='" + User.CurrentStepCode + "'");
+                        //    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        //    BaseUtil.SetFormValue(Controls, dt);
+                        //    //将SN,时间，结果记录在页面
+                        //    //记录日志
+                        //    //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
+                        //    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
+                        //    //SN核对成功
+                        //    //>> 请输入SN
+                        //    OperateResult.AppendText("<<" + sncode.Text + "信息核对成功\n", Color.Green, sncode);
+                        //    OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        //    SetCheck set = new SetCheck("OK", Color.Green);
+                        //    BaseUtil.SetFormCenter(set);
+                        //    set.ShowDialog();
+                        //    if (ReSet.Checked)
+                        //    {
+                        //        BaseUtil.GetDataFromDevice("RESET");
+                        //    }
+                        //}
+                        //else
+                        //{
+                        //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                        //}
                     }
                     else
                     {
-                        OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                        //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
+                        OperateResult.AppendText(">>序列号" + sncode.Text + "测试不通过\n", Color.Red, sncode);
                     }
                 }
+                //else
+                //{
+                //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                //}
+                //}
                 else
                 {
                     OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);

UAS_MES_PW/FunctionCode/Special/Special_AfterSaleIn.Designer.cs

@@ -33,6 +33,10 @@
             this.pr_code_label = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.Info = new System.Windows.Forms.DataGridView();
+            this.afr_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.afr_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.afr_cucode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.afr_inqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cu_name = new System.Windows.Forms.Label();
             this.pr_spec = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
@@ -51,10 +55,6 @@
             this.Confirm = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.inqty = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.label3 = new System.Windows.Forms.Label();
-            this.afr_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.afr_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.afr_cucode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.afr_inqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.Info)).BeginInit();
             this.SuspendLayout();
             // 
@@ -106,6 +106,30 @@
             this.Info.Size = new System.Drawing.Size(1072, 569);
             this.Info.TabIndex = 218;
             // 
+            // afr_barcode
+            // 
+            this.afr_barcode.DataPropertyName = "afr_barcode";
+            this.afr_barcode.HeaderText = "条码号";
+            this.afr_barcode.Name = "afr_barcode";
+            // 
+            // afr_prodcode
+            // 
+            this.afr_prodcode.DataPropertyName = "afr_prodcode";
+            this.afr_prodcode.HeaderText = "物料编号";
+            this.afr_prodcode.Name = "afr_prodcode";
+            // 
+            // afr_cucode
+            // 
+            this.afr_cucode.DataPropertyName = "afr_cucode";
+            this.afr_cucode.HeaderText = "客户名称";
+            this.afr_cucode.Name = "afr_cucode";
+            // 
+            // afr_inqty
+            // 
+            this.afr_inqty.DataPropertyName = "afr_inqty";
+            this.afr_inqty.HeaderText = "入库数量";
+            this.afr_inqty.Name = "afr_inqty";
+            // 
             // cu_name
             // 
             this.cu_name.AutoSize = true;
@@ -313,6 +337,7 @@
             this.inqty.Str1 = null;
             this.inqty.Str2 = null;
             this.inqty.TabIndex = 226;
+            this.inqty.Visible = false;
             // 
             // label3
             // 
@@ -324,30 +349,7 @@
             this.label3.Size = new System.Drawing.Size(146, 41);
             this.label3.TabIndex = 227;
             this.label3.Text = "入库数量";
-            // 
-            // afr_barcode
-            // 
-            this.afr_barcode.DataPropertyName = "afr_barcode";
-            this.afr_barcode.HeaderText = "条码号";
-            this.afr_barcode.Name = "afr_barcode";
-            // 
-            // afr_prodcode
-            // 
-            this.afr_prodcode.DataPropertyName = "afr_prodcode";
-            this.afr_prodcode.HeaderText = "物料编号";
-            this.afr_prodcode.Name = "afr_prodcode";
-            // 
-            // afr_cucode
-            // 
-            this.afr_cucode.DataPropertyName = "afr_cucode";
-            this.afr_cucode.HeaderText = "客户名称";
-            this.afr_cucode.Name = "afr_cucode";
-            // 
-            // afr_inqty
-            // 
-            this.afr_inqty.DataPropertyName = "afr_inqty";
-            this.afr_inqty.HeaderText = "入库数量";
-            this.afr_inqty.Name = "afr_inqty";
+            this.label3.Visible = false;
             // 
             // Special_AfterSaleIn
             // 

UAS_MES_PW/FunctionCode/Special/Special_AfterSaleIn.cs

@@ -41,12 +41,6 @@ namespace UAS_MES_NEW.Special
 
         private void Confirm_Click(object sender, EventArgs e)
         {
-            int in_qty = 0;
-            if (!int.TryParse(inqty.Text, out in_qty))
-            {
-                OperateResult.AppendText(">>入库数错误\n", Color.Red, barcode);
-                return;
-            }
             //正常录入资料的时候
             if (!Cancel.Checked)
             {
@@ -66,10 +60,9 @@ namespace UAS_MES_NEW.Special
                     return;
                 }
                 sql.Clear();
-                sql.Append("insert into aftersalerecord(afr_id,afr_barcode,afr_prodcode,afr_cucode,afr_indate,afr_inqty)");
-                sql.Append("values(aftersalerecord_seq.nextval,'" + barcode.Text + "','" + pr_code.Text + "','" + cu_code.Text + "',sysdate," + inqty.Text + ")");
+                sql.Append("insert into aftersalerecord(afr_id,afr_barcode,afr_prodcode,afr_cucode,afr_indate)");
+                sql.Append("values(aftersalerecord_seq.nextval,'" + barcode.Text + "','" + pr_code.Text + "','" + cu_code.Text + "',sysdate)");
                 dh.ExecuteSql(sql.GetString(), "insert");
-                dh.ExecuteSql("insert into aftersalerecordlog(afl_id,afl_barcode,afl_prodcode,afl_qty,afl_type) select aftersalerecordlog_seq.nextval,afr_barcode,afr_prodcode," + inqty.Text + ",'入库' from aftersalerecord where afr_barcode='" + barcode.Text + "'", "insert");
                 OperateResult.AppendText(">>条码" + barcode.Text + "录入成功\n", Color.Green, barcode);
                 LoadGridData();
             }
@@ -80,7 +73,7 @@ namespace UAS_MES_NEW.Special
                     OperateResult.AppendText(">>条码" + barcode.Text + "不存在\n", Color.Red, barcode);
                     return;
                 }
-                if (dh.CheckExist("aftersalerecord", "afr_barcode='" + barcode.Text + "' and nvl(afr_outqty,0) =0"))
+                if (dh.CheckExist("aftersalerecord", "afr_barcode='" + barcode.Text + "' and afr_outdate is not null"))
                 {
                     OperateResult.AppendText(">>条码" + barcode.Text + "已出库\n", Color.Red, barcode);
                     return;
@@ -88,7 +81,6 @@ namespace UAS_MES_NEW.Special
                 sql.Clear();
                 sql.Append("delete from aftersalerecord where afr_barcode='" + barcode.Text + "'");
                 dh.ExecuteSql(sql.GetString(), "delete");
-                dh.ExecuteSql("insert into aftersalerecordlog(afl_id,afl_barcode,afl_prodcode,afl_qty,afl_type) select aftersalerecordlog_seq.nextval,afr_barcode,afr_prodcode," + inqty.Text + ",'取消入库' from aftersalerecord where afr_barcode='" + barcode.Text + "'", "insert");
                 OperateResult.AppendText(">>条码" + barcode.Text + "取消成功\n", Color.Green, barcode);
                 LoadGridData();
             }

UAS_MES_PW/FunctionCode/Special/Special_AfterSaleOut.Designer.cs

@@ -294,6 +294,7 @@
             this.label3.Size = new System.Drawing.Size(146, 41);
             this.label3.TabIndex = 229;
             this.label3.Text = "出库数量";
+            this.label3.Visible = false;
             // 
             // outqty
             // 
@@ -309,6 +310,7 @@
             this.outqty.Str1 = null;
             this.outqty.Str2 = null;
             this.outqty.TabIndex = 228;
+            this.outqty.Visible = false;
             // 
             // Special_AfterSaleOut
             // 

UAS_MES_PW/FunctionCode/Special/Special_AfterSaleOut.cs

@@ -36,12 +36,6 @@ namespace UAS_MES_NEW.Special
 
         private void Confirm_Click(object sender, EventArgs e)
         {
-            int out_qty = 0;
-            if (!int.TryParse(outqty.Text, out out_qty))
-            {
-                OperateResult.AppendText(">>出库数错误\n", Color.Red, barcode);
-                return;
-            }
             //正常录入资料的时候
             if (!Cancel.Checked)
             {
@@ -50,12 +44,12 @@ namespace UAS_MES_NEW.Special
                     OperateResult.AppendText(">>客户编号不能为空\n", Color.Red, barcode);
                     return;
                 }
-                if (!dh.CheckExist("aftersalerecord", "afr_barcode='" + barcode.Text + "' and  nvl(afr_outqty,0)+" + outqty.Text + "<=afr_inqty"))
+                if (!dh.CheckExist("aftersalerecord", "afr_barcode='" + barcode.Text + "'"))
                 {
-                    OperateResult.AppendText(">>条码" + barcode.Text + "不存在或出库数量不足\n", Color.Red, barcode);
+                    OperateResult.AppendText(">>条码" + barcode.Text + "不存在\n", Color.Red, barcode);
                     return;
                 }
-                if (dh.CheckExist("aftersalerecord", "afr_barcode='" + barcode.Text + "' and afr_outqty>=afr_inqty"))
+                if (!dh.CheckExist("aftersalerecord", "afr_barcode='" + barcode.Text + "' and afr_outdate is null"))
                 {
                     OperateResult.AppendText(">>条码" + barcode.Text + "已出库\n", Color.Red, barcode);
                     return;
@@ -66,9 +60,8 @@ namespace UAS_MES_NEW.Special
                     return;
                 }
                 sql.Clear();
-                sql.Append("update aftersalerecord set afr_outdate=sysdate,afr_outcucode='" + cu_code.Text + "',afr_outqty=nvl(afr_outqty,0)+" + outqty.Text + " where afr_barcode='" + barcode.Text + "'");
+                sql.Append("update aftersalerecord set afr_outdate=sysdate,afr_outcucode='" + cu_code.Text + "' where afr_barcode='" + barcode.Text + "'");
                 dh.ExecuteSql(sql.GetString(), "update");
-                dh.ExecuteSql("insert into aftersalerecordlog(afl_id,afl_barcode,afl_prodcode,afl_qty,afl_type) select aftersalerecordlog_seq.nextval,afr_barcode,afr_prodcode," + outqty.Text + ",'出库' from aftersalerecord where afr_barcode='" + barcode.Text + "'", "insert");
                 OperateResult.AppendText(">>条码" + barcode.Text + "出库成功\n", Color.Green, barcode);
                 LoadGridData();
             }
@@ -79,14 +72,13 @@ namespace UAS_MES_NEW.Special
                     OperateResult.AppendText(">>条码" + barcode.Text + "不存在\n", Color.Red, barcode);
                     return;
                 }
-                if (dh.CheckExist("aftersalerecord", "afr_barcode='" + barcode.Text + "' and   nvl(afr_outqty,0)-" + outqty.Text + "<0"))
+                if (dh.CheckExist("aftersalerecord", "afr_barcode='" + barcode.Text + "' and afr_outdate is null"))
                 {
-                    OperateResult.AppendText(">>条码" + barcode.Text + "取消出库数量不足\n", Color.Red, barcode);
+                    OperateResult.AppendText(">>条码" + barcode.Text + "未出库\n", Color.Red, barcode);
                     return;
                 }
                 sql.Clear();
-                sql.Append("update aftersalerecord set afr_outdate=null,afr_outcucode=null,afr_outqty=nvl(afr_outqty,0)-" + outqty.Text + " where afr_barcode='" + barcode.Text + "'");
-                dh.ExecuteSql("insert into aftersalerecordlog(afl_id,afl_barcode,afl_prodcode,afl_qty,afl_type) select aftersalerecordlog_seq.nextval,afr_barcode,afr_prodcode," + outqty.Text + ",'取消出库' from aftersalerecord where afr_barcode='" + barcode.Text + "'", "insert");
+                sql.Append("update aftersalerecord set afr_outdate=null,afr_outcucode=null where afr_barcode='" + barcode.Text + "'");
                 dh.ExecuteSql(sql.GetString(), "update");
                 OperateResult.AppendText(">>条码" + barcode.Text + "取消出库成功\n", Color.Green, barcode);
                 LoadGridData();

UAS_MES_PW/FunctionCode/Special/Special_AfterSaleOut.resx

@@ -129,18 +129,6 @@
   <metadata name="afr_cucode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="afr_barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="afr_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pr_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="afr_cucode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Clean.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

UAS_MES_PW/PublicMethod/BaseUtil.cs

@@ -1473,7 +1473,7 @@ namespace UAS_MES_NEW.PublicMethod
                     p.Close();
                     break;
                 case "RESET":
-                    p.StartInfo.Arguments = " reboot recovery";
+                    p.StartInfo.Arguments = " shell am start -n com.android.settings/com.android.settings.FactoryTestActivity";
                     p.Start();
                     value = p.StandardOutput.ReadToEnd().Replace(":", "").ToUpper();
                     p.Close();

UAS_MES_YD/FunctionCode/Make/Make_TestCollection_DCW.Designer.cs

@@ -750,7 +750,7 @@
             this.BaudRate.Str1 = null;
             this.BaudRate.Str2 = null;
             this.BaudRate.TabIndex = 198;
-            this.BaudRate.Text = "9600";
+            this.BaudRate.Text = "115200";
             // 
             // SerialPortComBox_label
             // 

UAS_MES_YD/FunctionCode/Make/Make_TestCollection_DCW.cs

@@ -753,7 +753,22 @@ namespace UAS_MES_NEW.Make
                         {
                             try
                             {
-                                ms_sncode.Text = serialPort1.ReadLine().Trim();
+                                string resulttext = serialPort1.ReadLine().Trim();
+                                //需要拆分字符串
+                                if (resulttext.IndexOf(";") > 0)
+                                {
+                                    string[] sncode = resulttext.Split(';');
+                                    for (int i = 0; i < sncode.Length; i++)
+                                    {
+                                        ms_sncode.Text = sncode[i];
+                                        ms_code_KeyDown(ms_sncode, new KeyEventArgs(Keys.Enter));
+                                    }
+                                }
+                                else
+                                {
+                                    ms_sncode.Text = resulttext;
+                                    ms_code_KeyDown(ms_sncode, new KeyEventArgs(Keys.Enter));
+                                }
                             }
                             catch (Exception)
                             {

UAS_MES_YD/FunctionCode/Query/Query_OnlineTraceBack.cs

@@ -39,17 +39,17 @@ namespace UAS_MES_NEW.Query
             DataRow dr = ComBoxData.NewRow();
             dr[0] = "全部"; dr[1] = "ALL"; ComBoxData.Rows.Add(dr);
             dr = ComBoxData.NewRow();
-            dr[0] = "未生产"; dr[1] = "未生产"; ComBoxData.Rows.Add(dr);
+            dr[0] = "未生产"; dr[1] = "null"; ComBoxData.Rows.Add(dr);
             dr = ComBoxData.NewRow();
-            dr[0] = "已归属"; dr[1] = "已归属"; ComBoxData.Rows.Add(dr);
+            dr[0] = "已归属"; dr[1] = "0"; ComBoxData.Rows.Add(dr);
             dr = ComBoxData.NewRow();
-            dr[0] = "在线"; dr[1] = "在线"; ComBoxData.Rows.Add(dr);
+            dr[0] = "在线"; dr[1] = "1"; ComBoxData.Rows.Add(dr);
             dr = ComBoxData.NewRow();
-            dr[0] = "已完工"; dr[1] = "已完工"; ComBoxData.Rows.Add(dr);
+            dr[0] = "已完工"; dr[1] = "2"; ComBoxData.Rows.Add(dr);
             dr = ComBoxData.NewRow();
-            dr[0] = "不良待维修"; dr[1] = "不良待维修"; ComBoxData.Rows.Add(dr);
+            dr[0] = "不良待维修"; dr[1] = "3"; ComBoxData.Rows.Add(dr);
             dr = ComBoxData.NewRow();
-            dr[0] = "已报废"; dr[1] = "已报废"; ComBoxData.Rows.Add(dr);
+            dr[0] = "已报废"; dr[1] = "4"; ComBoxData.Rows.Add(dr);
             ms_status.DataSource = ComBoxData;
             ms_status.DisplayMember = "status";
             ms_status.ValueMember = "statuscode";

UAS_MES_YD/FunctionCode/Query/Query_SOP.Designer.cs

@@ -47,7 +47,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(285, 344);
+            this.label1.Location = new System.Drawing.Point(285, 421);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(101, 37);
             this.label1.TabIndex = 1;
@@ -57,7 +57,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(313, 417);
+            this.label2.Location = new System.Drawing.Point(313, 346);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(73, 37);
             this.label2.TabIndex = 2;
@@ -134,7 +134,7 @@
             // 
             this.pa_outboxcode.AllPower = null;
             this.pa_outboxcode.ID = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(416, 419);
+            this.pa_outboxcode.Location = new System.Drawing.Point(416, 348);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Power = null;
             this.pa_outboxcode.Size = new System.Drawing.Size(283, 35);
@@ -147,7 +147,7 @@
             // 
             this.ma_code.AllPower = null;
             this.ma_code.ID = null;
-            this.ma_code.Location = new System.Drawing.Point(416, 346);
+            this.ma_code.Location = new System.Drawing.Point(416, 423);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.Size = new System.Drawing.Size(283, 35);

UAS_MES_YD/FunctionCode/Query/Query_SOP.cs

@@ -42,7 +42,7 @@ namespace UAS_MES_NEW.Query
             {
                 engine = new Engine(true);
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 MessageBox.Show("未正确安装Bartender软件");
             }
@@ -62,7 +62,11 @@ namespace UAS_MES_NEW.Query
 
         private void Print_Click(object sender, EventArgs e)
         {
-
+            string makecode = dh.getFieldDataByCondition("package_view", "pa_makecode", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString();
+            if (makecode != "")
+            {
+                ma_code.Text = makecode;
+            }
             DataTable dt = (DataTable)dh.ExecuteSql("select * from package_view where pa_makecode='" + ma_code.Text + "'", "select");
             string ErrorMessage = "";
             string outboxcode = "";
@@ -86,6 +90,7 @@ namespace UAS_MES_NEW.Query
                 if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrintList.Text, outboxcode, 1, "", "", "卡通箱标", "0", out ErrorMessage))
                 {
                     OperateResult.AppendText(">>开始打印箱号" + outboxcode + "\n", Color.Black);
+                    LogicHandler.DoCommandLog("LabelPrint", User.UserCode, makecode, User.UserLineCode, User.UserSourceCode, "包装标签打印", "打印成功", outboxcode, "");
                 }
             }
         }

UAS_MES_YD/FunctionCode/Special/Special_CancelImei.Designer.cs

@@ -0,0 +1,168 @@
+namespace UAS_MES_NEW.Special
+{
+    partial class Special_CancelImei
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Special_CancelImei));
+            this.Pallet_label = new System.Windows.Forms.Label();
+            this.bc_code = new System.Windows.Forms.Label();
+            this.nr_name_label = new System.Windows.Forms.Label();
+            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.SaveRepairInf = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.IMEI = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.Reason = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.SuspendLayout();
+            // 
+            // Pallet_label
+            // 
+            this.Pallet_label.AutoSize = true;
+            this.Pallet_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Pallet_label.Location = new System.Drawing.Point(253, 266);
+            this.Pallet_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Pallet_label.Name = "Pallet_label";
+            this.Pallet_label.Size = new System.Drawing.Size(85, 41);
+            this.Pallet_label.TabIndex = 1;
+            this.Pallet_label.Text = "IMEI";
+            // 
+            // bc_code
+            // 
+            this.bc_code.AutoSize = true;
+            this.bc_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.bc_code.ForeColor = System.Drawing.Color.Black;
+            this.bc_code.Location = new System.Drawing.Point(1391, 507);
+            this.bc_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.bc_code.Name = "bc_code";
+            this.bc_code.Size = new System.Drawing.Size(0, 41);
+            this.bc_code.TabIndex = 146;
+            this.bc_code.Visible = false;
+            // 
+            // nr_name_label
+            // 
+            this.nr_name_label.AutoSize = true;
+            this.nr_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.nr_name_label.ForeColor = System.Drawing.Color.Black;
+            this.nr_name_label.Location = new System.Drawing.Point(255, 347);
+            this.nr_name_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.nr_name_label.Name = "nr_name_label";
+            this.nr_name_label.Size = new System.Drawing.Size(82, 41);
+            this.nr_name_label.TabIndex = 141;
+            this.nr_name_label.Text = "原因";
+            // 
+            // OperateResult
+            // 
+            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperateResult.Location = new System.Drawing.Point(791, 109);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(8);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(460, 614);
+            this.OperateResult.TabIndex = 150;
+            this.OperateResult.Text = "";
+            // 
+            // SaveRepairInf
+            // 
+            this.SaveRepairInf.AllPower = "ifall";
+            this.SaveRepairInf.BackColor = System.Drawing.Color.Transparent;
+            this.SaveRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.DownImage")));
+            this.SaveRepairInf.Image = null;
+            this.SaveRepairInf.IsShowBorder = true;
+            this.SaveRepairInf.Location = new System.Drawing.Point(443, 500);
+            this.SaveRepairInf.Margin = new System.Windows.Forms.Padding(6);
+            this.SaveRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.MoveImage")));
+            this.SaveRepairInf.Name = "SaveRepairInf";
+            this.SaveRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.NormalImage")));
+            this.SaveRepairInf.Power = null;
+            this.SaveRepairInf.Size = new System.Drawing.Size(172, 48);
+            this.SaveRepairInf.TabIndex = 145;
+            this.SaveRepairInf.Tag = "IfRead";
+            this.SaveRepairInf.Text = "确认取消";
+            this.SaveRepairInf.UseVisualStyleBackColor = true;
+            this.SaveRepairInf.Click += new System.EventHandler(this.SaveRepairInf_Click);
+            // 
+            // IMEI
+            // 
+            this.IMEI.AllPower = null;
+            this.IMEI.BackColor = System.Drawing.Color.White;
+            this.IMEI.ID = null;
+            this.IMEI.Location = new System.Drawing.Point(375, 272);
+            this.IMEI.Margin = new System.Windows.Forms.Padding(4);
+            this.IMEI.Name = "IMEI";
+            this.IMEI.Power = null;
+            this.IMEI.Size = new System.Drawing.Size(318, 35);
+            this.IMEI.Str = null;
+            this.IMEI.Str1 = null;
+            this.IMEI.Str2 = null;
+            this.IMEI.TabIndex = 2;
+            // 
+            // Reason
+            // 
+            this.Reason.AllPower = null;
+            this.Reason.BackColor = System.Drawing.Color.White;
+            this.Reason.ID = null;
+            this.Reason.Location = new System.Drawing.Point(375, 356);
+            this.Reason.Margin = new System.Windows.Forms.Padding(4);
+            this.Reason.Name = "Reason";
+            this.Reason.Power = null;
+            this.Reason.Size = new System.Drawing.Size(318, 35);
+            this.Reason.Str = null;
+            this.Reason.Str1 = null;
+            this.Reason.Str2 = null;
+            this.Reason.TabIndex = 151;
+            // 
+            // Special_CancelImei
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1384, 1054);
+            this.Controls.Add(this.Reason);
+            this.Controls.Add(this.OperateResult);
+            this.Controls.Add(this.bc_code);
+            this.Controls.Add(this.SaveRepairInf);
+            this.Controls.Add(this.nr_name_label);
+            this.Controls.Add(this.IMEI);
+            this.Controls.Add(this.Pallet_label);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Special_CancelImei";
+            this.Tag = "Special!BoxSplit";
+            this.Text = "拆箱处理";
+            this.Load += new System.EventHandler(this.Special_BoxSplit_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private System.Windows.Forms.Label Pallet_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox IMEI;
+        private System.Windows.Forms.Label bc_code;
+        private CustomControl.ButtonUtil.NormalButton SaveRepairInf;
+        private System.Windows.Forms.Label nr_name_label;
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
+        private CustomControl.TextBoxWithIcon.EnterTextBox Reason;
+    }
+}

UAS_MES_YD/FunctionCode/Special/Special_CancelImei.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Data;
+using System.Windows.Forms;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Special
+{
+    public partial class Special_CancelImei : Form
+    {
+        DataHelper dh;
+
+        LogStringBuilder sql = new LogStringBuilder();
+
+        public Special_CancelImei()
+        {
+            InitializeComponent();
+        }
+
+        private void Special_BoxSplit_Load(object sender, EventArgs e)
+        {
+            dh = SystemInf.dh;
+        }
+
+        private void Split_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void SaveRepairInf_Click(object sender, EventArgs e)
+        {
+            if (Reason.Text == "")
+            {
+                MessageBox.Show("必须填写原因");
+                return;
+            }
+            DataTable dt = (DataTable)dh.ExecuteSql("select si_sn,si_imei1 from sninfo where si_imei1 ='" + IMEI.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                dt = (DataTable)dh.ExecuteSql("select ms_sncode,substr(pr_detail,0,15)pr_detail from makeserial left join product on pr_code=ms_prodcode where ms_imei1='" + IMEI.Text + "'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    string sn = dt.Rows[0]["ms_sncode"].ToString();
+                    string pr_detail = dt.Rows[0]["pr_detail"].ToString();
+                    dh.ExecuteSql("update makeserial set ms_imei1='" + Reason.Text + "' where ms_imei1='" + IMEI.Text + "'", "update");
+                    dh.ExecuteSql("update sninfo set ms_imei1='' where sn_imei1='" + IMEI.Text + "'", "update");
+                    LogicHandler.DoCommandLog("CancelImei", User.UserCode, "", User.UserLineCode, User.UserSourceCode, Reason.Text, "取消成功", IMEI.Text, "");
+                    OperateResult.AppendText("SN:" + sn + ",IMEI:" + IMEI.Text + ",机型:" + pr_detail + "取消成功\n", System.Drawing.Color.Black);
+                }
+            }
+            else
+            {
+                dt = (DataTable)dh.ExecuteSql("select si_sn,si_imei2 from sninfo where si_imei2 ='" + IMEI.Text + "'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    dt = (DataTable)dh.ExecuteSql("select ms_sncode,substr(pr_detail,0,15)pr_detail from makeserial left join product on pr_code=ms_prodcode where ms_imei2='" + IMEI.Text + "'", "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        string sn = dt.Rows[0]["ms_sncode"].ToString();
+                        string pr_detail = dt.Rows[0]["pr_detail"].ToString();
+                        dh.ExecuteSql("update makeserial set ms_imei2=='" + Reason.Text + "' where ms_imei2='" + IMEI.Text + "'", "update");
+                        dh.ExecuteSql("update sninfo set si_imei2='' where sn_imei2='" + IMEI.Text + "'", "update");
+                        LogicHandler.DoCommandLog("CancelImei", User.UserCode, "", User.UserLineCode, User.UserSourceCode, Reason.Text, "取消成功", IMEI.Text, "");
+                        LogicHandler.DoCommandLog("CancelImei", User.UserCode, "", User.UserLineCode, User.UserSourceCode, Reason.Text, "取消成功", IMEI.Text, "");
+                        OperateResult.AppendText("SN:" + sn + ",IMEI:" + IMEI.Text + ",机型:" + pr_detail + "取消成功\n", System.Drawing.Color.Black);
+                    }
+                }
+                else
+                {
+                    OperateResult.AppendText(IMEI.Text + "未录入系统\n", System.Drawing.Color.Black);
+                }
+            }
+        }
+    }
+}

UAS_MES_YD/FunctionCode/Special/Special_CancelImei.resx

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="SaveRepairInf.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="SaveRepairInf.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="SaveRepairInf.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+</root>

UAS_MES_YD/PublicMethod/BaseUtil.cs

@@ -163,8 +163,10 @@ namespace UAS_MES_NEW.PublicMethod
                     if (!isSecurityUpdate && displayName != null && uninstallString != null)
                     {
                         softNum++;
-                        if (displayName.ToString().Contains("BarTender"))
+                        if (displayName.ToString() == "BarTender 10.1")
+                        {
                             return true;
+                        }
                     }
                 }
             }

UAS_MES_YD/PublicMethod/Print.cs

@@ -222,7 +222,7 @@ namespace UAS_MES_NEW.PublicMethod
             //    }
             //    else
             //    {
-            //        dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_makecode='" + MakeCode + "' and lpl_type='" + LabelType + "' and lpl_stepcode='" + User.CurrentStepCode + "'", "select");
+            //        dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpZZZZZl_makecode='" + MakeCode + "' and lpl_type='" + LabelType + "' and lpl_stepcode='" + User.CurrentStepCode + "'", "select");
             //    }
             //    ////如果已经打印过了,则不允许再打印
             //    if (dt.Rows.Count > 0)

UAS_MES_YD/UAS_MES_YD.csproj

@@ -608,6 +608,12 @@
     <Compile Include="FunctionCode\Make\Make_SmtTestCollection.Designer.cs">
       <DependentUpon>Make_SmtTestCollection.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_TestCollection_DCW.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_TestCollection_DCW.Designer.cs">
+      <DependentUpon>Make_TestCollection_DCW.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Packing\Packing_BigBoxCollection.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -974,6 +980,12 @@
     <Compile Include="FunctionCode\SMT\SMT_WaringSetting.Designer.cs">
       <DependentUpon>SMT_WaringSetting.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Special\Special_CancelImei.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Special\Special_CancelImei.Designer.cs">
+      <DependentUpon>Special_CancelImei.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Special\Special_MakeBad.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1376,6 +1388,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_SmtTestCollection.resx">
       <DependentUpon>Make_SmtTestCollection.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_TestCollection_DCW.resx">
+      <DependentUpon>Make_TestCollection_DCW.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Packing\Packing_BigBoxCollection.resx">
       <DependentUpon>Packing_BigBoxCollection.cs</DependentUpon>
     </EmbeddedResource>
@@ -1559,6 +1574,9 @@
     <EmbeddedResource Include="FunctionCode\SMT\SMT_WaringSetting.resx">
       <DependentUpon>SMT_WaringSetting.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Special\Special_CancelImei.resx">
+      <DependentUpon>Special_CancelImei.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Special\Special_MakeBad.resx">
       <DependentUpon>Special_MakeBad.cs</DependentUpon>
     </EmbeddedResource>