From 5b6ffebeeee53e375cf8f8d5c30c51f03ad1d96e Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 09 七月 2020 19:12:42 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Model/Model/MeasurementUnitResult.cs | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
index 3d39b4c..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
@@ -68,17 +69,48 @@
public string MeasurementResult { get; set; }
}
- public class MeasurementUnitResult_DTO
+ 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 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>();
+ }
}
--
Gitblit v1.8.0