From efe6984c4e0e91b16b2704e174d610e180045dc5 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期一, 19 八月 2024 09:01:56 +0800
Subject: [PATCH] 合并上格-8.19

---
 MES.Service/Modes/Womdaa.cs |   96 +++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/MES.Service/Modes/Womdaa.cs b/MES.Service/Modes/Womdaa.cs
index 8f613a1..1f81fa9 100644
--- a/MES.Service/Modes/Womdaa.cs
+++ b/MES.Service/Modes/Womdaa.cs
@@ -11,11 +11,11 @@
     /// <summary>
     ///     鑷鍒�
     /// </summary>
-    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, IsIdentity = true)]
-    public decimal Id { get; set; }
+    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+    public decimal? Id { get; set; }
 
     /// <summary>
-    ///     PID
+    ///     鎺掍骇ID
     /// </summary>
     [SugarColumn(ColumnName = "PID")]
     public decimal? Pid { get; set; }
@@ -27,7 +27,7 @@
     public string? Daa001 { get; set; }
 
     /// <summary>
-    ///     浜у搧缂栫爜
+    ///     浜у搧ID
     /// </summary>
     [SugarColumn(ColumnName = "DAA002")]
     public string? Daa002 { get; set; }
@@ -51,13 +51,13 @@
     public string? Daa005 { get; set; }
 
     /// <summary>
-    ///     棰勮寮�宸ユ椂闂�
+    ///     ERP棰勮寮�宸ユ椂闂�
     /// </summary>
     [SugarColumn(ColumnName = "DAA006")]
     public DateTime? Daa006 { get; set; }
 
     /// <summary>
-    ///     棰勮瀹屽伐鏃堕棿
+    ///     ERP棰勮瀹屽伐鏃堕棿
     /// </summary>
     [SugarColumn(ColumnName = "DAA007")]
     public DateTime? Daa007 { get; set; }
@@ -229,4 +229,88 @@
     /// </summary>
     [SugarColumn(ColumnName = "DAA028")]
     public string? Daa028 { get; set; }
+
+    /// <summary>
+    ///     鏍囧噯宸ユ椂
+    /// </summary>
+    [SugarColumn(ColumnName = "PROD_HOUR")]
+    public decimal? ProdHour { get; set; }
+
+    /// <summary>
+    ///     鍗曚汉灏忔椂浜ц兘
+    /// </summary>
+    [SugarColumn(ColumnName = "PERSON_HOUR_CAPACITY")]
+    public decimal? PersonHourCapacity { get; set; }
+
+    /// <summary>
+    ///     鐞嗚鏍囦骇
+    /// </summary>
+    [SugarColumn(ColumnName = "THE_CAPACITY")]
+    public decimal? TheCapacity { get; set; }
+
+    /// <summary>
+    ///     璁″垝鐢ㄤ汉鏁�
+    /// </summary>
+    [SugarColumn(ColumnName = "PLAN_PERSONNEL")]
+    public decimal? PlanPersonnel { get; set; }
+
+    /// <summary>
+    ///     璁″垝鏍囧噯浜ц兘
+    /// </summary>
+    [SugarColumn(ColumnName = "PLAN_CAPACITY")]
+    public decimal? PlanCapacity { get; set; }
+
+    /// <summary>
+    ///     鐞嗚鐢ㄦ椂/M
+    /// </summary>
+    [SugarColumn(ColumnName = "THE_MIN")]
+    public decimal? TheMin { get; set; }
+
+    /// <summary>
+    ///     鐞嗚鐢ㄦ椂/H
+    /// </summary>
+    [SugarColumn(ColumnName = "THE_HOUR")]
+    public decimal? TheHour { get; set; }
+
+    /// <summary>
+    ///     绾夸綋绫诲埆
+    /// </summary>
+    [SugarColumn(ColumnName = "LINE_TYPE")]
+    public string? LineType { get; set; }
+
+    /// <summary>
+    ///     鏍囧噯浜烘暟
+    /// </summary>
+    [SugarColumn(ColumnName = "PERSONNEL")]
+    public decimal? Personnel { get; set; }
+
+    /// <summary>
+    ///     鎹㈢嚎鏃堕棿
+    /// </summary>
+    [SugarColumn(ColumnName = "CHANGE_LINE_TIME")]
+    public decimal? ChangeLineTime { get; set; }
+
+    /// <summary>
+    ///     浼戞伅鏃堕棿
+    /// </summary>
+    [SugarColumn(ColumnName = "REST_TIME")]
+    public decimal? RestTime { get; set; }
+
+    /// <summary>
+    ///     鎺掍骇搴忓彿
+    /// </summary>
+    [SugarColumn(ColumnName = "SCHEDULE_ORDER")]
+    public decimal? ScheduleOrder { get; set; }
+
+    /// <summary>
+    ///     MES棰勮寮�宸ユ椂闂�
+    /// </summary>
+    [SugarColumn(ColumnName = "MES_START_PROD")]
+    public DateTime? MesStartProd { get; set; }
+
+    /// <summary>
+    ///     MES棰勮瀹屽伐鏃堕棿
+    /// </summary>
+    [SugarColumn(ColumnName = "MES_END_PROD")]
+    public DateTime? MesEndProd { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3