From 12200ec69e33881649974f31f270750ba6b15e1d Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:31 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Model/Migrations/202007140824439_initDB.cs | 3
src/Bro.M071.Process/UI/M071_DataForm.resx | 30 ++
src/Bro.M071.Model/Migrations/202007140824439_initDB.Designer.cs | 2
src/Bro.M071.Model/Migrations/202007140824439_initDB.resx | 2
src/Bro.M071.Process/UI/M071_DataForm.cs | 39 ++
src/Bro.M071.DBManager/MeasurementUnitResultManager.cs | 7
src/Bro.M071.Process/UI/M071_DataForm.Designer.cs | 637 ++++++++++++++++++++++++++++++++++++++++++------
src/Bro.M071.Model/Model/MeasurementUnitResult.cs | 21 -
src/Bro.M071.Model/Bro.M071.Model.csproj | 10
9 files changed, 634 insertions(+), 117 deletions(-)
diff --git a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
index 686a1e1..cfd2a15 100644
--- a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
+++ b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
@@ -29,7 +29,7 @@
{
}
- public List<MeasurementUnitResult_DTO> GetMeasurementUnitResult(MeasurementUnitResultRequest request)
+ public List<MeasurementUnitResult> GetMeasurementUnitResult(MeasurementUnitResultRequest request)
{
using (DBModel context = new DBModel())
{
@@ -59,7 +59,7 @@
}
if (!string.IsNullOrWhiteSpace(request.MeasurementResult))
{
- mList = mList.Where(u => u.MeasurementResult==request.MeasurementResult);
+ mList = mList.Where(u => u.MeasurementResult == request.MeasurementResult);
}
if (!string.IsNullOrWhiteSpace(request.MeasurementType))
{
@@ -70,11 +70,10 @@
join measurementUnitResult in mList
on productionMeasurementRecords.ID equals measurementUnitResult.ProductionMeasurementRecordsId
//into pmList
- select new MeasurementUnitResult_DTO
+ select new MeasurementUnitResult
{
ProductionCode = productionMeasurementRecords.ProductionCode,
ProductionBarcode = productionMeasurementRecords.ProductionBarcode
-
};
var pageList = query.OrderBy(u => u.CREATE_TIME).ToPagedList(request);
request.TotalNum = mList.Count();
diff --git a/src/Bro.M071.Model/Bro.M071.Model.csproj b/src/Bro.M071.Model/Bro.M071.Model.csproj
index 32a6e8a..7ed1f05 100644
--- a/src/Bro.M071.Model/Bro.M071.Model.csproj
+++ b/src/Bro.M071.Model/Bro.M071.Model.csproj
@@ -108,9 +108,9 @@
<ItemGroup>
<Compile Include="BaseModel.cs" />
<Compile Include="DBModel.cs" />
- <Compile Include="Migrations\202007130138484_initDB.cs" />
- <Compile Include="Migrations\202007130138484_initDB.designer.cs">
- <DependentUpon>202007130138484_initDB.cs</DependentUpon>
+ <Compile Include="Migrations\202007140824439_initDB.cs" />
+ <Compile Include="Migrations\202007140824439_initDB.designer.cs">
+ <DependentUpon>202007140824439_initDB.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\Configuration.cs" />
<Compile Include="Model\KeyUnitData.cs" />
@@ -132,8 +132,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Migrations\202007130138484_initDB.resx">
- <DependentUpon>202007130138484_initDB.cs</DependentUpon>
+ <EmbeddedResource Include="Migrations\202007140824439_initDB.resx">
+ <DependentUpon>202007140824439_initDB.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/Bro.M071.Model/Migrations/202007130138484_initDB.Designer.cs b/src/Bro.M071.Model/Migrations/202007140824439_initDB.Designer.cs
similarity index 93%
rename from src/Bro.M071.Model/Migrations/202007130138484_initDB.Designer.cs
rename to src/Bro.M071.Model/Migrations/202007140824439_initDB.Designer.cs
index b6a70bd..bc6916d 100644
--- a/src/Bro.M071.Model/Migrations/202007130138484_initDB.Designer.cs
+++ b/src/Bro.M071.Model/Migrations/202007140824439_initDB.Designer.cs
@@ -13,7 +13,7 @@
string IMigrationMetadata.Id
{
- get { return "202007130138484_initDB"; }
+ get { return "202007140824439_initDB"; }
}
string IMigrationMetadata.Source
diff --git a/src/Bro.M071.Model/Migrations/202007130138484_initDB.cs b/src/Bro.M071.Model/Migrations/202007140824439_initDB.cs
similarity index 94%
rename from src/Bro.M071.Model/Migrations/202007130138484_initDB.cs
rename to src/Bro.M071.Model/Migrations/202007140824439_initDB.cs
index bd7ca5e..01e4879 100644
--- a/src/Bro.M071.Model/Migrations/202007130138484_initDB.cs
+++ b/src/Bro.M071.Model/Migrations/202007140824439_initDB.cs
@@ -57,9 +57,6 @@
CREATE_TIME = c.DateTime(nullable: false),
UPDATE_USER = c.String(maxLength: 64),
UPDATE_TIME = c.DateTime(),
- ProductionCode = c.String(maxLength: 2147483647),
- ProductionBarcode = c.String(maxLength: 2147483647),
- Discriminator = c.String(nullable: false, maxLength: 128),
})
.PrimaryKey(t => t.ID);
diff --git a/src/Bro.M071.Model/Migrations/202007130138484_initDB.resx b/src/Bro.M071.Model/Migrations/202007140824439_initDB.resx
similarity index 70%
rename from src/Bro.M071.Model/Migrations/202007130138484_initDB.resx
rename to src/Bro.M071.Model/Migrations/202007140824439_initDB.resx
index 5d17729..6b09195 100644
--- a/src/Bro.M071.Model/Migrations/202007130138484_initDB.resx
+++ b/src/Bro.M071.Model/Migrations/202007140824439_initDB.resx
@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Target" xml:space="preserve">
- <value>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</value>
+ <value>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</value>
</data>
<data name="DefaultSchema" xml:space="preserve">
<value>dbo</value>
diff --git a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
index 278343f..a58ecba 100644
--- a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
+++ b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
@@ -41,6 +41,11 @@
[StringLength(64)]
public string MeasurementResult { get; set; }
+ /// <summary>
+ /// 浜у搧缂栫爜
+ /// </summary>
+ [NotMapped]
+ public string ProductionCode { get; set; }
[NotMapped]
public string ProductionBarcode { get; set; }
}
@@ -71,22 +76,6 @@
/// 妫�娴嬬粨鏋� ok ng
/// </summary>
public string MeasurementResult { get; set; }
- }
-
- public class MeasurementUnitResult_DTO : MeasurementUnitResult
- {
- //浜у搧鐩稿叧
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- public string ProductionCode { get; set; }
-
- /// <summary>
- /// 浜у搧鏉＄爜
- /// </summary>
- public string ProductionBarcode { get; set; }
-
-
}
public class ProductionMeasurementUnitResultAndKeyUnitDataSet
diff --git a/src/Bro.M071.Process/UI/M071_DataForm.Designer.cs b/src/Bro.M071.Process/UI/M071_DataForm.Designer.cs
index b475e6a..d8186a4 100644
--- a/src/Bro.M071.Process/UI/M071_DataForm.Designer.cs
+++ b/src/Bro.M071.Process/UI/M071_DataForm.Designer.cs
@@ -28,20 +28,38 @@
/// </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.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.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();
this.panel2 = new System.Windows.Forms.Panel();
@@ -50,18 +68,38 @@
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.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.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();
+ this.tableLayoutPanel4.SuspendLayout();
+ this.panel3.SuspendLayout();
this.SuspendLayout();
//
// tabControl1
@@ -85,17 +123,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 +156,80 @@
//
// 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.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);
+ 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.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);
+ 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.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);
+ 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.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);
+ 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.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);
+ 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
//
@@ -200,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";
@@ -207,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
//
@@ -219,6 +305,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 +324,137 @@
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
+ //
+ 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
//
@@ -260,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";
@@ -315,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;
@@ -350,14 +568,223 @@
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";
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;
+ //
+ // label10
+ //
+ 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_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;
+ //
+ // comboBoxMeasurementType_MR
+ //
+ 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;
+ //
+ // labelTotal_MR
+ //
+ 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 = "鏁伴噺锛氭�婚〉鏁�:";
+ //
+ // buttonExport_MR
+ //
+ 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;
+ //
+ // panel3
+ //
+ 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
//
@@ -369,15 +796,20 @@
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();
((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).EndInit();
+ this.tableLayoutPanel4.ResumeLayout(false);
+ this.tableLayoutPanel4.PerformLayout();
+ this.panel3.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -390,12 +822,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;
@@ -406,8 +838,41 @@
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;
+ 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;
+ 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 b86ee46..e4ec30c 100644
--- a/src/Bro.M071.Process/UI/M071_DataForm.cs
+++ b/src/Bro.M071.Process/UI/M071_DataForm.cs
@@ -1,4 +1,6 @@
-锘縰sing Bro.UI.Model.Winform;
+锘縰sing Bro.M071.DBManager;
+using Bro.M071.Model.Model;
+using Bro.UI.Model.Winform;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -14,9 +16,44 @@
[MenuNode("M071_DataForm", "鏁版嵁鏌ヨ鐣岄潰", 3, "M071Node", true)]
public partial class M071_DataForm : MenuFrmBase
{
+ public ProductionMeasurementRecordsManager _productionMeasurementRecordsManager = new ProductionMeasurementRecordsManager();
public M071_DataForm()
{
InitializeComponent();
+ InitialProductionRecordsLayout();
+ InitialMeasurementResultLayout();
}
+
+ #region 浜у搧璁板綍
+ private void InitialProductionRecordsLayout()
+ {
+ comboBoxPResult.DataSource = new List<string>() { "", "OK", "NG" };
+ }
+
+ private void buttonQuery_Click(object sender, EventArgs e)
+ {
+ ProductionMeasurementRecordsRequest recordsRequest = new ProductionMeasurementRecordsRequest();
+ recordsRequest.ProductionCode = textBoxPCode.Text;
+ recordsRequest.ProductionBarcode = textBoxPBarCode.Text;
+ recordsRequest.ProductionResult = comboBoxPResult.SelectedItem?.ToString();
+ 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
+
+ #region 娴嬮噺缁撴灉
+ private void InitialMeasurementResultLayout()
+ {
+
+ }
+ #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