From 2812f65c7481ce10953fa1fbe9cc89a8768e07f6 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期三, 23 四月 2025 17:13:55 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda

---
 MES.Service/Modes/ProductionOrder.cs |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/MES.Service/Modes/ProductionOrder.cs b/MES.Service/Modes/ProductionOrder.cs
index 872b65b..c40f8ae 100644
--- a/MES.Service/Modes/ProductionOrder.cs
+++ b/MES.Service/Modes/ProductionOrder.cs
@@ -84,13 +84,13 @@
         /// 棰勮寮�宸ユ椂闂� 
         ///</summary>
         [SugarColumn(ColumnName = "ESTIMATED_START_TIME")]
-        public DateTime? EstimatedStartTime { get; set; }
+        public DateTime? PlanStartDate { get; set; }
 
         /// <summary>
         /// 棰勮瀹屽伐鏃堕棿 
         ///</summary>
         [SugarColumn(ColumnName = "ESTIMATED_END_TIME")]
-        public DateTime? EstimatedEndTime { get; set; }
+        public DateTime? PlanFinishDate { get; set; }
 
         /// <summary>
         /// 璁″垝涓嬭揪鏃ユ湡 
@@ -271,5 +271,11 @@
         ///</summary>
         [SugarColumn(ColumnName = "STOCKOWNER")]
         public string? StockOwner { get; set; }
+
+        /// <summary>
+        /// 渚涘簲鍟�
+        ///</summary>
+        [SugarColumn(ColumnName = "SUPP_NO")]
+        public string? SUPPLIER { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3