From f06ae0e33e33f1ed5f198827b9b5a53e765b3eee Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 11 一月 2021 10:58:26 +0800
Subject: [PATCH] 1. 来料检测添加线体代码 2. 添加检测数据区间压缩配置和功能

---
 src/Bro.M071.Model/Model/MeasurementUnitResult.cs |   85 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 84 insertions(+), 1 deletions(-)

diff --git a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
index ef6ba51..881a51a 100644
--- a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
+++ b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
@@ -90,7 +90,7 @@
         /// <summary>
         /// 鍏崇郴鏁版嵁
         /// </summary>
-        public List<MeasurementAndKeyDataRelation> MeasurementAndKeyDataRelationList{ get; set; }
+        public List<MeasurementAndKeyDataRelation> MeasurementAndKeyDataRelationList { get; set; }
 
         /// <summary>
         /// 妫�娴嬬粨鏋�
@@ -108,7 +108,90 @@
             MeasurementUnitResultList = new List<MeasurementUnitResult>();
             KeyUnitDataList = new List<KeyUnitData>();
         }
+    }
 
+    public class ProductionMeasurementUnitResultExportDataSet
+    {
+
+        public List<ProductionMeasurementRecords> ProductionMeasurementRecordList { get; set; }
+
+        ///// <summary>
+        ///// 鍏崇郴鏁版嵁
+        ///// </summary>
+        //public List<MeasurementAndKeyDataRelation> MeasurementAndKeyDataRelationList { get; set; }
+
+        /// <summary>
+        /// 妫�娴嬬粨鏋�
+        /// </summary>
+        public List<MeasurementUnitResult_DTO> MeasurementUnitResultList { get; set; }
+
+        /// <summary>
+        /// 鍘熷鏁版嵁
+        /// </summary>
+        public List<KeyUnitData_DTO> KeyUnitDataList { get; set; }
+
+        public ProductionMeasurementUnitResultExportDataSet()
+        {
+            ProductionMeasurementRecordList = new List<ProductionMeasurementRecords>();
+            MeasurementUnitResultList = new List<MeasurementUnitResult_DTO>();
+            KeyUnitDataList = new List<KeyUnitData_DTO>();
+        }
+    }
+
+    /// <summary>
+    /// MeasurementUnitResult_DTO 鏁版嵁搴撴煡璇娇鐢�
+    /// </summary>
+    public class MeasurementUnitResult_DTO
+    {
+
+        /// <summary>
+        /// 浜у搧娴嬮噺璁板綍Id
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 浜у搧娴嬮噺璁板綍Id
+        /// </summary>
+        public string ProductionMeasurementRecordsId { get; set; }
+        /// <summary>
+        /// 妫�娴嬪悕绉�
+        /// </summary>
+        public string MeasurementName { get; set; }
+
+        /// <summary>
+        ///  妫�娴嬬粨鏋滅被鍨� (Slant Alignment... )
+        /// </summary>
+        public string MeasurementType { get; set; }
+
+        /// <summary>
+        ///  妫�娴嬬粨鏋滃��
+        /// </summary>
+        public string MeasurementValue { get; set; }
+
+        /// <summary>
+        ///  妫�娴嬬粨鏋� ok ng
+        /// </summary>
+        public string MeasurementResult { get; set; }
+
+        /// <summary>
+        /// 浜у搧缂栫爜
+        /// </summary>
+        public string ProductionCode { get; set; }
+
+        /// <summary>
+        /// 浜у搧鏉$爜
+        /// </summary>
+        public string ProductionBarcode { get; set; }
+
+        /// <summary>
+        /// 鎿嶄綔寮�濮嬫椂闂�
+        /// </summary>
+        public DateTime OperationStartTime { get; set; }
+
+        /// <summary>
+        /// 鎿嶄綔缁撴潫鏃堕棿
+        /// </summary>
+        public DateTime OperationEndTime { get; set; }
     }
 
 }

--
Gitblit v1.8.0