Просмотр исходного кода

添加箱号批次绑定功能

callm 1 неделя назад
Родитель
Сommit
c9f12c9aa0

+ 455 - 0
UAS_MES_XMW/FunctionCode/Make/Make_BoxLotBindSingle.Designer.cs

@@ -0,0 +1,455 @@
+namespace UAS_MES_NEW.Make
+{
+    partial class Make_BoxLotBindSingle
+    {
+        /// <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()
+        {
+            this.pr_detail_label = new System.Windows.Forms.Label();
+            this.sncode_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.LabelDataGridView = new System.Windows.Forms.DataGridView();
+            this.quxiao = new System.Windows.Forms.CheckBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ma_wccode = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.ma_craftcode = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.agsum = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.pr_code = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.pr_detail = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.boxcode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.ms_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ms_nextstepcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ms_boxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ms_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // pr_detail_label
+            // 
+            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(904, 24);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.pr_detail_label.Name = "pr_detail_label";
+            this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
+            this.pr_detail_label.TabIndex = 191;
+            this.pr_detail_label.Text = "产品名称";
+            // 
+            // sncode_label
+            // 
+            this.sncode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | 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(10, 85);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.sncode_label.Name = "sncode_label";
+            this.sncode_label.Size = new System.Drawing.Size(114, 41);
+            this.sncode_label.TabIndex = 190;
+            this.sncode_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(472, 24);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.pr_code_label.Name = "pr_code_label";
+            this.pr_code_label.Size = new System.Drawing.Size(146, 41);
+            this.pr_code_label.TabIndex = 185;
+            this.pr_code_label.Text = "产品编号";
+            // 
+            // ms_makecode_label
+            // 
+            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(12, 24);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.ms_makecode_label.Name = "ms_makecode_label";
+            this.ms_makecode_label.Size = new System.Drawing.Size(146, 41);
+            this.ms_makecode_label.TabIndex = 184;
+            this.ms_makecode_label.Text = "工单编号";
+            // 
+            // LabelDataGridView
+            // 
+            this.LabelDataGridView.AllowUserToAddRows = false;
+            this.LabelDataGridView.AllowUserToResizeRows = false;
+            this.LabelDataGridView.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
+            this.LabelDataGridView.ColumnHeadersHeight = 46;
+            this.LabelDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ms_sncode,
+            this.ms_nextstepcode,
+            this.ms_boxcode,
+            this.ms_lotno});
+            this.LabelDataGridView.Location = new System.Drawing.Point(17, 148);
+            this.LabelDataGridView.Margin = new System.Windows.Forms.Padding(5);
+            this.LabelDataGridView.Name = "LabelDataGridView";
+            this.LabelDataGridView.RowHeadersVisible = false;
+            this.LabelDataGridView.RowHeadersWidth = 82;
+            this.LabelDataGridView.RowTemplate.Height = 23;
+            this.LabelDataGridView.Size = new System.Drawing.Size(1131, 609);
+            this.LabelDataGridView.TabIndex = 200;
+            // 
+            // quxiao
+            // 
+            this.quxiao.AutoSize = true;
+            this.quxiao.Location = new System.Drawing.Point(656, 856);
+            this.quxiao.Margin = new System.Windows.Forms.Padding(4);
+            this.quxiao.Name = "quxiao";
+            this.quxiao.Size = new System.Drawing.Size(138, 28);
+            this.quxiao.TabIndex = 204;
+            this.quxiao.Text = "取消采集";
+            this.quxiao.UseVisualStyleBackColor = true;
+            this.quxiao.Visible = false;
+            // 
+            // 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(28, 785);
+            this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(82, 41);
+            this.label2.TabIndex = 205;
+            this.label2.Text = "数量";
+            // 
+            // label3
+            // 
+            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(904, 88);
+            this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(146, 41);
+            this.label3.TabIndex = 208;
+            this.label3.Text = "途程编号";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.Location = new System.Drawing.Point(472, 91);
+            this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(146, 41);
+            this.label4.TabIndex = 210;
+            this.label4.Text = "工作中心";
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "BI_PANELID";
+            this.dataGridViewTextBoxColumn1.HeaderText = "PANELID";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn1.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "BI_BOXNAME";
+            this.dataGridViewTextBoxColumn2.HeaderText = "BOXNAME";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "BI_PRODUCTSPECNAME";
+            this.dataGridViewTextBoxColumn3.HeaderText = "产品名称";
+            this.dataGridViewTextBoxColumn3.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn3.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "BI_UPDATETIME";
+            this.dataGridViewTextBoxColumn4.HeaderText = "更新时间";
+            this.dataGridViewTextBoxColumn4.MinimumWidth = 300;
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn4.Width = 300;
+            // 
+            // ma_wccode
+            // 
+            this.ma_wccode.AutoSize = true;
+            this.ma_wccode.CutLength = null;
+            this.ma_wccode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_wccode.Location = new System.Drawing.Point(652, 91);
+            this.ma_wccode.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.ma_wccode.MaximumSize = new System.Drawing.Size(400, 0);
+            this.ma_wccode.Name = "ma_wccode";
+            this.ma_wccode.Size = new System.Drawing.Size(0, 41);
+            this.ma_wccode.TabIndex = 211;
+            // 
+            // ma_craftcode
+            // 
+            this.ma_craftcode.AutoSize = true;
+            this.ma_craftcode.CutLength = null;
+            this.ma_craftcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_craftcode.Location = new System.Drawing.Point(1084, 88);
+            this.ma_craftcode.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.ma_craftcode.MaximumSize = new System.Drawing.Size(400, 0);
+            this.ma_craftcode.Name = "ma_craftcode";
+            this.ma_craftcode.Size = new System.Drawing.Size(0, 41);
+            this.ma_craftcode.TabIndex = 209;
+            // 
+            // agsum
+            // 
+            this.agsum.AutoSize = true;
+            this.agsum.CutLength = null;
+            this.agsum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.agsum.Location = new System.Drawing.Point(145, 784);
+            this.agsum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.agsum.MaximumSize = new System.Drawing.Size(400, 0);
+            this.agsum.Name = "agsum";
+            this.agsum.Size = new System.Drawing.Size(0, 41);
+            this.agsum.TabIndex = 206;
+            // 
+            // pr_code
+            // 
+            this.pr_code.AutoSize = true;
+            this.pr_code.CutLength = null;
+            this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_code.Location = new System.Drawing.Point(636, 24);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.pr_code.MaximumSize = new System.Drawing.Size(400, 0);
+            this.pr_code.Name = "pr_code";
+            this.pr_code.Size = new System.Drawing.Size(0, 41);
+            this.pr_code.TabIndex = 193;
+            // 
+            // pr_detail
+            // 
+            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(1084, 24);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(5, 0, 5, 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, 41);
+            this.pr_detail.TabIndex = 192;
+            // 
+            // boxcode
+            // 
+            this.boxcode.AllPower = "ifall";
+            this.boxcode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.boxcode.BackColor = System.Drawing.Color.White;
+            this.boxcode.ID = null;
+            this.boxcode.Location = new System.Drawing.Point(134, 88);
+            this.boxcode.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.boxcode.Name = "boxcode";
+            this.boxcode.Power = null;
+            this.boxcode.Size = new System.Drawing.Size(327, 35);
+            this.boxcode.Str = null;
+            this.boxcode.Str1 = null;
+            this.boxcode.Str2 = null;
+            this.boxcode.TabIndex = 189;
+            this.boxcode.Tag = "ifread";
+            this.boxcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.boxcode_KeyDown);
+            // 
+            // 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(1183, 148);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(281, 677);
+            this.OperateResult.TabIndex = 188;
+            this.OperateResult.Text = "";
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = "IFALL";
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = "";
+            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(142, 24);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(6);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = "";
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(319, 46);
+            this.ma_code.TabIndex = 235;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "makecode";
+            this.ma_code.TextBoxEnable = true;
+            // 
+            // label1
+            // 
+            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            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(28, 843);
+            this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(62, 41);
+            this.label1.TabIndex = 237;
+            this.label1.Text = "SN";
+            // 
+            // sncode
+            // 
+            this.sncode.AllPower = "ifall";
+            this.sncode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.sncode.BackColor = System.Drawing.Color.White;
+            this.sncode.ID = null;
+            this.sncode.Location = new System.Drawing.Point(152, 846);
+            this.sncode.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.sncode.Name = "sncode";
+            this.sncode.Power = null;
+            this.sncode.Size = new System.Drawing.Size(327, 35);
+            this.sncode.Str = null;
+            this.sncode.Str1 = null;
+            this.sncode.Str2 = null;
+            this.sncode.TabIndex = 236;
+            this.sncode.Tag = "ifread";
+            this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sncode_KeyDown);
+            // 
+            // ms_sncode
+            // 
+            this.ms_sncode.DataPropertyName = "ms_sncode";
+            this.ms_sncode.HeaderText = "序列号";
+            this.ms_sncode.MinimumWidth = 10;
+            this.ms_sncode.Name = "ms_sncode";
+            this.ms_sncode.ReadOnly = true;
+            this.ms_sncode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ms_sncode.Width = 200;
+            // 
+            // ms_nextstepcode
+            // 
+            this.ms_nextstepcode.DataPropertyName = "ms_nextstepcode";
+            this.ms_nextstepcode.HeaderText = "ms_nextstepcode";
+            this.ms_nextstepcode.MinimumWidth = 10;
+            this.ms_nextstepcode.Name = "ms_nextstepcode";
+            this.ms_nextstepcode.Visible = false;
+            this.ms_nextstepcode.Width = 200;
+            // 
+            // ms_boxcode
+            // 
+            this.ms_boxcode.DataPropertyName = "ms_boxcode";
+            this.ms_boxcode.HeaderText = "箱号";
+            this.ms_boxcode.MinimumWidth = 10;
+            this.ms_boxcode.Name = "ms_boxcode";
+            this.ms_boxcode.Width = 200;
+            // 
+            // ms_lotno
+            // 
+            this.ms_lotno.DataPropertyName = "ms_lotno";
+            this.ms_lotno.HeaderText = "LotNo";
+            this.ms_lotno.MinimumWidth = 10;
+            this.ms_lotno.Name = "ms_lotno";
+            this.ms_lotno.ReadOnly = true;
+            this.ms_lotno.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ms_lotno.Width = 200;
+            // 
+            // Make_BoxLotBindSingle
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1483, 908);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.sncode);
+            this.Controls.Add(this.ma_code);
+            this.Controls.Add(this.ma_wccode);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.ma_craftcode);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.agsum);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.quxiao);
+            this.Controls.Add(this.LabelDataGridView);
+            this.Controls.Add(this.pr_code);
+            this.Controls.Add(this.pr_detail);
+            this.Controls.Add(this.pr_detail_label);
+            this.Controls.Add(this.sncode_label);
+            this.Controls.Add(this.boxcode);
+            this.Controls.Add(this.OperateResult);
+            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(4);
+            this.Name = "Make_BoxLotBindSingle";
+            this.Tag = "Make!Aging";
+            this.Text = "老化采集";
+            this.Activated += new System.EventHandler(this.Make_CollectNetCode_Activated);
+            this.Load += new System.EventHandler(this.Make_CollectNetCode_Load);
+            this.SizeChanged += new System.EventHandler(this.Make_CollectNetCode_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private CustomControl.ValueLabel.ValueLabel pr_code;
+        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 boxcode;
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
+        private System.Windows.Forms.Label pr_code_label;
+        private System.Windows.Forms.Label ms_makecode_label;
+        private System.Windows.Forms.DataGridView LabelDataGridView;
+        private System.Windows.Forms.CheckBox quxiao;
+        private CustomControl.ValueLabel.ValueLabel agsum;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private CustomControl.ValueLabel.ValueLabel ma_craftcode;
+        private System.Windows.Forms.Label label3;
+        private CustomControl.ValueLabel.ValueLabel ma_wccode;
+        private System.Windows.Forms.Label label4;
+        private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
+        private System.Windows.Forms.Label label1;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox sncode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ms_sncode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ms_nextstepcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ms_boxcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ms_lotno;
+    }
+}

+ 107 - 0
UAS_MES_XMW/FunctionCode/Make/Make_BoxLotBindSingle.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Data;
+using System.Drawing;
+using System.Windows.Forms;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Make
+{
+    public partial class Make_BoxLotBindSingle : Form
+    {
+        DataHelper dh;
+
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        LogStringBuilder sql = new LogStringBuilder();
+
+        DataTable dt;
+
+        public Make_BoxLotBindSingle()
+        {
+            InitializeComponent();
+        }
+
+        private void Make_CollectNetCode_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            boxcode.Focus();
+            dh = SystemInf.dh;
+            ma_code.TableName = "make left join product on ma_prodcode=pr_code";
+            ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,pr_detail # 产品名称,ma_craftcode # 途程编号,ma_wccode # 工作中心";
+            ma_code.FormName = Name;
+            ma_code.SetValueField = new string[] { "ma_code", "pr_code", "pr_detail", "ma_craftcode", "ma_wccode" };
+            ma_code.Condition = "ma_statuscode='STARTED'";
+            ma_code.DbChange += Ma_code_DbChange;
+        }
+
+        DataTable Dbfind;
+
+        private void Ma_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = ma_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+            //获取工单的其他信息
+        }
+
+        private void boxcode_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (ma_code.Text == "")
+                {
+                    OperateResult.AppendText(">>工单号不能为空\n", Color.Red);
+                    return;
+                }
+                DataTable dt = (DataTable)dh.ExecuteSql("select ms_sncode,ms_boxcode,ms_lotno,ms_nextstepcode from makeserial where ms_boxcode='" + boxcode.Text + "'", "select");
+                BaseUtil.FillDgvWithDataTable(LabelDataGridView, dt);
+                agsum.Text = dt.Rows.Count.ToString();
+            }
+        }
+
+        private void Make_CollectNetCode_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        private void Make_CollectNetCode_Activated(object sender, EventArgs e)
+        {
+            boxcode.Focus();
+        }
+
+        private void sncode_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ms_boxcode,ms_lotno,ms_sncode,ms_nextstepcode from makeserial where ms_sncode='" + sncode.Text + "' order by ms_id desc", "select");
+                if (dt.Rows.Count == 0)
+                {
+                    OperateResult.AppendText(">>SN" + sncode.Text + "不存在\n", Color.Red);
+                    return;
+                }
+                //string ms_boxcode = dt.Rows[0]["ms_boxcode"].ToString();
+                //string ms_lotno = dt.Rows[0]["ms_lotno"].ToString();
+                string ms_id = dt.Rows[0]["ms_id"].ToString();
+                string nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
+                if (LabelDataGridView.Rows.Count == 0)
+                {
+                    OperateResult.AppendText(">>请先获取箱号数据\n", Color.Red);
+                    return;
+                }
+                string boxnextstepcode = LabelDataGridView.Rows[0].Cells["ms_nextstepcode"].Value.ToString();
+                string lotno = LabelDataGridView.Rows[0].Cells["ms_lotno"].Value.ToString();
+                if (boxnextstepcode != nextstepcode)
+                {
+                    OperateResult.AppendText(">>箱号" + boxcode.Text + "下一工序" + boxnextstepcode + ",序列号下一工序" + nextstepcode + ",不允许绑定\n", Color.Red);
+                    return;
+                }
+                dh.ExecuteSql("update makeserial set ms_boxcode='" + boxcode.Text + "',ms_lotno='" + lotno + "' where ms_id='" + ms_id + "'", "");
+                OperateResult.AppendText(">>SN" + sncode.Text + "绑定箱号" + boxcode.Text + "成功\n", Color.Red);
+                dt = (DataTable)dh.ExecuteSql("select ms_sncode,ms_boxcode,ms_lotno,ms_nextstepcode from makeserial where ms_boxcode='" + boxcode.Text + "'", "select");
+                BaseUtil.FillDgvWithDataTable(LabelDataGridView, dt);
+                agsum.Text = dt.Rows.Count.ToString();
+            }
+        }
+    }
+}

+ 132 - 0
UAS_MES_XMW/FunctionCode/Make/Make_BoxLotBindSingle.resx

@@ -0,0 +1,132 @@
+<?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>
+  <metadata name="ms_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ms_nextstepcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ms_boxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ms_lotno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

+ 1 - 1
UAS_MES_XMW/FunctionCode/Make/Make_TestCollection_Param.cs

@@ -571,7 +571,7 @@ namespace UAS_MES_NEW.Make
                     {
                         dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss')", "sp_id=(select max(sp_id) from steppassed where sp_sncode='" + ms_sncode.Text + "')");
                         dh.UpdateByCondition("makecraftdetail", "mcd_okqty=mcd_okqty-1", "mcd_macode='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
-                        dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_badtimes=nvl(ms_badtimes,0)+1", "ms_id='" + oMSID + "'");
+                        dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_boxcode='',ms_lotno='',ms_badtimes=nvl(ms_badtimes,0)+1", "ms_id='" + oMSID + "'");
                         LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "良品采集成不良", "测试不良", User.UserCode);
                         LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "测试不良", "良品采集成不良", ms_sncode.Text, ob_checkno.Text);
                     }

+ 5 - 5
UAS_MES_XMW/FunctionCode/Special/Special_ChangeMakeCodeBySN.cs

@@ -105,11 +105,11 @@ namespace UAS_MES_NEW.Special
                 OperateResult.AppendText("工单号" + ma_code1.Text + "不存在\n");
                 return;
             }
-            //if (dh.getFieldDataByCondition("make", "ma_prodcode", "ma_code='" + ma_code.Text + "'").ToString() != dh.getFieldDataByCondition("make", "ma_prodcode", "ma_code='" + ma_code1.Text + "'").ToString())
-            //{
-            //    OperateResult.AppendText("工单号产品编号不对应,不允许切换\n");
-            //    return;
-            //}
+            if (dh.getFieldDataByCondition("make", "ma_prodcode", "ma_code='" + ma_code.Text + "'").ToString() != dh.getFieldDataByCondition("make", "ma_prodcode", "ma_code='" + ma_code1.Text + "'").ToString())
+            {
+                OperateResult.AppendText("工单号产品编号不对应,不允许切换\n");
+                return;
+            }
             List<string> sqls = new List<string>
             {
                 "update CRAFTMATERIAL set cm_makecode='" + ma_code1.Text + "' where cm_makecode= '" + ma_code.Text + "' and cm_sncode='" + sncode + "'",

+ 9 - 0
UAS_MES_XMW/UAS_MES_XMW.csproj

@@ -551,6 +551,12 @@
     <Compile Include="FunctionCode\Employee\Employee_PowerSarch.Designer.cs">
       <DependentUpon>Employee_PowerSarch.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_BoxLotBindSingle.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_BoxLotBindSingle.Designer.cs">
+      <DependentUpon>Make_BoxLotBindSingle.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_BoxStepPass.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1573,6 +1579,9 @@
     <EmbeddedResource Include="FunctionCode\Employee\Employee_PowerSarch.resx">
       <DependentUpon>Employee_PowerSarch.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_BoxLotBindSingle.resx">
+      <DependentUpon>Make_BoxLotBindSingle.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_BoxStepPass.resx">
       <DependentUpon>Make_BoxStepPass.cs</DependentUpon>
     </EmbeddedResource>