From 30458c0bca8066d98ca901b5065832a44a7e970e Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 16 七月 2020 15:47:22 +0800
Subject: [PATCH] 测量结果 查询+导出功能
---
src/Bro.M071.Model/Model/MeasurementUnitResult.cs | 110 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 93 insertions(+), 17 deletions(-)
diff --git a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
index 278343f..881a51a 100644
--- a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
+++ b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
@@ -41,8 +41,17 @@
[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
@@ -73,22 +82,6 @@
public string MeasurementResult { get; set; }
}
- public class MeasurementUnitResult_DTO : MeasurementUnitResult
- {
- //浜у搧鐩稿叧
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- public string ProductionCode { get; set; }
-
- /// <summary>
- /// 浜у搧鏉＄爜
- /// </summary>
- public string ProductionBarcode { get; set; }
-
-
- }
-
public class ProductionMeasurementUnitResultAndKeyUnitDataSet
{
@@ -97,7 +90,7 @@
/// <summary>
/// 鍏崇郴鏁版嵁
/// </summary>
- public List<MeasurementAndKeyDataRelation> MeasurementAndKeyDataRelationList{ get; set; }
+ public List<MeasurementAndKeyDataRelation> MeasurementAndKeyDataRelationList { get; set; }
/// <summary>
/// 妫�娴嬬粨鏋�
@@ -115,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