From c2c4bb6ff92c85b5f9da1422cade8af355405404 Mon Sep 17 00:00:00 2001 From: wells.liu <wells.liu@broconcentric.com> Date: 星期二, 14 七月 2020 18:10:46 +0800 Subject: [PATCH] 测量结果 界面设计开发 --- src/Bro.M071.Process/UI/M071_DataForm.resx | 30 ++ src/Bro.M071.Process/UI/M071_DataForm.cs | 10 src/Bro.M071.Process/UI/M071_DataForm.Designer.cs | 569 ++++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 478 insertions(+), 131 deletions(-) diff --git a/src/Bro.M071.Process/UI/M071_DataForm.Designer.cs b/src/Bro.M071.Process/UI/M071_DataForm.Designer.cs index 152e966..d8186a4 100644 --- a/src/Bro.M071.Process/UI/M071_DataForm.Designer.cs +++ b/src/Bro.M071.Process/UI/M071_DataForm.Designer.cs @@ -28,6 +28,8 @@ /// </summary> private void InitializeComponent() { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); @@ -40,7 +42,23 @@ this.buttonToFirstPage = new System.Windows.Forms.Button(); this.labelTotal = new System.Windows.Forms.Label(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.dateTimePEndTime = new System.Windows.Forms.DateTimePicker(); + this.label9 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.textBoxPBarCode = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.buttonQuery = new System.Windows.Forms.Button(); + this.textBoxPCode = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.comboBoxPResult = new System.Windows.Forms.ComboBox(); + this.labelPTime = new System.Windows.Forms.Label(); + this.dateTimePStartTime = new System.Windows.Forms.DateTimePicker(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.groupBox2 = new System.Windows.Forms.GroupBox(); @@ -50,20 +68,26 @@ this.button6 = new System.Windows.Forms.Button(); this.button7 = new System.Windows.Forms.Button(); this.button8 = new System.Windows.Forms.Button(); - this.label2 = new System.Windows.Forms.Label(); this.dataGridView2 = new System.Windows.Forms.DataGridView(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.buttonQuery = new System.Windows.Forms.Button(); - this.textBoxPCode = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.textBoxPBarCode = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); - this.comboBoxPResult = new System.Windows.Forms.ComboBox(); - this.labelPTime = new System.Windows.Forms.Label(); - this.dateTimePStartTime = new System.Windows.Forms.DateTimePicker(); - this.label9 = new System.Windows.Forms.Label(); - this.dateTimePEndTime = new System.Windows.Forms.DateTimePicker(); + this.label10 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.textBoxPCode_MR = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.textBoxtextBoxPBarCode_MR = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.comboBoxResult_MR = new System.Windows.Forms.ComboBox(); + this.label8 = new System.Windows.Forms.Label(); + this.textBoxMeasurementName_MR = new System.Windows.Forms.TextBox(); + this.label11 = new System.Windows.Forms.Label(); + this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); + this.label12 = new System.Windows.Forms.Label(); + this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); + this.buttonQuery_MR = new System.Windows.Forms.Button(); + this.comboBoxMeasurementType_MR = new System.Windows.Forms.ComboBox(); + this.labelTotal_MR = new System.Windows.Forms.Label(); + this.buttonExport_MR = new System.Windows.Forms.Button(); + this.panel3 = new System.Windows.Forms.Panel(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); @@ -74,6 +98,8 @@ this.tableLayoutPanel3.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit(); + this.tableLayoutPanel4.SuspendLayout(); + this.panel3.SuspendLayout(); this.SuspendLayout(); // // tabControl1 @@ -144,6 +170,8 @@ // // textBoxPageNum // + this.textBoxPageNum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); this.textBoxPageNum.Location = new System.Drawing.Point(542, 2); this.textBoxPageNum.Name = "textBoxPageNum"; this.textBoxPageNum.Size = new System.Drawing.Size(80, 21); @@ -151,6 +179,8 @@ // // buttonToLastPage // + this.buttonToLastPage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); this.buttonToLastPage.Location = new System.Drawing.Point(693, 0); this.buttonToLastPage.Name = "buttonToLastPage"; this.buttonToLastPage.Size = new System.Drawing.Size(55, 23); @@ -160,6 +190,8 @@ // // buttonToNextPage // + this.buttonToNextPage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); this.buttonToNextPage.Location = new System.Drawing.Point(632, 1); this.buttonToNextPage.Name = "buttonToNextPage"; this.buttonToNextPage.Size = new System.Drawing.Size(55, 23); @@ -169,6 +201,8 @@ // // buttonToBeforePage // + this.buttonToBeforePage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); this.buttonToBeforePage.Location = new System.Drawing.Point(477, 1); this.buttonToBeforePage.Name = "buttonToBeforePage"; this.buttonToBeforePage.Size = new System.Drawing.Size(55, 23); @@ -178,6 +212,8 @@ // // buttonToFirstPage // + this.buttonToFirstPage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); this.buttonToFirstPage.Location = new System.Drawing.Point(416, 1); this.buttonToFirstPage.Name = "buttonToFirstPage"; this.buttonToFirstPage.Size = new System.Drawing.Size(55, 23); @@ -201,6 +237,12 @@ this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.MenuBar; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5}); this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.Location = new System.Drawing.Point(3, 73); this.dataGridView1.Name = "dataGridView1"; @@ -208,6 +250,49 @@ this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.Size = new System.Drawing.Size(751, 579); this.dataGridView1.TabIndex = 2; + // + // Column1 + // + this.Column1.DataPropertyName = "ProductionCode"; + this.Column1.HeaderText = "浜у搧缂栫爜"; + this.Column1.Name = "Column1"; + this.Column1.ReadOnly = true; + // + // Column2 + // + this.Column2.DataPropertyName = "ProductionBarcode"; + this.Column2.HeaderText = "浜у搧鏉$爜"; + this.Column2.Name = "Column2"; + this.Column2.ReadOnly = true; + // + // Column3 + // + this.Column3.DataPropertyName = "ProductionResult"; + this.Column3.HeaderText = "浜у搧缁撴灉"; + this.Column3.Name = "Column3"; + this.Column3.ReadOnly = true; + // + // Column4 + // + this.Column4.DataPropertyName = "OperationStartTime"; + dataGridViewCellStyle3.Format = "G"; + dataGridViewCellStyle3.NullValue = null; + this.Column4.DefaultCellStyle = dataGridViewCellStyle3; + this.Column4.HeaderText = "鐢熶骇鏃堕棿(寮�濮�)"; + this.Column4.Name = "Column4"; + this.Column4.ReadOnly = true; + this.Column4.Width = 120; + // + // Column5 + // + this.Column5.DataPropertyName = "OperationEndTime"; + dataGridViewCellStyle4.Format = "G"; + dataGridViewCellStyle4.NullValue = null; + this.Column5.DefaultCellStyle = dataGridViewCellStyle4; + this.Column5.HeaderText = "鐢熶骇鏃堕棿(缁撴潫)"; + this.Column5.Name = "Column5"; + this.Column5.ReadOnly = true; + this.Column5.Width = 120; // // tableLayoutPanel2 // @@ -239,6 +324,126 @@ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.Size = new System.Drawing.Size(751, 64); this.tableLayoutPanel2.TabIndex = 3; + // + // dateTimePEndTime + // + this.dateTimePEndTime.CalendarFont = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.dateTimePEndTime.Dock = System.Windows.Forms.DockStyle.Fill; + this.dateTimePEndTime.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.dateTimePEndTime.Location = new System.Drawing.Point(260, 35); + this.dateTimePEndTime.Name = "dateTimePEndTime"; + this.dateTimePEndTime.Size = new System.Drawing.Size(111, 24); + this.dateTimePEndTime.TabIndex = 12; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Dock = System.Windows.Forms.DockStyle.Fill; + this.label9.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.label9.Location = new System.Drawing.Point(190, 32); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(64, 32); + this.label9.TabIndex = 11; + this.label9.Text = "~"; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Dock = System.Windows.Forms.DockStyle.Fill; + this.label5.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.label5.Location = new System.Drawing.Point(377, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(64, 32); + this.label5.TabIndex = 5; + this.label5.Text = "浜у搧缁撴灉"; + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxPBarCode + // + this.textBoxPBarCode.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBoxPBarCode.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.textBoxPBarCode.Location = new System.Drawing.Point(260, 3); + this.textBoxPBarCode.Name = "textBoxPBarCode"; + this.textBoxPBarCode.Size = new System.Drawing.Size(111, 24); + this.textBoxPBarCode.TabIndex = 4; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Dock = System.Windows.Forms.DockStyle.Fill; + this.label4.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.label4.Location = new System.Drawing.Point(190, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(64, 32); + this.label4.TabIndex = 3; + this.label4.Text = "浜у搧鏉$爜"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // buttonQuery + // + this.buttonQuery.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.buttonQuery.Location = new System.Drawing.Point(673, 35); + this.buttonQuery.Name = "buttonQuery"; + this.buttonQuery.Size = new System.Drawing.Size(75, 26); + this.buttonQuery.TabIndex = 0; + this.buttonQuery.Text = "鏌ヨ"; + this.buttonQuery.UseVisualStyleBackColor = true; + this.buttonQuery.Click += new System.EventHandler(this.buttonQuery_Click); + // + // textBoxPCode + // + this.textBoxPCode.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBoxPCode.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.textBoxPCode.Location = new System.Drawing.Point(73, 3); + this.textBoxPCode.Name = "textBoxPCode"; + this.textBoxPCode.Size = new System.Drawing.Size(111, 24); + this.textBoxPCode.TabIndex = 1; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Dock = System.Windows.Forms.DockStyle.Fill; + this.label3.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(3, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(64, 32); + this.label3.TabIndex = 2; + this.label3.Text = "浜у搧缂栫爜"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // comboBoxPResult + // + this.comboBoxPResult.Dock = System.Windows.Forms.DockStyle.Fill; + this.comboBoxPResult.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.comboBoxPResult.FormattingEnabled = true; + this.comboBoxPResult.Location = new System.Drawing.Point(447, 3); + this.comboBoxPResult.Name = "comboBoxPResult"; + this.comboBoxPResult.Size = new System.Drawing.Size(111, 25); + this.comboBoxPResult.TabIndex = 6; + // + // labelPTime + // + this.labelPTime.AutoSize = true; + this.labelPTime.Dock = System.Windows.Forms.DockStyle.Fill; + this.labelPTime.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.labelPTime.Location = new System.Drawing.Point(3, 32); + this.labelPTime.Name = "labelPTime"; + this.labelPTime.Size = new System.Drawing.Size(64, 32); + this.labelPTime.TabIndex = 7; + this.labelPTime.Text = "鐢熶骇鏃堕棿"; + this.labelPTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // dateTimePStartTime + // + this.dateTimePStartTime.CalendarFont = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.dateTimePStartTime.Dock = System.Windows.Forms.DockStyle.Fill; + this.dateTimePStartTime.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.dateTimePStartTime.Location = new System.Drawing.Point(73, 35); + this.dateTimePStartTime.Name = "dateTimePStartTime"; + this.dateTimePStartTime.Size = new System.Drawing.Size(111, 24); + this.dateTimePStartTime.TabIndex = 8; // // tabPage2 // @@ -283,12 +488,12 @@ // // panel2 // + this.panel2.Controls.Add(this.labelTotal_MR); this.panel2.Controls.Add(this.textBox2); this.panel2.Controls.Add(this.button5); this.panel2.Controls.Add(this.button6); this.panel2.Controls.Add(this.button7); this.panel2.Controls.Add(this.button8); - this.panel2.Controls.Add(this.label2); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(3, 658); this.panel2.Name = "panel2"; @@ -338,16 +543,6 @@ this.button8.Text = "绗竴椤�"; this.button8.UseVisualStyleBackColor = true; // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 3); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(42, 17); - this.label2.TabIndex = 0; - this.label2.Text = "label2"; - // // dataGridView2 // this.dataGridView2.AllowUserToAddRows = false; @@ -373,6 +568,21 @@ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.625F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.375F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.625F)); + this.tableLayoutPanel4.Controls.Add(this.comboBoxMeasurementType_MR, 0, 1); + this.tableLayoutPanel4.Controls.Add(this.label10, 0, 1); + this.tableLayoutPanel4.Controls.Add(this.label1, 0, 0); + this.tableLayoutPanel4.Controls.Add(this.textBoxPCode_MR, 1, 0); + this.tableLayoutPanel4.Controls.Add(this.label6, 2, 0); + this.tableLayoutPanel4.Controls.Add(this.textBoxtextBoxPBarCode_MR, 3, 0); + this.tableLayoutPanel4.Controls.Add(this.label7, 4, 0); + this.tableLayoutPanel4.Controls.Add(this.comboBoxResult_MR, 5, 0); + this.tableLayoutPanel4.Controls.Add(this.label8, 6, 0); + this.tableLayoutPanel4.Controls.Add(this.textBoxMeasurementName_MR, 7, 0); + this.tableLayoutPanel4.Controls.Add(this.label11, 2, 1); + this.tableLayoutPanel4.Controls.Add(this.dateTimePicker1, 3, 1); + this.tableLayoutPanel4.Controls.Add(this.label12, 4, 1); + this.tableLayoutPanel4.Controls.Add(this.dateTimePicker2, 5, 1); + this.tableLayoutPanel4.Controls.Add(this.panel3, 6, 1); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 3); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; @@ -383,120 +593,198 @@ this.tableLayoutPanel4.Size = new System.Drawing.Size(751, 64); this.tableLayoutPanel4.TabIndex = 3; // - // buttonQuery + // label10 // - this.buttonQuery.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.label10.AutoSize = true; + this.label10.Dock = System.Windows.Forms.DockStyle.Fill; + this.label10.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.label10.Location = new System.Drawing.Point(3, 32); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(64, 32); + this.label10.TabIndex = 12; + this.label10.Text = " 妫�娴嬬被鍨�"; + this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Dock = System.Windows.Forms.DockStyle.Fill; + this.label1.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(3, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(64, 32); + this.label1.TabIndex = 3; + this.label1.Text = "浜у搧缂栫爜"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxPCode_MR + // + this.textBoxPCode_MR.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBoxPCode_MR.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.textBoxPCode_MR.Location = new System.Drawing.Point(73, 3); + this.textBoxPCode_MR.Name = "textBoxPCode_MR"; + this.textBoxPCode_MR.Size = new System.Drawing.Size(111, 24); + this.textBoxPCode_MR.TabIndex = 4; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Dock = System.Windows.Forms.DockStyle.Fill; + this.label6.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.label6.Location = new System.Drawing.Point(190, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(64, 32); + this.label6.TabIndex = 5; + this.label6.Text = "浜у搧鏉$爜"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxtextBoxPBarCode_MR + // + this.textBoxtextBoxPBarCode_MR.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBoxtextBoxPBarCode_MR.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.textBoxtextBoxPBarCode_MR.Location = new System.Drawing.Point(260, 3); + this.textBoxtextBoxPBarCode_MR.Name = "textBoxtextBoxPBarCode_MR"; + this.textBoxtextBoxPBarCode_MR.Size = new System.Drawing.Size(111, 24); + this.textBoxtextBoxPBarCode_MR.TabIndex = 7; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Dock = System.Windows.Forms.DockStyle.Fill; + this.label7.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(377, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(64, 32); + this.label7.TabIndex = 8; + this.label7.Text = "妫�娴嬬粨鏋�"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // comboBoxResult_MR + // + this.comboBoxResult_MR.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.comboBoxResult_MR.FormattingEnabled = true; + this.comboBoxResult_MR.Location = new System.Drawing.Point(447, 3); + this.comboBoxResult_MR.Name = "comboBoxResult_MR"; + this.comboBoxResult_MR.Size = new System.Drawing.Size(111, 25); + this.comboBoxResult_MR.TabIndex = 9; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Dock = System.Windows.Forms.DockStyle.Fill; + this.label8.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.label8.Location = new System.Drawing.Point(564, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(64, 32); + this.label8.TabIndex = 10; + this.label8.Text = "妫�娴嬪悕绉�"; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxMeasurementName_MR + // + this.textBoxMeasurementName_MR.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBoxMeasurementName_MR.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.textBoxMeasurementName_MR.Location = new System.Drawing.Point(634, 3); + this.textBoxMeasurementName_MR.Name = "textBoxMeasurementName_MR"; + this.textBoxMeasurementName_MR.Size = new System.Drawing.Size(114, 24); + this.textBoxMeasurementName_MR.TabIndex = 11; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Dock = System.Windows.Forms.DockStyle.Fill; + this.label11.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.label11.Location = new System.Drawing.Point(190, 32); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(64, 32); + this.label11.TabIndex = 14; + this.label11.Text = "鐢熶骇鏃堕棿"; + this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // dateTimePicker1 + // + this.dateTimePicker1.CalendarFont = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.dateTimePicker1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dateTimePicker1.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.dateTimePicker1.Location = new System.Drawing.Point(260, 35); + this.dateTimePicker1.Name = "dateTimePicker1"; + this.dateTimePicker1.Size = new System.Drawing.Size(111, 24); + this.dateTimePicker1.TabIndex = 15; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Dock = System.Windows.Forms.DockStyle.Fill; + this.label12.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(377, 32); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(64, 32); + this.label12.TabIndex = 16; + this.label12.Text = "~"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // dateTimePicker2 + // + this.dateTimePicker2.CalendarFont = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.dateTimePicker2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dateTimePicker2.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.dateTimePicker2.Location = new System.Drawing.Point(447, 35); + this.dateTimePicker2.Name = "dateTimePicker2"; + this.dateTimePicker2.Size = new System.Drawing.Size(111, 24); + this.dateTimePicker2.TabIndex = 17; + // + // buttonQuery_MR + // + this.buttonQuery_MR.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); - this.buttonQuery.Location = new System.Drawing.Point(673, 35); - this.buttonQuery.Name = "buttonQuery"; - this.buttonQuery.Size = new System.Drawing.Size(75, 26); - this.buttonQuery.TabIndex = 0; - this.buttonQuery.Text = "鏌ヨ"; - this.buttonQuery.UseVisualStyleBackColor = true; - this.buttonQuery.Click += new System.EventHandler(this.buttonQuery_Click); + this.buttonQuery_MR.Location = new System.Drawing.Point(110, -1); + this.buttonQuery_MR.Name = "buttonQuery_MR"; + this.buttonQuery_MR.Size = new System.Drawing.Size(75, 26); + this.buttonQuery_MR.TabIndex = 18; + this.buttonQuery_MR.Text = "鏌ヨ"; + this.buttonQuery_MR.UseVisualStyleBackColor = true; // - // textBoxPCode + // comboBoxMeasurementType_MR // - this.textBoxPCode.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBoxPCode.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); - this.textBoxPCode.Location = new System.Drawing.Point(73, 3); - this.textBoxPCode.Name = "textBoxPCode"; - this.textBoxPCode.Size = new System.Drawing.Size(111, 24); - this.textBoxPCode.TabIndex = 1; + this.comboBoxMeasurementType_MR.Dock = System.Windows.Forms.DockStyle.Fill; + this.comboBoxMeasurementType_MR.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.comboBoxMeasurementType_MR.FormattingEnabled = true; + this.comboBoxMeasurementType_MR.Location = new System.Drawing.Point(73, 35); + this.comboBoxMeasurementType_MR.Name = "comboBoxMeasurementType_MR"; + this.comboBoxMeasurementType_MR.Size = new System.Drawing.Size(111, 25); + this.comboBoxMeasurementType_MR.TabIndex = 19; // - // label3 + // labelTotal_MR // - this.label3.AutoSize = true; - this.label3.Dock = System.Windows.Forms.DockStyle.Fill; - this.label3.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(64, 32); - this.label3.TabIndex = 2; - this.label3.Text = "浜у搧缂栫爜"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.labelTotal_MR.AutoSize = true; + this.labelTotal_MR.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); + this.labelTotal_MR.Location = new System.Drawing.Point(0, 3); + this.labelTotal_MR.Name = "labelTotal_MR"; + this.labelTotal_MR.Size = new System.Drawing.Size(97, 17); + this.labelTotal_MR.TabIndex = 3; + this.labelTotal_MR.Text = "鏁伴噺锛氭�婚〉鏁�:"; // - // label4 + // buttonExport_MR // - this.label4.AutoSize = true; - this.label4.Dock = System.Windows.Forms.DockStyle.Fill; - this.label4.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(190, 0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(64, 32); - this.label4.TabIndex = 3; - this.label4.Text = "浜у搧鏉$爜"; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.buttonExport_MR.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.buttonExport_MR.Location = new System.Drawing.Point(35, -1); + this.buttonExport_MR.Name = "buttonExport_MR"; + this.buttonExport_MR.Size = new System.Drawing.Size(64, 26); + this.buttonExport_MR.TabIndex = 18; + this.buttonExport_MR.Text = "瀵煎嚭"; + this.buttonExport_MR.UseVisualStyleBackColor = true; // - // textBoxPBarCode + // panel3 // - this.textBoxPBarCode.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBoxPBarCode.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); - this.textBoxPBarCode.Location = new System.Drawing.Point(260, 3); - this.textBoxPBarCode.Name = "textBoxPBarCode"; - this.textBoxPBarCode.Size = new System.Drawing.Size(111, 24); - this.textBoxPBarCode.TabIndex = 4; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Dock = System.Windows.Forms.DockStyle.Fill; - this.label5.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(377, 0); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(64, 32); - this.label5.TabIndex = 5; - this.label5.Text = "浜у搧缁撴灉"; - this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // comboBoxPResult - // - this.comboBoxPResult.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); - this.comboBoxPResult.FormattingEnabled = true; - this.comboBoxPResult.Location = new System.Drawing.Point(447, 3); - this.comboBoxPResult.Name = "comboBoxPResult"; - this.comboBoxPResult.Size = new System.Drawing.Size(111, 25); - this.comboBoxPResult.TabIndex = 6; - // - // labelPTime - // - this.labelPTime.AutoSize = true; - this.labelPTime.Dock = System.Windows.Forms.DockStyle.Fill; - this.labelPTime.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); - this.labelPTime.Location = new System.Drawing.Point(3, 32); - this.labelPTime.Name = "labelPTime"; - this.labelPTime.Size = new System.Drawing.Size(64, 32); - this.labelPTime.TabIndex = 7; - this.labelPTime.Text = "鐢熶骇鏃堕棿"; - this.labelPTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // dateTimePStartTime - // - this.dateTimePStartTime.CalendarFont = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); - this.dateTimePStartTime.Location = new System.Drawing.Point(73, 35); - this.dateTimePStartTime.Name = "dateTimePStartTime"; - this.dateTimePStartTime.Size = new System.Drawing.Size(111, 21); - this.dateTimePStartTime.TabIndex = 8; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Dock = System.Windows.Forms.DockStyle.Fill; - this.label9.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(190, 32); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(64, 32); - this.label9.TabIndex = 11; - this.label9.Text = "~"; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // dateTimePEndTime - // - this.dateTimePEndTime.CalendarFont = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134))); - this.dateTimePEndTime.Location = new System.Drawing.Point(260, 35); - this.dateTimePEndTime.Name = "dateTimePEndTime"; - this.dateTimePEndTime.Size = new System.Drawing.Size(111, 21); - this.dateTimePEndTime.TabIndex = 12; + this.tableLayoutPanel4.SetColumnSpan(this.panel3, 2); + this.panel3.Controls.Add(this.buttonExport_MR); + this.panel3.Controls.Add(this.buttonQuery_MR); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(564, 35); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(184, 26); + this.panel3.TabIndex = 20; // // M071_DataForm // @@ -519,6 +807,9 @@ this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).EndInit(); + this.tableLayoutPanel4.ResumeLayout(false); + this.tableLayoutPanel4.PerformLayout(); + this.panel3.ResumeLayout(false); this.ResumeLayout(false); } @@ -547,7 +838,6 @@ private System.Windows.Forms.Button button6; private System.Windows.Forms.Button button7; private System.Windows.Forms.Button button8; - private System.Windows.Forms.Label label2; private System.Windows.Forms.DataGridView dataGridView2; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; private System.Windows.Forms.Button buttonQuery; @@ -561,5 +851,28 @@ private System.Windows.Forms.ComboBox comboBoxPResult; private System.Windows.Forms.Label labelPTime; private System.Windows.Forms.DateTimePicker dateTimePStartTime; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox textBoxPCode_MR; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.ComboBox comboBoxResult_MR; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.TextBox textBoxtextBoxPBarCode_MR; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.TextBox textBoxMeasurementName_MR; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.DateTimePicker dateTimePicker1; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.DateTimePicker dateTimePicker2; + private System.Windows.Forms.Button buttonQuery_MR; + private System.Windows.Forms.ComboBox comboBoxMeasurementType_MR; + private System.Windows.Forms.Label labelTotal_MR; + private System.Windows.Forms.Button buttonExport_MR; + private System.Windows.Forms.Panel panel3; } } \ No newline at end of file diff --git a/src/Bro.M071.Process/UI/M071_DataForm.cs b/src/Bro.M071.Process/UI/M071_DataForm.cs index 7b14a76..e4ec30c 100644 --- a/src/Bro.M071.Process/UI/M071_DataForm.cs +++ b/src/Bro.M071.Process/UI/M071_DataForm.cs @@ -27,7 +27,7 @@ #region 浜у搧璁板綍 private void InitialProductionRecordsLayout() { - + comboBoxPResult.DataSource = new List<string>() { "", "OK", "NG" }; } private void buttonQuery_Click(object sender, EventArgs e) @@ -36,11 +36,14 @@ recordsRequest.ProductionCode = textBoxPCode.Text; recordsRequest.ProductionBarcode = textBoxPBarCode.Text; recordsRequest.ProductionResult = comboBoxPResult.SelectedItem?.ToString(); - recordsRequest.StartTime = dateTimePStartTime.Value; - recordsRequest.EndTime = dateTimePEndTime.Value; + recordsRequest.StartTime = Convert.ToDateTime(dateTimePStartTime.Value.ToString("D").ToString()); + recordsRequest.EndTime = Convert.ToDateTime(dateTimePEndTime.Value.AddDays(1).ToString("D").ToString()).AddSeconds(-1); var queryData = _productionMeasurementRecordsManager.GetProductionMeasurementRecords(recordsRequest); + dataGridView1.AutoGenerateColumns = false; dataGridView1.DataSource = queryData; + labelTotal.Text = $"鏁伴噺:{recordsRequest.TotalNum} 鎬婚〉鏁�:{recordsRequest.TotalPage}"; + textBoxPageNum.Text = recordsRequest.PageNum.ToString(); } #endregion @@ -51,5 +54,6 @@ } #endregion + } } diff --git a/src/Bro.M071.Process/UI/M071_DataForm.resx b/src/Bro.M071.Process/UI/M071_DataForm.resx index 1af7de1..859499d 100644 --- a/src/Bro.M071.Process/UI/M071_DataForm.resx +++ b/src/Bro.M071.Process/UI/M071_DataForm.resx @@ -117,4 +117,34 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> </root> \ No newline at end of file -- Gitblit v1.8.0