From d06507ffdbad5db95156e114d5e8a0f89672529a Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期二, 02 二月 2021 08:43:07 +0800
Subject: [PATCH] MES上传数据checkTime参数更改为DateTime类型

---
 src/Bro.M071.Model/Model/MeasurementUnitResult.cs |  122 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 117 insertions(+), 5 deletions(-)

diff --git a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
index 3d39b4c..881a51a 100644
--- a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
+++ b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
@@ -1,6 +1,8 @@
 锘�
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Bro.M071.Model.Model
 {
@@ -38,6 +40,18 @@
         /// </summary>
         [StringLength(64)]
         public string MeasurementResult { get; set; }
+
+        /// <summary>
+        /// 浜у搧缂栫爜
+        /// </summary>
+        [NotMapped]
+        public string ProductionCode { get; set; }
+        [NotMapped]
+        public string ProductionBarcode { get; set; }
+        [NotMapped]
+        public string Keys { get; set; }
+        [NotMapped]
+        public string Positions { get; set; }
     }
 
     public class MeasurementUnitResultRequest : BaseRequest
@@ -68,18 +82,116 @@
         public string MeasurementResult { get; set; }
     }
 
-    public class MeasurementUnitResult_DTO
+    public class ProductionMeasurementUnitResultAndKeyUnitDataSet
     {
-        /// <summary>
-        /// 浜у搧璁板綍
-        /// </summary>
+
         public ProductionMeasurementRecords ProductionMeasurementRecord { get; set; }
+
+        /// <summary>
+        /// 鍏崇郴鏁版嵁
+        /// </summary>
+        public List<MeasurementAndKeyDataRelation> MeasurementAndKeyDataRelationList { get; set; }
 
         /// <summary>
         /// 妫�娴嬬粨鏋�
         /// </summary>
-        public MeasurementUnitResult MeasurementUnitResult { get; set; }
+        public List<MeasurementUnitResult> MeasurementUnitResultList { get; set; }
 
+        /// <summary>
+        /// 鍘熷鏁版嵁
+        /// </summary>
+        public List<KeyUnitData> KeyUnitDataList { get; set; }
+
+        public ProductionMeasurementUnitResultAndKeyUnitDataSet()
+        {
+            ProductionMeasurementRecord = new ProductionMeasurementRecords();
+            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