From 81480d62561dcb75a1fc968814ace1368fe5181b Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 16 七月 2020 11:57:08 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/UI/M071_DataForm.cs | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/Bro.M071.Process/UI/M071_DataForm.cs b/src/Bro.M071.Process/UI/M071_DataForm.cs
index 7b14a76..213b464 100644
--- a/src/Bro.M071.Process/UI/M071_DataForm.cs
+++ b/src/Bro.M071.Process/UI/M071_DataForm.cs
@@ -17,6 +17,7 @@
public partial class M071_DataForm : MenuFrmBase
{
public ProductionMeasurementRecordsManager _productionMeasurementRecordsManager = new ProductionMeasurementRecordsManager();
+ public MeasurementUnitResultManager _measurementUnitResultManager = new MeasurementUnitResultManager();
public M071_DataForm()
{
InitializeComponent();
@@ -27,7 +28,7 @@
#region 浜у搧璁板綍
private void InitialProductionRecordsLayout()
{
-
+ comboBoxPResult.DataSource = new List<string>() { "", "OK", "NG" };
}
private void buttonQuery_Click(object sender, EventArgs e)
@@ -36,11 +37,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
@@ -48,8 +52,29 @@
#region 娴嬮噺缁撴灉
private void InitialMeasurementResultLayout()
{
+ comboBoxResult_MR.DataSource = new List<string>() { "", "OK", "NG" };
+ comboBoxMeasurementType_MR.DataSource = new List<string>() { "", "Slant", "HeightAlignment", "FullRowHeightAlignment" };
+ }
+ private void buttonQuery_MR_Click(object sender, EventArgs e)
+ {
+ MeasurementUnitResultRequest recordsRequest = new MeasurementUnitResultRequest();
+ recordsRequest.ProductionCode = textBoxPCode_MR.Text;
+ recordsRequest.ProductionBarcode = textBoxtextBoxPBarCode_MR.Text;
+ recordsRequest.MeasurementName = textBoxMeasurementName_MR.Text;
+ recordsRequest.MeasurementType = comboBoxMeasurementType_MR.SelectedItem?.ToString();
+ recordsRequest.MeasurementResult = comboBoxResult_MR.SelectedItem?.ToString();
+ recordsRequest.StartTime = Convert.ToDateTime(dateTimePickerStartTime_MR.Value.ToString("D").ToString());
+ recordsRequest.EndTime = Convert.ToDateTime(dateTimePickerEndTime_MR.Value.AddDays(1).ToString("D").ToString()).AddSeconds(-1);
+
+ var queryData = _measurementUnitResultManager.GetMeasurementUnitResult(recordsRequest);
+ dataGridView2.AutoGenerateColumns = false;
+ dataGridView2.DataSource = queryData;
+ labelTotal_MR.Text = $"鏁伴噺:{recordsRequest.TotalNum} 鎬婚〉鏁�:{recordsRequest.TotalPage}";
+ textBoxPageNum_MR.Text = recordsRequest.PageNum.ToString();
}
#endregion
+
+
}
}
--
Gitblit v1.8.0