ソースを参照

下地页面修改以及取消下地页面的添加

Hcsy 8 年 前
コミット
42c12351a4

+ 482 - 0
UAS-MES/FunctionCode/Make/Make_MakeCancelDown.Designer.cs

@@ -0,0 +1,482 @@
+namespace UAS_MES.Make
+{
+    partial class Make_MakeCancelDown
+    {
+        /// <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(Make_MakeCancelDown));
+            this.ms_makecode = new System.Windows.Forms.Label();
+            this.pr_code = new System.Windows.Forms.Label();
+            this.LabelDataGridView = new System.Windows.Forms.DataGridView();
+            this.md_reson = new System.Windows.Forms.Label();
+            this.make_count = new System.Windows.Forms.Label();
+            this.count_label = new System.Windows.Forms.Label();
+            this.md_code_rb = new System.Windows.Forms.RadioButton();
+            this.sn_code_rb = new System.Windows.Forms.RadioButton();
+            this.label1 = new System.Windows.Forms.Label();
+            this.已选 = new System.Windows.Forms.Label();
+            this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            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.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ChooseAll = new UAS_MES.CustomControl.ButtonUtil.ChooseAllButton();
+            this.mdcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.Sure = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.md_macode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.md_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.md_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.md_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MD_DOWNMAN = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.inputreson = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.sum = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.choosenum = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // ms_makecode
+            // 
+            this.ms_makecode.AutoSize = true;
+            this.ms_makecode.Location = new System.Drawing.Point(559, 362);
+            this.ms_makecode.Name = "ms_makecode";
+            this.ms_makecode.Size = new System.Drawing.Size(0, 12);
+            this.ms_makecode.TabIndex = 218;
+            this.ms_makecode.Visible = false;
+            // 
+            // pr_code
+            // 
+            this.pr_code.AutoSize = true;
+            this.pr_code.Location = new System.Drawing.Point(449, 362);
+            this.pr_code.Name = "pr_code";
+            this.pr_code.Size = new System.Drawing.Size(0, 12);
+            this.pr_code.TabIndex = 217;
+            this.pr_code.Visible = false;
+            // 
+            // LabelDataGridView
+            // 
+            this.LabelDataGridView.AllowUserToAddRows = false;
+            this.LabelDataGridView.AllowUserToResizeRows = false;
+            this.LabelDataGridView.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
+            this.LabelDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Choose,
+            this.md_macode,
+            this.md_sncode,
+            this.md_prodcode,
+            this.pr_detail,
+            this.md_code,
+            this.MD_DOWNMAN});
+            this.LabelDataGridView.Location = new System.Drawing.Point(22, 88);
+            this.LabelDataGridView.Name = "LabelDataGridView";
+            this.LabelDataGridView.RowHeadersVisible = false;
+            this.LabelDataGridView.RowTemplate.Height = 23;
+            this.LabelDataGridView.Size = new System.Drawing.Size(837, 199);
+            this.LabelDataGridView.TabIndex = 213;
+            this.LabelDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelDataGridView_CellValueChanged);
+            this.LabelDataGridView.CurrentCellDirtyStateChanged += new System.EventHandler(this.LabelDataGridView_CurrentCellDirtyStateChanged);
+            // 
+            // md_reson
+            // 
+            this.md_reson.AutoSize = true;
+            this.md_reson.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.md_reson.Location = new System.Drawing.Point(11, 322);
+            this.md_reson.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.md_reson.Name = "md_reson";
+            this.md_reson.Size = new System.Drawing.Size(106, 21);
+            this.md_reson.TabIndex = 211;
+            this.md_reson.Text = "取消下地原因";
+            // 
+            // make_count
+            // 
+            this.make_count.AutoSize = true;
+            this.make_count.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.make_count.Location = new System.Drawing.Point(543, 16);
+            this.make_count.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.make_count.Name = "make_count";
+            this.make_count.Size = new System.Drawing.Size(0, 21);
+            this.make_count.TabIndex = 210;
+            // 
+            // count_label
+            // 
+            this.count_label.AutoSize = true;
+            this.count_label.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.count_label.Location = new System.Drawing.Point(497, 16);
+            this.count_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.count_label.Name = "count_label";
+            this.count_label.Size = new System.Drawing.Size(42, 21);
+            this.count_label.TabIndex = 209;
+            this.count_label.Text = "数量";
+            // 
+            // md_code_rb
+            // 
+            this.md_code_rb.AutoSize = true;
+            this.md_code_rb.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.md_code_rb.Location = new System.Drawing.Point(22, 12);
+            this.md_code_rb.Name = "md_code_rb";
+            this.md_code_rb.Size = new System.Drawing.Size(76, 25);
+            this.md_code_rb.TabIndex = 221;
+            this.md_code_rb.TabStop = true;
+            this.md_code_rb.Text = "事件号";
+            this.md_code_rb.UseVisualStyleBackColor = true;
+            this.md_code_rb.Click += new System.EventHandler(this.md_code_rb_Click);
+            // 
+            // sn_code_rb
+            // 
+            this.sn_code_rb.AutoSize = true;
+            this.sn_code_rb.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.sn_code_rb.Location = new System.Drawing.Point(22, 55);
+            this.sn_code_rb.Name = "sn_code_rb";
+            this.sn_code_rb.Size = new System.Drawing.Size(76, 25);
+            this.sn_code_rb.TabIndex = 222;
+            this.sn_code_rb.TabStop = true;
+            this.sn_code_rb.Text = "序列号";
+            this.sn_code_rb.UseVisualStyleBackColor = true;
+            this.sn_code_rb.Click += new System.EventHandler(this.md_code_rb_Click);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label1.Location = new System.Drawing.Point(89, 293);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(42, 21);
+            this.label1.TabIndex = 224;
+            this.label1.Text = "总数";
+            // 
+            // 已选
+            // 
+            this.已选.AutoSize = true;
+            this.已选.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.已选.Location = new System.Drawing.Point(196, 294);
+            this.已选.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.已选.Name = "已选";
+            this.已选.Size = new System.Drawing.Size(42, 21);
+            this.已选.TabIndex = 226;
+            this.已选.Text = "已选";
+            // 
+            // dataGridViewCheckBoxColumn1
+            // 
+            this.dataGridViewCheckBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.dataGridViewCheckBoxColumn1.HeaderText = "勾选";
+            this.dataGridViewCheckBoxColumn1.MinimumWidth = 80;
+            this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1";
+            this.dataGridViewCheckBoxColumn1.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "md_macode";
+            this.dataGridViewTextBoxColumn1.HeaderText = "工单编号";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "md_sncode";
+            this.dataGridViewTextBoxColumn2.HeaderText = "序列号";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "md_prodcode";
+            this.dataGridViewTextBoxColumn3.HeaderText = "产品代码";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "pr_detail";
+            this.dataGridViewTextBoxColumn4.HeaderText = "产品名称";
+            this.dataGridViewTextBoxColumn4.MinimumWidth = 80;
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "md_code";
+            this.dataGridViewTextBoxColumn5.HeaderText = "";
+            this.dataGridViewTextBoxColumn5.MinimumWidth = 2;
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            this.dataGridViewTextBoxColumn5.Visible = false;
+            this.dataGridViewTextBoxColumn5.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.dataGridViewTextBoxColumn6.HeaderText = "";
+            this.dataGridViewTextBoxColumn6.MinimumWidth = 2;
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
+            this.dataGridViewTextBoxColumn6.Width = 2;
+            // 
+            // ChooseAll
+            // 
+            this.ChooseAll.Location = new System.Drawing.Point(22, 293);
+            this.ChooseAll.Name = "ChooseAll";
+            this.ChooseAll.Size = new System.Drawing.Size(38, 20);
+            this.ChooseAll.TabIndex = 223;
+            this.ChooseAll.Text = "全选";
+            this.ChooseAll.UseVisualStyleBackColor = true;
+            // 
+            // mdcode
+            // 
+            this.mdcode.AllPower = null;
+            this.mdcode.BackColor = System.Drawing.Color.White;
+            this.mdcode.ID = null;
+            this.mdcode.Location = new System.Drawing.Point(93, 16);
+            this.mdcode.Name = "mdcode";
+            this.mdcode.Power = null;
+            this.mdcode.Size = new System.Drawing.Size(196, 21);
+            this.mdcode.Str = null;
+            this.mdcode.Str1 = null;
+            this.mdcode.Str2 = null;
+            this.mdcode.TabIndex = 220;
+            this.mdcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.md_code_KeyDown);
+            // 
+            // Sure
+            // 
+            this.Sure.AllPower = null;
+            this.Sure.BackColor = System.Drawing.Color.Transparent;
+            this.Sure.DownImage = ((System.Drawing.Image)(resources.GetObject("Sure.DownImage")));
+            this.Sure.Image = null;
+            this.Sure.IsShowBorder = true;
+            this.Sure.Location = new System.Drawing.Point(262, 493);
+            this.Sure.MoveImage = ((System.Drawing.Image)(resources.GetObject("Sure.MoveImage")));
+            this.Sure.Name = "Sure";
+            this.Sure.NormalImage = ((System.Drawing.Image)(resources.GetObject("Sure.NormalImage")));
+            this.Sure.Power = null;
+            this.Sure.Size = new System.Drawing.Size(75, 28);
+            this.Sure.TabIndex = 219;
+            this.Sure.Text = "确认";
+            this.Sure.UseVisualStyleBackColor = false;
+            this.Sure.Click += new System.EventHandler(this.Sure_Click);
+            // 
+            // OperateResult
+            // 
+            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperateResult.Location = new System.Drawing.Point(435, 322);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(412, 199);
+            this.OperateResult.TabIndex = 216;
+            this.OperateResult.Text = "";
+            // 
+            // sn_code
+            // 
+            this.sn_code.AllPower = null;
+            this.sn_code.BackColor = System.Drawing.Color.White;
+            this.sn_code.ID = null;
+            this.sn_code.Location = new System.Drawing.Point(93, 61);
+            this.sn_code.Name = "sn_code";
+            this.sn_code.Power = null;
+            this.sn_code.Size = new System.Drawing.Size(196, 21);
+            this.sn_code.Str = null;
+            this.sn_code.Str1 = null;
+            this.sn_code.Str2 = null;
+            this.sn_code.TabIndex = 214;
+            this.sn_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sn_code_KeyDown);
+            // 
+            // Choose
+            // 
+            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Choose.HeaderText = "勾选";
+            this.Choose.MinimumWidth = 60;
+            this.Choose.Name = "Choose";
+            this.Choose.Width = 60;
+            // 
+            // md_macode
+            // 
+            this.md_macode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.md_macode.DataPropertyName = "md_macode";
+            this.md_macode.HeaderText = "工单编号";
+            this.md_macode.Name = "md_macode";
+            this.md_macode.ReadOnly = true;
+            this.md_macode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // md_sncode
+            // 
+            this.md_sncode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.md_sncode.DataPropertyName = "md_sncode";
+            this.md_sncode.HeaderText = "序列号";
+            this.md_sncode.Name = "md_sncode";
+            this.md_sncode.ReadOnly = true;
+            this.md_sncode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // md_prodcode
+            // 
+            this.md_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.md_prodcode.DataPropertyName = "md_prodcode";
+            this.md_prodcode.HeaderText = "产品代码";
+            this.md_prodcode.Name = "md_prodcode";
+            this.md_prodcode.ReadOnly = true;
+            this.md_prodcode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.pr_detail.DataPropertyName = "pr_detail";
+            this.pr_detail.HeaderText = "产品名称";
+            this.pr_detail.MinimumWidth = 80;
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.ReadOnly = true;
+            this.pr_detail.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // md_code
+            // 
+            this.md_code.DataPropertyName = "md_code";
+            this.md_code.HeaderText = "";
+            this.md_code.Name = "md_code";
+            this.md_code.ReadOnly = true;
+            this.md_code.Visible = false;
+            // 
+            // MD_DOWNMAN
+            // 
+            this.MD_DOWNMAN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.MD_DOWNMAN.HeaderText = "";
+            this.MD_DOWNMAN.MinimumWidth = 2;
+            this.MD_DOWNMAN.Name = "MD_DOWNMAN";
+            this.MD_DOWNMAN.ReadOnly = true;
+            this.MD_DOWNMAN.Width = 2;
+            // 
+            // inputreson
+            // 
+            this.inputreson.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.inputreson.Location = new System.Drawing.Point(122, 322);
+            this.inputreson.Name = "inputreson";
+            this.inputreson.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
+            this.inputreson.Size = new System.Drawing.Size(295, 124);
+            this.inputreson.TabIndex = 212;
+            this.inputreson.Text = "";
+            // 
+            // sum
+            // 
+            this.sum.AutoSize = true;
+            this.sum.CutLength = null;
+            this.sum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.sum.Location = new System.Drawing.Point(136, 293);
+            this.sum.MaximumSize = new System.Drawing.Size(200, 0);
+            this.sum.Name = "sum";
+            this.sum.Size = new System.Drawing.Size(0, 21);
+            this.sum.TabIndex = 228;
+            // 
+            // choosenum
+            // 
+            this.choosenum.AutoSize = true;
+            this.choosenum.CutLength = null;
+            this.choosenum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.choosenum.Location = new System.Drawing.Point(238, 294);
+            this.choosenum.MaximumSize = new System.Drawing.Size(200, 0);
+            this.choosenum.Name = "choosenum";
+            this.choosenum.Size = new System.Drawing.Size(0, 21);
+            this.choosenum.TabIndex = 229;
+            // 
+            // Make_MakeCancelDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(872, 533);
+            this.Controls.Add(this.choosenum);
+            this.Controls.Add(this.sum);
+            this.Controls.Add(this.已选);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.ChooseAll);
+            this.Controls.Add(this.sn_code_rb);
+            this.Controls.Add(this.md_code_rb);
+            this.Controls.Add(this.mdcode);
+            this.Controls.Add(this.Sure);
+            this.Controls.Add(this.OperateResult);
+            this.Controls.Add(this.sn_code);
+            this.Controls.Add(this.ms_makecode);
+            this.Controls.Add(this.pr_code);
+            this.Controls.Add(this.LabelDataGridView);
+            this.Controls.Add(this.inputreson);
+            this.Controls.Add(this.md_reson);
+            this.Controls.Add(this.make_count);
+            this.Controls.Add(this.count_label);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Name = "Make_MakeCancelDown";
+            this.Tag = "Make!MakeCancelDown";
+            this.Text = "Make_MakeCancelDown";
+            this.Load += new System.EventHandler(this.Make_MakeCancelDown_Load);
+            this.SizeChanged += new System.EventHandler(this.Make_MakeCancelDown_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
+        private CustomControl.TextBoxWithIcon.EnterTextBox sn_code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.Label ms_makecode;
+        private System.Windows.Forms.Label pr_code;
+        private System.Windows.Forms.DataGridView LabelDataGridView;
+        private CustomControl.RichText.RichTextAutoBottom inputreson;
+        private System.Windows.Forms.Label md_reson;
+        private System.Windows.Forms.Label make_count;
+        private System.Windows.Forms.Label count_label;
+        private CustomControl.ButtonUtil.NormalButton Sure;
+        private CustomControl.TextBoxWithIcon.EnterTextBox mdcode;
+        private System.Windows.Forms.RadioButton md_code_rb;
+        private System.Windows.Forms.RadioButton sn_code_rb;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1;
+        private CustomControl.ButtonUtil.ChooseAllButton ChooseAll;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
+        private System.Windows.Forms.DataGridViewTextBoxColumn md_macode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn md_sncode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn md_prodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
+        private System.Windows.Forms.DataGridViewTextBoxColumn md_code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MD_DOWNMAN;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label 已选;
+        private CustomControl.ValueLabel.ValueLabel sum;
+        private CustomControl.ValueLabel.ValueLabel choosenum;
+    }
+}

+ 203 - 0
UAS-MES/FunctionCode/Make/Make_MakeCancelDown.cs

@@ -0,0 +1,203 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES.DataOperate;
+using UAS_MES.Entity;
+using UAS_MES.PublicMethod;
+
+namespace UAS_MES.Make
+{
+    public partial class Make_MakeCancelDown : Form
+    {
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        DataTable dt;
+
+        DataTable dt1;
+
+        DataTable dtbar;
+
+        LogStringBuilder sql = new LogStringBuilder();
+
+        DataHelper dh;
+
+
+        public Make_MakeCancelDown()
+        {
+            InitializeComponent();
+        }
+
+        private void Make_MakeCancelDown_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            dh = new DataHelper();
+            md_code_rb.Focus();
+            ChooseAll.ChooseAll(LabelDataGridView);
+        }
+
+        private void Make_MakeCancelDown_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        private void md_code_rb_Click(object sender, EventArgs e)
+        {
+            if (((RadioButton)sender).Checked == true)
+            {
+                if (((RadioButton)sender).Name == "md_code_rb")
+                {
+                    BaseUtil.CleanForm(this);
+                    inputreson.Text = "";
+                    mdcode.Enabled = true;
+                    sn_code.Enabled = false;
+                    mdcode.Focus();
+                }
+                else if (((RadioButton)sender).Name == "sn_code_rb")
+                {
+                    BaseUtil.CleanForm(this);
+                    inputreson.Text = "";
+                    sn_code.Enabled = true;
+                    mdcode.Enabled = false;
+                    sn_code.Focus();
+                }
+            }
+        }
+
+        private void md_code_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (dh.CheckExist("MakeDown", "md_code = '" + mdcode.Text + "'"))
+                {
+                    sql.Clear();
+                    sql.Append("select md_code,md_sncode,md_macode,md_prodcode,pr_detail from makedown left join product on pr_code=md_prodcode where md_code='" + mdcode.Text + "' and md_status=-1");
+                    dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                    if (dt1.Rows.Count > 0)
+                    {
+                        BaseUtil.FillDgvWithDataTable(LabelDataGridView, dt1);
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(">>事件号" + mdcode.Text + "无未取消下地的数据\n", Color.Red);
+                        BaseUtil.CleanDGVData(LabelDataGridView);
+                    }
+                    sum.Text = dt1.Rows.Count.ToString();
+                }
+                else
+                {
+                    OperateResult.AppendText(">>事件号" + mdcode.Text + "不存在\n", Color.Red);
+                }
+            }
+        }
+
+        private void sn_code_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                sql.Clear();
+                sql.Append("select md_code,md_sncode,md_macode,md_prodcode,pr_detail from makedown left join product on pr_code=md_prodcode where md_sncode='" + sn_code.Text + "' and md_status=-1");
+                dtbar = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dtbar.Rows.Count > 0)
+                {
+                    BaseUtil.FillDgvWithDataTable(LabelDataGridView, dtbar);
+                }
+                else
+                {
+                    OperateResult.AppendText(">>序列号" + sn_code.Text + "无未取消下地的数据\n", Color.Red);
+                }
+                sum.Text = dtbar.Rows.Count.ToString();
+            }
+        }
+
+        private void Sure_Click(object sender, EventArgs e)
+        {
+            if (inputreson.Text.Trim() != "")
+            {
+                Boolean cancle = false;
+                Boolean haveclick = false;
+                for (int i = 0; i < LabelDataGridView.Rows.Count; i++)
+                {
+                    if (LabelDataGridView.Rows[i].Cells["Choose"].Value != null)
+                    {
+                        if ((Boolean)LabelDataGridView.Rows[i].Cells["Choose"].Value == true)
+                        {
+                            haveclick = true;
+                        }
+                    }
+                }
+                if (!haveclick)
+                {
+                    OperateResult.AppendText("没有勾选下地记录\n", Color.Red);
+                    return;
+                }
+                for (int i = 0; i < LabelDataGridView.Rows.Count; i++)
+                {
+                    if (LabelDataGridView.Rows[i].Cells["Choose"].Value != null)
+                    {
+                        if ((Boolean)LabelDataGridView.Rows[i].Cells["Choose"].Value == true)
+                        {
+                            //更新取消下地原因
+                            dh.UpdateByCondition("makedown", "md_status=0,MD_UPREASON='" + inputreson.Text + "', MD_UPDATE=sysdate, MD_UPMAN='" + User.UserCode + "' ", " md_code = '" + LabelDataGridView.Rows[i].Cells["md_code"].Value.ToString() + "' and md_sncode = '" + LabelDataGridView.Rows[i].Cells["md_sncode"].Value.ToString() + "'");
+                            //更新序列号状态
+                            sql.Clear();
+                            sql.Append("update makeserial set ms_downstatus=0 where ms_sncode='" + LabelDataGridView.Rows[i].Cells["md_sncode"].Value.ToString() + "' and ms_makecode='" + LabelDataGridView.Rows[i].Cells["md_macode"].Value.ToString() + "'");
+                            dh.ExecuteSql(sql.GetString(), "update");
+                        }
+                    }
+                }
+
+                if (sn_code.Enabled)
+                {
+                    OperateResult.AppendText("序列号" + sn_code.Text + "取消下地成功\n", Color.Green);
+                    sn_code.Text = "";
+                    sn_code.Focus();
+                    inputreson.Text = "";
+                    sum.Text = "";
+                    choosenum.Text = "";
+                    BaseUtil.CleanDGVData(LabelDataGridView);
+                }
+                else if (mdcode.Enabled)
+                {
+                    sum.Text = "";
+                    choosenum.Text = "";
+                    OperateResult.AppendText("事件号" + mdcode.Text + "取消下地成功\n", Color.Green);
+                    mdcode.Focus();
+                    md_code_KeyDown(sender, new KeyEventArgs(Keys.Enter));
+                }
+            }
+            else
+            {
+                OperateResult.AppendText("没有填写下地原因\n", Color.Red);
+                return;
+            }
+        }
+
+        private void LabelDataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
+        {
+            int choosecount = 0;
+            for (int i = 0; i < LabelDataGridView.Rows.Count; i++)
+            {
+                if (LabelDataGridView.Rows[i].Cells["Choose"].Value != null)
+                {
+                    if ((Boolean)LabelDataGridView.Rows[i].Cells["Choose"].Value == true)
+                    {
+                        choosecount++;
+                    }
+                }
+            }
+            choosenum.Text = choosecount.ToString();
+        }
+
+        private void LabelDataGridView_CurrentCellDirtyStateChanged(object sender, EventArgs e)
+        {
+            if (LabelDataGridView.IsCurrentCellDirty) {
+                LabelDataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
+            }
+        }
+    }
+}

+ 201 - 0
UAS-MES/FunctionCode/Make/Make_MakeCancelDown.resx

@@ -0,0 +1,201 @@
+<?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="Choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="md_macode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="md_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="md_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="md_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MD_DOWNMAN.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="Sure.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="Sure.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="Sure.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>
+  <metadata name="Choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="md_macode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="md_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="md_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="md_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MD_DOWNMAN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

+ 40 - 18
UAS-MES/FunctionCode/Make/Make_MakeDown.Designer.cs

@@ -43,11 +43,13 @@
             this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.inputreson = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.md_macode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.md_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.md_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.inputreson = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.MD_DOWNMAN = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).BeginInit();
             this.SuspendLayout();
             // 
@@ -113,7 +115,8 @@
             this.md_macode,
             this.md_sncode,
             this.md_prodcode,
-            this.pr_detail});
+            this.pr_detail,
+            this.MD_DOWNMAN});
             this.LabelDataGridView.Location = new System.Drawing.Point(22, 193);
             this.LabelDataGridView.Name = "LabelDataGridView";
             this.LabelDataGridView.RowHeadersVisible = false;
@@ -152,37 +155,38 @@
             // 
             // dataGridViewTextBoxColumn1
             // 
+            this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.dataGridViewTextBoxColumn1.DataPropertyName = "md_macode";
             this.dataGridViewTextBoxColumn1.HeaderText = "工单编号";
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
             this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn1.Width = 80;
             // 
             // dataGridViewTextBoxColumn2
             // 
+            this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.dataGridViewTextBoxColumn2.DataPropertyName = "md_sncode";
             this.dataGridViewTextBoxColumn2.HeaderText = "序列号";
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
             this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn2.Width = 80;
             // 
             // dataGridViewTextBoxColumn3
             // 
+            this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.dataGridViewTextBoxColumn3.DataPropertyName = "md_prodcode";
             this.dataGridViewTextBoxColumn3.HeaderText = "产品代码";
             this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
             this.dataGridViewTextBoxColumn3.ReadOnly = true;
             this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn3.Width = 80;
             // 
             // dataGridViewTextBoxColumn4
             // 
+            this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.dataGridViewTextBoxColumn4.DataPropertyName = "pr_detail";
             this.dataGridViewTextBoxColumn4.HeaderText = "产品名称";
+            this.dataGridViewTextBoxColumn4.MinimumWidth = 80;
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
             this.dataGridViewTextBoxColumn4.ReadOnly = true;
             this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn4.Width = 80;
             // 
             // OperateResult
             // 
@@ -208,49 +212,65 @@
             this.sn_code.TabIndex = 201;
             this.sn_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sn_code_KeyDown);
             // 
+            // inputreson
+            // 
+            this.inputreson.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.inputreson.Location = new System.Drawing.Point(87, 51);
+            this.inputreson.Name = "inputreson";
+            this.inputreson.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
+            this.inputreson.Size = new System.Drawing.Size(253, 124);
+            this.inputreson.TabIndex = 199;
+            this.inputreson.Text = "";
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.dataGridViewTextBoxColumn5.HeaderText = "";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.Width = 5;
+            // 
             // md_macode
             // 
+            this.md_macode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.md_macode.DataPropertyName = "md_macode";
             this.md_macode.HeaderText = "工单编号";
             this.md_macode.Name = "md_macode";
             this.md_macode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.md_macode.Width = 80;
             // 
             // md_sncode
             // 
+            this.md_sncode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.md_sncode.DataPropertyName = "md_sncode";
             this.md_sncode.HeaderText = "序列号";
             this.md_sncode.Name = "md_sncode";
             this.md_sncode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.md_sncode.Width = 80;
             // 
             // md_prodcode
             // 
+            this.md_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.md_prodcode.DataPropertyName = "md_prodcode";
             this.md_prodcode.HeaderText = "产品代码";
             this.md_prodcode.Name = "md_prodcode";
             this.md_prodcode.ReadOnly = true;
             this.md_prodcode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.md_prodcode.Width = 80;
             // 
             // pr_detail
             // 
+            this.pr_detail.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.pr_detail.DataPropertyName = "pr_detail";
             this.pr_detail.HeaderText = "产品名称";
+            this.pr_detail.MinimumWidth = 80;
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.ReadOnly = true;
             this.pr_detail.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.pr_detail.Width = 80;
             // 
-            // inputreson
+            // MD_DOWNMAN
             // 
-            this.inputreson.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inputreson.Location = new System.Drawing.Point(87, 51);
-            this.inputreson.Name = "inputreson";
-            this.inputreson.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
-            this.inputreson.Size = new System.Drawing.Size(253, 124);
-            this.inputreson.TabIndex = 199;
-            this.inputreson.Text = "";
+            this.MD_DOWNMAN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.MD_DOWNMAN.HeaderText = "";
+            this.MD_DOWNMAN.MinimumWidth = 2;
+            this.MD_DOWNMAN.Name = "MD_DOWNMAN";
+            this.MD_DOWNMAN.Width = 2;
             // 
             // Make_MakeDown
             // 
@@ -299,9 +319,11 @@
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private System.Windows.Forms.Label pr_code;
         private System.Windows.Forms.Label ms_makecode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
         private System.Windows.Forms.DataGridViewTextBoxColumn md_macode;
         private System.Windows.Forms.DataGridViewTextBoxColumn md_sncode;
         private System.Windows.Forms.DataGridViewTextBoxColumn md_prodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MD_DOWNMAN;
     }
 }

+ 1 - 0
UAS-MES/FunctionCode/Make/Make_MakeDown.cs

@@ -100,6 +100,7 @@ namespace UAS_MES.Make
                                 //更新数量
                                 count++;
                                 make_count.Text = count + "";
+                                sn_code.Text = "";
                                 loadGrid();
                             }
                             else {

+ 3 - 0
UAS-MES/FunctionCode/Make/Make_MakeDown.resx

@@ -129,4 +129,7 @@
   <metadata name="pr_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MD_DOWNMAN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>