From c01cce7ac1dc691c6b667b298ce0637b924102ea Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期二, 14 七月 2020 16:29:09 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/UI/M071_DataForm.Designer.cs | 298 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 225 insertions(+), 73 deletions(-)
diff --git a/src/Bro.M071.Process/UI/M071_DataForm.Designer.cs b/src/Bro.M071.Process/UI/M071_DataForm.Designer.cs
index b475e6a..152e966 100644
--- a/src/Bro.M071.Process/UI/M071_DataForm.Designer.cs
+++ b/src/Bro.M071.Process/UI/M071_DataForm.Designer.cs
@@ -30,18 +30,18 @@
{
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
- this.tabPage2 = new System.Windows.Forms.TabPage();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.panel1 = new System.Windows.Forms.Panel();
- this.label1 = new System.Windows.Forms.Label();
- this.button1 = new System.Windows.Forms.Button();
- this.button2 = new System.Windows.Forms.Button();
- this.button3 = new System.Windows.Forms.Button();
- this.button4 = new System.Windows.Forms.Button();
- this.textBox1 = new System.Windows.Forms.TextBox();
+ this.textBoxPageNum = new System.Windows.Forms.TextBox();
+ this.buttonToLastPage = new System.Windows.Forms.Button();
+ this.buttonToNextPage = new System.Windows.Forms.Button();
+ this.buttonToBeforePage = new System.Windows.Forms.Button();
+ this.buttonToFirstPage = new System.Windows.Forms.Button();
+ this.labelTotal = new System.Windows.Forms.Label();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.panel2 = new System.Windows.Forms.Panel();
@@ -53,12 +53,24 @@
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.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
- this.tabPage2.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+ this.tableLayoutPanel2.SuspendLayout();
+ this.tabPage2.SuspendLayout();
this.tableLayoutPanel3.SuspendLayout();
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit();
@@ -85,17 +97,6 @@
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "浜у搧鐢熶骇璁板綍";
this.tabPage1.UseVisualStyleBackColor = true;
- //
- // tabPage2
- //
- this.tabPage2.Controls.Add(this.tableLayoutPanel3);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
- this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(1016, 691);
- this.tabPage2.TabIndex = 1;
- this.tabPage2.Text = "娴嬮噺缁撴灉鏁版嵁";
- this.tabPage2.UseVisualStyleBackColor = true;
//
// tableLayoutPanel1
//
@@ -129,70 +130,70 @@
//
// panel1
//
- this.panel1.Controls.Add(this.textBox1);
- this.panel1.Controls.Add(this.button4);
- this.panel1.Controls.Add(this.button3);
- this.panel1.Controls.Add(this.button2);
- this.panel1.Controls.Add(this.button1);
- this.panel1.Controls.Add(this.label1);
+ this.panel1.Controls.Add(this.textBoxPageNum);
+ this.panel1.Controls.Add(this.buttonToLastPage);
+ this.panel1.Controls.Add(this.buttonToNextPage);
+ this.panel1.Controls.Add(this.buttonToBeforePage);
+ this.panel1.Controls.Add(this.buttonToFirstPage);
+ this.panel1.Controls.Add(this.labelTotal);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(3, 658);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(751, 24);
this.panel1.TabIndex = 1;
//
- // label1
+ // textBoxPageNum
//
- this.label1.AutoSize = true;
- this.label1.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134)));
- this.label1.Location = new System.Drawing.Point(3, 3);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(42, 17);
- this.label1.TabIndex = 0;
- this.label1.Text = "label1";
+ this.textBoxPageNum.Location = new System.Drawing.Point(542, 2);
+ this.textBoxPageNum.Name = "textBoxPageNum";
+ this.textBoxPageNum.Size = new System.Drawing.Size(80, 21);
+ this.textBoxPageNum.TabIndex = 2;
//
- // button1
+ // buttonToLastPage
//
- this.button1.Location = new System.Drawing.Point(416, 1);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(55, 23);
- this.button1.TabIndex = 1;
- this.button1.Text = "绗竴椤�";
- this.button1.UseVisualStyleBackColor = true;
+ this.buttonToLastPage.Location = new System.Drawing.Point(693, 0);
+ this.buttonToLastPage.Name = "buttonToLastPage";
+ this.buttonToLastPage.Size = new System.Drawing.Size(55, 23);
+ this.buttonToLastPage.TabIndex = 1;
+ this.buttonToLastPage.Text = "鏈�鍚庨〉";
+ this.buttonToLastPage.UseVisualStyleBackColor = true;
//
- // button2
+ // buttonToNextPage
//
- this.button2.Location = new System.Drawing.Point(477, 1);
- this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(55, 23);
- this.button2.TabIndex = 1;
- this.button2.Text = "鍓嶄竴椤�";
- this.button2.UseVisualStyleBackColor = true;
+ this.buttonToNextPage.Location = new System.Drawing.Point(632, 1);
+ this.buttonToNextPage.Name = "buttonToNextPage";
+ this.buttonToNextPage.Size = new System.Drawing.Size(55, 23);
+ this.buttonToNextPage.TabIndex = 1;
+ this.buttonToNextPage.Text = "鍚庝竴椤�";
+ this.buttonToNextPage.UseVisualStyleBackColor = true;
//
- // button3
+ // buttonToBeforePage
//
- this.button3.Location = new System.Drawing.Point(632, 1);
- this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(55, 23);
- this.button3.TabIndex = 1;
- this.button3.Text = "鍚庝竴椤�";
- this.button3.UseVisualStyleBackColor = true;
+ this.buttonToBeforePage.Location = new System.Drawing.Point(477, 1);
+ this.buttonToBeforePage.Name = "buttonToBeforePage";
+ this.buttonToBeforePage.Size = new System.Drawing.Size(55, 23);
+ this.buttonToBeforePage.TabIndex = 1;
+ this.buttonToBeforePage.Text = "鍓嶄竴椤�";
+ this.buttonToBeforePage.UseVisualStyleBackColor = true;
//
- // button4
+ // buttonToFirstPage
//
- this.button4.Location = new System.Drawing.Point(693, 0);
- this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(55, 23);
- this.button4.TabIndex = 1;
- this.button4.Text = "鏈�鍚庨〉";
- this.button4.UseVisualStyleBackColor = true;
+ this.buttonToFirstPage.Location = new System.Drawing.Point(416, 1);
+ this.buttonToFirstPage.Name = "buttonToFirstPage";
+ this.buttonToFirstPage.Size = new System.Drawing.Size(55, 23);
+ this.buttonToFirstPage.TabIndex = 1;
+ this.buttonToFirstPage.Text = "绗竴椤�";
+ this.buttonToFirstPage.UseVisualStyleBackColor = true;
//
- // textBox1
+ // labelTotal
//
- this.textBox1.Location = new System.Drawing.Point(542, 2);
- this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(80, 21);
- this.textBox1.TabIndex = 2;
+ this.labelTotal.AutoSize = true;
+ this.labelTotal.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134)));
+ this.labelTotal.Location = new System.Drawing.Point(3, 3);
+ this.labelTotal.Name = "labelTotal";
+ this.labelTotal.Size = new System.Drawing.Size(97, 17);
+ this.labelTotal.TabIndex = 0;
+ this.labelTotal.Text = "鏁伴噺锛氭�婚〉鏁�:";
//
// dataGridView1
//
@@ -219,6 +220,17 @@
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.625F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.375F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.625F));
+ this.tableLayoutPanel2.Controls.Add(this.dateTimePEndTime, 3, 1);
+ this.tableLayoutPanel2.Controls.Add(this.label9, 2, 1);
+ this.tableLayoutPanel2.Controls.Add(this.label5, 4, 0);
+ this.tableLayoutPanel2.Controls.Add(this.textBoxPBarCode, 3, 0);
+ this.tableLayoutPanel2.Controls.Add(this.label4, 2, 0);
+ this.tableLayoutPanel2.Controls.Add(this.buttonQuery, 7, 1);
+ this.tableLayoutPanel2.Controls.Add(this.textBoxPCode, 1, 0);
+ this.tableLayoutPanel2.Controls.Add(this.label3, 0, 0);
+ this.tableLayoutPanel2.Controls.Add(this.comboBoxPResult, 5, 0);
+ this.tableLayoutPanel2.Controls.Add(this.labelPTime, 0, 1);
+ this.tableLayoutPanel2.Controls.Add(this.dateTimePStartTime, 1, 1);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 3);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
@@ -227,6 +239,17 @@
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;
+ //
+ // tabPage2
+ //
+ this.tabPage2.Controls.Add(this.tableLayoutPanel3);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(1016, 691);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "娴嬮噺缁撴灉鏁版嵁";
+ this.tabPage2.UseVisualStyleBackColor = true;
//
// tableLayoutPanel3
//
@@ -356,8 +379,124 @@
this.tableLayoutPanel4.RowCount = 2;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel4.Size = new System.Drawing.Size(751, 64);
this.tableLayoutPanel4.TabIndex = 3;
+ //
+ // 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;
+ //
+ // 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;
+ //
+ // 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;
+ //
+ // 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;
//
// M071_DataForm
//
@@ -369,11 +508,13 @@
this.Text = "M071_DataFrm";
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
- this.tabPage2.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+ this.tableLayoutPanel2.ResumeLayout(false);
+ this.tableLayoutPanel2.PerformLayout();
+ this.tabPage2.ResumeLayout(false);
this.tableLayoutPanel3.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
@@ -390,12 +531,12 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.TextBox textBox1;
- private System.Windows.Forms.Button button4;
- private System.Windows.Forms.Button button3;
- private System.Windows.Forms.Button button2;
- private System.Windows.Forms.Button button1;
- private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox textBoxPageNum;
+ private System.Windows.Forms.Button buttonToLastPage;
+ private System.Windows.Forms.Button buttonToNextPage;
+ private System.Windows.Forms.Button buttonToBeforePage;
+ private System.Windows.Forms.Button buttonToFirstPage;
+ private System.Windows.Forms.Label labelTotal;
private System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
@@ -409,5 +550,16 @@
private System.Windows.Forms.Label label2;
private System.Windows.Forms.DataGridView dataGridView2;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
+ private System.Windows.Forms.Button buttonQuery;
+ private System.Windows.Forms.TextBox textBoxPCode;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.DateTimePicker dateTimePEndTime;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.TextBox textBoxPBarCode;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.ComboBox comboBoxPResult;
+ private System.Windows.Forms.Label labelPTime;
+ private System.Windows.Forms.DateTimePicker dateTimePStartTime;
}
}
\ No newline at end of file
--
Gitblit v1.8.0