From f39f00ee0ee41e169fa24ccb85b4af36090dbd25 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 08 七月 2020 16:38:51 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Model/Model/MeasurementUnitResult.cs | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/src/Bro.M071.Process.Model/Model/MeasurementUnitResult.cs b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
similarity index 61%
rename from src/Bro.M071.Process.Model/Model/MeasurementUnitResult.cs
rename to src/Bro.M071.Model/Model/MeasurementUnitResult.cs
index 955f8a0..3d39b4c 100644
--- a/src/Bro.M071.Process.Model/Model/MeasurementUnitResult.cs
+++ b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
@@ -24,7 +24,7 @@
/// <summary>
/// 妫�娴嬬粨鏋滅被鍨� (Slant Alignment... )
/// </summary>
- [StringLength(64)]
+ [StringLength(64)]
public string MeasurementType { get; set; }
/// <summary>
@@ -43,6 +43,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 +60,26 @@
/// <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
+ {
+ /// <summary>
+ /// 浜у搧璁板綍
+ /// </summary>
+ public ProductionMeasurementRecords ProductionMeasurementRecord { get; set; }
+
+ /// <summary>
+ /// 妫�娴嬬粨鏋�
+ /// </summary>
+ public MeasurementUnitResult MeasurementUnitResult { get; set; }
+
}
}
--
Gitblit v1.8.0