From d511823e84953e616da9a24484d730c49c457c08 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 08:54:16 +0800
Subject: [PATCH] 更改M071主界面按钮鼠标样式

---
 src/Bro.M071.Model/Model/MeasurementUnitResult.cs |   65 +++++++++++++++++++++++++++++++-
 1 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
index 955f8a0..62898f4 100644
--- a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
+++ b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
@@ -1,5 +1,6 @@
 锘�
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bro.M071.Model.Model
@@ -24,7 +25,7 @@
         /// <summary>
         ///  妫�娴嬬粨鏋滅被鍨� (Slant Alignment... )
         /// </summary>
-        [StringLength(64)] 
+        [StringLength(64)]
         public string MeasurementType { get; set; }
 
         /// <summary>
@@ -43,6 +44,16 @@
     public class MeasurementUnitResultRequest : BaseRequest
     {
         /// <summary>
+        /// 浜у搧缂栫爜
+        /// </summary>
+        public string ProductionCode { get; set; }
+
+        /// <summary>
+        /// 浜у搧鏉$爜
+        /// </summary>
+        public string ProductionBarcode { get; set; }
+
+        /// <summary>
         /// 妫�娴嬪悕绉�
         /// </summary>
         public string MeasurementName { get; set; }
@@ -50,7 +61,57 @@
         /// <summary>
         ///  妫�娴嬪拰鏍囧噯绫诲瀷
         /// </summary>
-        public string MeasureType { get; set; }
+        public string MeasurementType { get; set; }
+
+        /// <summary>
+        ///  妫�娴嬬粨鏋� ok ng
+        /// </summary>
+        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
+    {
+
+        public ProductionMeasurementRecords ProductionMeasurementRecord { get; set; }
+
+        /// <summary>
+        /// 鍏崇郴鏁版嵁
+        /// </summary>
+        public List<MeasurementAndKeyDataRelation> MeasurementAndKeyDataRelationList{ get; set; }
+
+        /// <summary>
+        /// 妫�娴嬬粨鏋�
+        /// </summary>
+        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>();
+        }
+
     }
 
 }

--
Gitblit v1.8.0