Window信息核对

UAS_MES_PW/FunctionCode/Make/Make_CollectElec.Designer.cs

@@ -28,19 +28,34 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_CollectElec));
             this.pr_detail_label = new System.Windows.Forms.Label();
             this.sncode_label = new System.Windows.Forms.Label();
-            this.mcd_remainqty_label = new System.Windows.Forms.Label();
-            this.mcd_okqty_label = new System.Windows.Forms.Label();
             this.pr_code_label = new System.Windows.Forms.Label();
             this.ms_makecode_label = new System.Windows.Forms.Label();
+            this.CheckTSN = new System.Windows.Forms.CheckBox();
+            this.CheckMac = new System.Windows.Forms.CheckBox();
+            this.CheckKey = new System.Windows.Forms.CheckBox();
+            this.CheckPKID = new System.Windows.Forms.CheckBox();
+            this.CheckPSN = new System.Windows.Forms.CheckBox();
+            this.CheckImei = new System.Windows.Forms.CheckBox();
+            this.TSN = new System.Windows.Forms.TextBox();
+            this.TSN_CHECK = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.PSN_CHECK = new System.Windows.Forms.TextBox();
+            this.PSN = new System.Windows.Forms.TextBox();
+            this.PKID_CHECK = new System.Windows.Forms.TextBox();
+            this.PKID = new System.Windows.Forms.TextBox();
+            this.KEY_CHECK = new System.Windows.Forms.TextBox();
+            this.KEY = new System.Windows.Forms.TextBox();
+            this.MAC_CHECK = new System.Windows.Forms.TextBox();
+            this.MAC = new System.Windows.Forms.TextBox();
+            this.IMEI_CHECK = new System.Windows.Forms.TextBox();
+            this.IMEI = new System.Windows.Forms.TextBox();
             this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.Delete = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.ms_makecode = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
-            this.pr_electricmax = new UAS_MES_NEW.CustomControl.ValueLabel.ValueNumLabel(this.components);
-            this.pr_electricmin = new UAS_MES_NEW.CustomControl.ValueLabel.ValueNumLabel(this.components);
             this.ms_prodcode = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
@@ -51,9 +66,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(452, 22);
+            this.pr_detail_label.Location = new System.Drawing.Point(904, 44);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
             this.pr_detail_label.TabIndex = 191;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -63,39 +79,21 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(14, 422);
+            this.sncode_label.Location = new System.Drawing.Point(28, 844);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(58, 21);
+            this.sncode_label.Size = new System.Drawing.Size(114, 41);
             this.sncode_label.TabIndex = 190;
             this.sncode_label.Text = "录入框";
             // 
-            // mcd_remainqty_label
-            // 
-            this.mcd_remainqty_label.AutoSize = true;
-            this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(236, 70);
-            this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(90, 21);
-            this.mcd_remainqty_label.TabIndex = 187;
-            this.mcd_remainqty_label.Text = "电量最大值";
-            // 
-            // mcd_okqty_label
-            // 
-            this.mcd_okqty_label.AutoSize = true;
-            this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(6, 70);
-            this.mcd_okqty_label.Name = "mcd_okqty_label";
-            this.mcd_okqty_label.Size = new System.Drawing.Size(90, 21);
-            this.mcd_okqty_label.TabIndex = 186;
-            this.mcd_okqty_label.Text = "电量最小值";
-            // 
             // pr_code_label
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(236, 22);
+            this.pr_code_label.Location = new System.Drawing.Point(472, 44);
+            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(74, 21);
+            this.pr_code_label.Size = new System.Drawing.Size(146, 41);
             this.pr_code_label.TabIndex = 185;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -103,19 +101,192 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(6, 22);
+            this.ms_makecode_label.Location = new System.Drawing.Point(12, 44);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(146, 41);
             this.ms_makecode_label.TabIndex = 184;
             this.ms_makecode_label.Text = "工单编号";
             // 
+            // CheckTSN
+            // 
+            this.CheckTSN.AutoSize = true;
+            this.CheckTSN.Location = new System.Drawing.Point(19, 267);
+            this.CheckTSN.Name = "CheckTSN";
+            this.CheckTSN.Size = new System.Drawing.Size(150, 28);
+            this.CheckTSN.TabIndex = 201;
+            this.CheckTSN.Text = "MES流程码";
+            this.CheckTSN.UseVisualStyleBackColor = true;
+            // 
+            // CheckMac
+            // 
+            this.CheckMac.AutoSize = true;
+            this.CheckMac.Location = new System.Drawing.Point(19, 638);
+            this.CheckMac.Name = "CheckMac";
+            this.CheckMac.Size = new System.Drawing.Size(126, 28);
+            this.CheckMac.TabIndex = 202;
+            this.CheckMac.Text = "MAC地址";
+            this.CheckMac.UseVisualStyleBackColor = true;
+            // 
+            // CheckKey
+            // 
+            this.CheckKey.AutoSize = true;
+            this.CheckKey.Location = new System.Drawing.Point(19, 545);
+            this.CheckKey.Name = "CheckKey";
+            this.CheckKey.Size = new System.Drawing.Size(102, 28);
+            this.CheckKey.TabIndex = 203;
+            this.CheckKey.Text = "KEY码";
+            this.CheckKey.UseVisualStyleBackColor = true;
+            // 
+            // CheckPKID
+            // 
+            this.CheckPKID.AutoSize = true;
+            this.CheckPKID.Location = new System.Drawing.Point(19, 456);
+            this.CheckPKID.Name = "CheckPKID";
+            this.CheckPKID.Size = new System.Drawing.Size(90, 28);
+            this.CheckPKID.TabIndex = 204;
+            this.CheckPKID.Text = "PKID";
+            this.CheckPKID.UseVisualStyleBackColor = true;
+            // 
+            // CheckPSN
+            // 
+            this.CheckPSN.AutoSize = true;
+            this.CheckPSN.Location = new System.Drawing.Point(19, 363);
+            this.CheckPSN.Name = "CheckPSN";
+            this.CheckPSN.Size = new System.Drawing.Size(162, 28);
+            this.CheckPSN.TabIndex = 205;
+            this.CheckPSN.Text = "包装序列号";
+            this.CheckPSN.UseVisualStyleBackColor = true;
+            // 
+            // CheckImei
+            // 
+            this.CheckImei.AutoSize = true;
+            this.CheckImei.Location = new System.Drawing.Point(19, 735);
+            this.CheckImei.Name = "CheckImei";
+            this.CheckImei.Size = new System.Drawing.Size(90, 28);
+            this.CheckImei.TabIndex = 206;
+            this.CheckImei.Text = "IMEI";
+            this.CheckImei.UseVisualStyleBackColor = true;
+            // 
+            // TSN
+            // 
+            this.TSN.Location = new System.Drawing.Point(211, 265);
+            this.TSN.Name = "TSN";
+            this.TSN.Size = new System.Drawing.Size(323, 35);
+            this.TSN.TabIndex = 207;
+            // 
+            // TSN_CHECK
+            // 
+            this.TSN_CHECK.Enabled = false;
+            this.TSN_CHECK.Location = new System.Drawing.Point(596, 267);
+            this.TSN_CHECK.Name = "TSN_CHECK";
+            this.TSN_CHECK.Size = new System.Drawing.Size(323, 35);
+            this.TSN_CHECK.TabIndex = 216;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(307, 204);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(114, 41);
+            this.label1.TabIndex = 217;
+            this.label1.Text = "标准值";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(699, 204);
+            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(114, 41);
+            this.label2.TabIndex = 218;
+            this.label2.Text = "核对值";
+            // 
+            // PSN_CHECK
+            // 
+            this.PSN_CHECK.Enabled = false;
+            this.PSN_CHECK.Location = new System.Drawing.Point(596, 361);
+            this.PSN_CHECK.Name = "PSN_CHECK";
+            this.PSN_CHECK.Size = new System.Drawing.Size(323, 35);
+            this.PSN_CHECK.TabIndex = 220;
+            // 
+            // PSN
+            // 
+            this.PSN.Location = new System.Drawing.Point(211, 359);
+            this.PSN.Name = "PSN";
+            this.PSN.Size = new System.Drawing.Size(323, 35);
+            this.PSN.TabIndex = 219;
+            // 
+            // PKID_CHECK
+            // 
+            this.PKID_CHECK.Enabled = false;
+            this.PKID_CHECK.Location = new System.Drawing.Point(596, 454);
+            this.PKID_CHECK.Name = "PKID_CHECK";
+            this.PKID_CHECK.Size = new System.Drawing.Size(323, 35);
+            this.PKID_CHECK.TabIndex = 222;
+            // 
+            // PKID
+            // 
+            this.PKID.Location = new System.Drawing.Point(211, 452);
+            this.PKID.Name = "PKID";
+            this.PKID.Size = new System.Drawing.Size(323, 35);
+            this.PKID.TabIndex = 221;
+            // 
+            // KEY_CHECK
+            // 
+            this.KEY_CHECK.Enabled = false;
+            this.KEY_CHECK.Location = new System.Drawing.Point(596, 543);
+            this.KEY_CHECK.Name = "KEY_CHECK";
+            this.KEY_CHECK.Size = new System.Drawing.Size(323, 35);
+            this.KEY_CHECK.TabIndex = 224;
+            // 
+            // KEY
+            // 
+            this.KEY.Location = new System.Drawing.Point(211, 541);
+            this.KEY.Name = "KEY";
+            this.KEY.Size = new System.Drawing.Size(323, 35);
+            this.KEY.TabIndex = 223;
+            // 
+            // MAC_CHECK
+            // 
+            this.MAC_CHECK.Enabled = false;
+            this.MAC_CHECK.Location = new System.Drawing.Point(596, 631);
+            this.MAC_CHECK.Name = "MAC_CHECK";
+            this.MAC_CHECK.Size = new System.Drawing.Size(323, 35);
+            this.MAC_CHECK.TabIndex = 226;
+            // 
+            // MAC
+            // 
+            this.MAC.Location = new System.Drawing.Point(211, 629);
+            this.MAC.Name = "MAC";
+            this.MAC.Size = new System.Drawing.Size(323, 35);
+            this.MAC.TabIndex = 225;
+            // 
+            // IMEI_CHECK
+            // 
+            this.IMEI_CHECK.Enabled = false;
+            this.IMEI_CHECK.Location = new System.Drawing.Point(596, 728);
+            this.IMEI_CHECK.Name = "IMEI_CHECK";
+            this.IMEI_CHECK.Size = new System.Drawing.Size(323, 35);
+            this.IMEI_CHECK.TabIndex = 228;
+            // 
+            // IMEI
+            // 
+            this.IMEI.Location = new System.Drawing.Point(211, 726);
+            this.IMEI.Name = "IMEI";
+            this.IMEI.Size = new System.Drawing.Size(323, 35);
+            this.IMEI.TabIndex = 227;
+            // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(456, 70);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(2);
+            this.StepCount.Location = new System.Drawing.Point(912, 140);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(80, 22);
+            this.StepCount.Size = new System.Drawing.Size(160, 44);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 200;
@@ -127,13 +298,13 @@
             this.Delete.DownImage = ((System.Drawing.Image)(resources.GetObject("Delete.DownImage")));
             this.Delete.Image = null;
             this.Delete.IsShowBorder = true;
-            this.Delete.Location = new System.Drawing.Point(382, 422);
-            this.Delete.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Delete.Location = new System.Drawing.Point(764, 844);
+            this.Delete.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.Delete.MoveImage = ((System.Drawing.Image)(resources.GetObject("Delete.MoveImage")));
             this.Delete.Name = "Delete";
             this.Delete.NormalImage = ((System.Drawing.Image)(resources.GetObject("Delete.NormalImage")));
             this.Delete.Power = null;
-            this.Delete.Size = new System.Drawing.Size(75, 28);
+            this.Delete.Size = new System.Drawing.Size(150, 56);
             this.Delete.TabIndex = 199;
             this.Delete.Text = "取消";
             this.Delete.UseVisualStyleBackColor = false;
@@ -144,42 +315,23 @@
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.CutLength = null;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(92, 22);
-            this.ms_makecode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.ms_makecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ms_makecode.Location = new System.Drawing.Point(184, 44);
+            this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode.MaximumSize = new System.Drawing.Size(400, 0);
             this.ms_makecode.Name = "ms_makecode";
-            this.ms_makecode.Size = new System.Drawing.Size(0, 21);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 41);
             this.ms_makecode.TabIndex = 198;
             // 
-            // pr_electricmax
-            // 
-            this.pr_electricmax.AutoSize = true;
-            this.pr_electricmax.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_electricmax.Location = new System.Drawing.Point(332, 70);
-            this.pr_electricmax.Name = "pr_electricmax";
-            this.pr_electricmax.Size = new System.Drawing.Size(19, 21);
-            this.pr_electricmax.TabIndex = 195;
-            this.pr_electricmax.Text = "0";
-            // 
-            // pr_electricmin
-            // 
-            this.pr_electricmin.AutoSize = true;
-            this.pr_electricmin.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_electricmin.Location = new System.Drawing.Point(102, 70);
-            this.pr_electricmin.Name = "pr_electricmin";
-            this.pr_electricmin.Size = new System.Drawing.Size(19, 21);
-            this.pr_electricmin.TabIndex = 194;
-            this.pr_electricmin.Text = "0";
-            // 
             // ms_prodcode
             // 
             this.ms_prodcode.AutoSize = true;
             this.ms_prodcode.CutLength = null;
             this.ms_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_prodcode.Location = new System.Drawing.Point(318, 22);
-            this.ms_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ms_prodcode.Location = new System.Drawing.Point(636, 44);
+            this.ms_prodcode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ms_prodcode.MaximumSize = new System.Drawing.Size(400, 0);
             this.ms_prodcode.Name = "ms_prodcode";
-            this.ms_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ms_prodcode.Size = new System.Drawing.Size(0, 41);
             this.ms_prodcode.TabIndex = 193;
             // 
             // pr_detail
@@ -187,10 +339,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(542, 22);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_detail.Location = new System.Drawing.Point(1084, 44);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(400, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 21);
+            this.pr_detail.Size = new System.Drawing.Size(0, 41);
             this.pr_detail.TabIndex = 192;
             // 
             // sncode
@@ -200,11 +353,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(98, 424);
-            this.sncode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.sncode.Location = new System.Drawing.Point(196, 848);
+            this.sncode.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(196, 21);
+            this.sncode.Size = new System.Drawing.Size(388, 35);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -215,35 +368,51 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(10, 106);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.OperateResult.Location = new System.Drawing.Point(1057, 215);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(553, 306);
+            this.OperateResult.Size = new System.Drawing.Size(399, 608);
             this.OperateResult.TabIndex = 188;
             this.OperateResult.Text = "";
             // 
             // Make_CollectElec
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(741, 454);
+            this.ClientSize = new System.Drawing.Size(1482, 908);
+            this.Controls.Add(this.IMEI_CHECK);
+            this.Controls.Add(this.IMEI);
+            this.Controls.Add(this.MAC_CHECK);
+            this.Controls.Add(this.MAC);
+            this.Controls.Add(this.KEY_CHECK);
+            this.Controls.Add(this.KEY);
+            this.Controls.Add(this.PKID_CHECK);
+            this.Controls.Add(this.PKID);
+            this.Controls.Add(this.PSN_CHECK);
+            this.Controls.Add(this.PSN);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.TSN_CHECK);
+            this.Controls.Add(this.TSN);
+            this.Controls.Add(this.CheckImei);
+            this.Controls.Add(this.CheckPSN);
+            this.Controls.Add(this.CheckPKID);
+            this.Controls.Add(this.CheckKey);
+            this.Controls.Add(this.CheckMac);
+            this.Controls.Add(this.CheckTSN);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.Delete);
             this.Controls.Add(this.ms_makecode);
-            this.Controls.Add(this.pr_electricmax);
-            this.Controls.Add(this.pr_electricmin);
             this.Controls.Add(this.ms_prodcode);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.pr_detail_label);
             this.Controls.Add(this.sncode_label);
             this.Controls.Add(this.sncode);
             this.Controls.Add(this.OperateResult);
-            this.Controls.Add(this.mcd_remainqty_label);
-            this.Controls.Add(this.mcd_okqty_label);
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(2);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_CollectElec";
             this.Tag = "Make!CollectElec";
             this.Text = "电量采集";
@@ -256,20 +425,36 @@
         }
 
         #endregion
-        private CustomControl.ValueLabel.ValueNumLabel pr_electricmax;
-        private CustomControl.ValueLabel.ValueNumLabel pr_electricmin;
         private CustomControl.ValueLabel.ValueLabel ms_prodcode;
         private CustomControl.ValueLabel.ValueLabel pr_detail;
         private System.Windows.Forms.Label pr_detail_label;
         private System.Windows.Forms.Label sncode_label;
         private CustomControl.TextBoxWithIcon.SnCollectionBox sncode;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private System.Windows.Forms.Label mcd_remainqty_label;
-        private System.Windows.Forms.Label mcd_okqty_label;
         private System.Windows.Forms.Label pr_code_label;
         private System.Windows.Forms.Label ms_makecode_label;
         private CustomControl.ValueLabel.ValueLabel ms_makecode;
         private CustomControl.ButtonUtil.NormalButton Delete;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
+        private System.Windows.Forms.CheckBox CheckTSN;
+        private System.Windows.Forms.CheckBox CheckMac;
+        private System.Windows.Forms.CheckBox CheckKey;
+        private System.Windows.Forms.CheckBox CheckPKID;
+        private System.Windows.Forms.CheckBox CheckPSN;
+        private System.Windows.Forms.CheckBox CheckImei;
+        private System.Windows.Forms.TextBox TSN;
+        private System.Windows.Forms.TextBox TSN_CHECK;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox PSN_CHECK;
+        private System.Windows.Forms.TextBox PSN;
+        private System.Windows.Forms.TextBox PKID_CHECK;
+        private System.Windows.Forms.TextBox PKID;
+        private System.Windows.Forms.TextBox KEY_CHECK;
+        private System.Windows.Forms.TextBox KEY;
+        private System.Windows.Forms.TextBox MAC_CHECK;
+        private System.Windows.Forms.TextBox MAC;
+        private System.Windows.Forms.TextBox IMEI_CHECK;
+        private System.Windows.Forms.TextBox IMEI;
     }
 }

UAS_MES_PW/FunctionCode/Make/Make_CollectElec.cs

@@ -58,6 +58,19 @@ namespace UAS_MES_NEW.Make
                 //采集序列号
                 if (!isnetcode)
                 {
+                    string[] arr = sncode.Text.Split(',');
+                    if (arr.Length != 6)
+                    {
+                        OperateResult.AppendText(">>数据长度错误，无法解析\n", Color.Red);
+                        return;
+                    }
+                    TSN.Text = arr[0];
+                    PSN.Text = arr[1];
+                    PKID.Text = arr[2];
+                    KEY.Text = arr[3];
+                    MAC.Text = arr[4];
+                    IMEI.Text = arr[5];
+                    sncode.Text = TSN.Text;
                     if (sncode.Text == "")
                     {
                         OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
@@ -81,7 +94,7 @@ namespace UAS_MES_NEW.Make
                         {
                             sql.Clear();
                             sql.Append("select ms_makecode,ms_prodcode,pr_detail,nvl(pr_electricmax,0)pr_electricmax,nvl(pr_electricmin,0)pr_electricmin from makeserial left join product on ");
-                            sql.Append(" ms_prodcode = pr_code where ms_id  = '"+oMsID+"'");
+                            sql.Append(" ms_prodcode = pr_code where ms_id  = '" + oMsID + "'");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             BaseUtil.SetFormValue(this.Controls, dt);
                             OperateResult.AppendText(">>请输入电量\n", Color.Black);
@@ -97,53 +110,169 @@ namespace UAS_MES_NEW.Make
                 //采集netcode
                 else
                 {
-                    if (sncode.Text == "")
+                    if (CheckTSN.Checked)
                     {
-                        OperateResult.AppendText(">>电量信息不能为空\n", Color.Red);
-                        return;
+                        if (TSN_CHECK.Text == "")
+                        {
+                            if (TSN.Text == sncode.Text)
+                            {
+                                TSN_CHECK.Text = sncode.Text;
+                                if (CheckInfoPass())
+                                {
+                                    OperateResult.AppendText(">>TSN核对成功\n", Color.Green);
+                                    return;
+                                }
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(">>TSN核对错误，请重新输入\n", Color.Red);
+                                return;
+                            }
+                        }
                     }
-                    OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
-                    string ErrorMessage = "";
-
-                    try
+                    if (CheckPSN.Checked)
                     {
-                        net_code =  float.Parse(sncode.Text);
-                        if (!(net_code <= float.Parse(pr_electricmax.Text) && (net_code >= float.Parse(pr_electricmin.Text))))
+                        if ((!CheckTSN.Checked || TSN_CHECK.Text != "") && PSN_CHECK.Text == "")
                         {
-                            sncode.Text = "";
-                            OperateResult.AppendText("<<输入值" + sncode.Text + "不符合维护范围,重新输入\n", Color.Red);
-                            return;
+                            if (PSN.Text == sncode.Text)
+                            {
+                                PSN_CHECK.Text = sncode.Text;
+                                if (CheckInfoPass())
+                                {
+                                    OperateResult.AppendText(">>PSN核对成功\n", Color.Green);
+                                    return;
+                                }
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(">>PSN核对错误，请重新输入\n", Color.Red);
+                                return;
+                            }
                         }
                     }
-                    catch (Exception ex)
+                    if (CheckPKID.Checked)
                     {
-                        sncode.Text = "";
-                        OperateResult.AppendText("<<输入值" + sncode.Text + "错误，重新输入\n", Color.Red);
-                        return;
+                        if ((!CheckTSN.Checked || TSN_CHECK.Text != "" || !CheckPSN.Checked || PSN_CHECK.Text != "") && PKID_CHECK.Text == "")
+                        {
+                            if (PKID.Text == sncode.Text)
+                            {
+                                PKID_CHECK.Text = sncode.Text;
+                                if (CheckInfoPass())
+                                {
+                                    OperateResult.AppendText(">>PKID核对成功\n", Color.Green);
+                                    return;
+                                }
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(">>PKID核对错误，请重新输入\n", Color.Red);
+                                return;
+                            }
+                        }
                     }
-
-                        if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code, "电量采集", "电量采集完成", User.UserCode, out ErrorMessage))
+                    if (CheckKey.Checked)
+                    {
+                        if ((!CheckTSN.Checked || TSN_CHECK.Text != "" || !CheckPSN.Checked || PSN_CHECK.Text != "" || !CheckPKID.Checked || PKID_CHECK.Text != "") && KEY_CHECK.Text == "")
                         {
-                            //提示正确返回时传递的信息
-                            if (ErrorMessage.Contains("AFTERSUCCESS"))
-                                OperateResult.AppendText(">>" + ErrorMessage + "\n");
-                            dh.BatchInsert("update  makeserial set MS_ELEC = :netcode where ms_id = :oMsId", new String[] { "netcode", "oMsId" }, new string[] { sncode.Text }, new string[] { oMsID.ToString() });
-                            OperateResult.AppendText(">>电量信息采集完成\n", Color.Green);
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "电量采集", "采集成功", sn_code, "");                        
-                            isnetcode = false;
-                            sncode.Text = "";
-                            sncode.Focus();
+                            if (KEY.Text == sncode.Text)
+                            {
+                                KEY_CHECK.Text = sncode.Text;
+                                if (CheckInfoPass())
+                                {
+                                    OperateResult.AppendText(">>KEY核对成功\n", Color.Green);
+                                    return;
+                                }
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(">>KEY核对错误，请重新输入\n", Color.Red);
+                                return;
+                            }
                         }
-                        else
+                    }
+                    if (CheckMac.Checked)
+                    {
+                        if ((!CheckTSN.Checked || TSN_CHECK.Text != "" || !CheckPSN.Checked || PSN_CHECK.Text != "" || !CheckPKID.Checked || PKID_CHECK.Text != "" || !CheckKey.Checked || KEY_CHECK.Text != "") && MAC_CHECK.Text == "")
                         {
-                            OperateResult.AppendText(">>更新错误" + ErrorMessage + "\n", Color.Red);
+                            if (MAC.Text == sncode.Text)
+                            {
+                                MAC_CHECK.Text = sncode.Text;
+                                if (CheckInfoPass())
+                                {
+                                    OperateResult.AppendText(">>MAC核对成功\n", Color.Green);
+                                    return;
+                                }
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(">>MAC核对错误，请重新输入\n", Color.Red);
+                                return;
+                            }
+                        }
+                    }
+                    if (CheckImei.Checked)
+                    {
+                        if ((!CheckTSN.Checked || TSN_CHECK.Text != "" || !CheckPSN.Checked || PSN_CHECK.Text != "" || !CheckPKID.Checked || PKID_CHECK.Text != "" || !CheckKey.Checked || KEY_CHECK.Text != "" || !CheckMac.Checked || MAC_CHECK.Text != "") && IMEI_CHECK.Text == "")
+                        {
+                            if (IMEI.Text == sncode.Text)
+                            {
+                                IMEI_CHECK.Text = sncode.Text;
+                                if (CheckInfoPass())
+                                {
+                                    OperateResult.AppendText(">>IMEI核对成功\n", Color.Green);
+                                    return;
+                                }
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(">>IMEI核对错误，请重新输入\n", Color.Red);
+                                return;
+                            }
                         }
-                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                    
+                    }
+                    isnetcode = false;
+                    sncode.Text = "";
+                    sncode.Focus();
                 }
             }
         }
 
+        private bool CheckInfoPass()
+        {
+            bool CheckPass = true;
+            if (CheckTSN.Checked)
+            {
+                if (TSN.Text != TSN_CHECK.Text)
+                    CheckPass = false;
+            }
+            if (CheckPSN.Checked)
+            {
+                if (PSN.Text != PSN_CHECK.Text)
+                    CheckPass = false;
+            }
+            if (CheckPKID.Checked)
+            {
+                if (PKID.Text != PKID_CHECK.Text)
+                    CheckPass = false;
+            }
+            if (CheckKey.Checked)
+            {
+                if (KEY.Text != KEY_CHECK.Text)
+                    CheckPass = false;
+            }
+            if (CheckMac.Checked)
+            {
+                if (MAC.Text != MAC_CHECK.Text)
+                    CheckPass = false;
+            }
+            if (CheckImei.Checked)
+            {
+                if (IMEI.Text != IMEI_CHECK.Text)
+                    CheckPass = false;
+            }
+            return CheckPass;
+        }
+
         private void Make_CollectNetCode_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
@@ -154,7 +283,6 @@ namespace UAS_MES_NEW.Make
             sncode.Focus();
         }
 
-
         private void deleteButton1_Click(object sender, EventArgs e)
         {
             if (isnetcode)
@@ -166,4 +294,4 @@ namespace UAS_MES_NEW.Make
             }
         }
     }
-}
+}