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.Process/UI/M071_DataForm.cs | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletions(-) 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 + } } -- Gitblit v1.8.0