From 12200ec69e33881649974f31f270750ba6b15e1d Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:31 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Model/Model/MeasurementUnitResult.cs | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
index 3d39b4c..a58ecba 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,14 @@
/// </summary>
[StringLength(64)]
public string MeasurementResult { get; set; }
+
+ /// <summary>
+ /// 浜у搧缂栫爜
+ /// </summary>
+ [NotMapped]
+ public string ProductionCode { get; set; }
+ [NotMapped]
+ public string ProductionBarcode { get; set; }
}
public class MeasurementUnitResultRequest : BaseRequest
@@ -68,17 +78,32 @@
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>();
+ }
}
--
Gitblit v1.8.0