From d3a44f202c0b12cbac67c71129c3c4f480df55b9 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 15 七月 2020 15:48:32 +0800
Subject: [PATCH] 光幕触发修改为同步,消弭信号抖动问题 Excel导出测试

---
 src/Bro.M071.Process/UI/M071_DataForm.cs |   10 +++++++---
 1 files changed, 7 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..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
+
     }
 }

--
Gitblit v1.8.0