From 39f052f548f482aed073cd67b2b8e38b63f7b9ae Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 09 四月 2021 17:16:17 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES
---
src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs b/src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs
index c0a359f..13ff2d5 100644
--- a/src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs
+++ b/src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs
@@ -106,6 +106,10 @@
/// 缂烘枡鏁伴噺
/// </summary>
public decimal FLackCount { get; set; }
+ /// <summary>
+ /// 鍗犵敤鏁伴噺
+ /// </summary>
+ public decimal FOccupyCount { get; set; }
/// <summary>
/// 鍗曚綅鐢ㄩ噺锛欶UnitDosage
@@ -119,10 +123,13 @@
/// 榻愬鏁伴噺锛欶CompleteCount q
/// </summary>
public decimal FCompleteCount { get; set; }
+ public decimal FCompleteCount1 { get; set; }
/// <summary>
/// 鏃ヨ鍒掓棩鏈�
/// </summary>
public DateTime FPlanDate { get; set; }
-
+ public int FErpClsID { get; set; }
+
+
}
}
--
Gitblit v1.9.1