Merge branch 'main' of 192.168.0.36:doan/mes

ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs

@@ -167,7 +167,7 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
 
         /// <summary>
         /// 更新生产工单
-        /// </summary>
+        /// </summary>  
         /// <param name="proWorkorder">生产工单对象</param>
         /// <returns></returns>
         [HttpPost("updateworkorder")]

ZR.Model/mes/pro/ProWorkorder.cs

@@ -37,6 +37,20 @@ namespace ZR.Model.mes.pro
         ///</summary>
         [SugarColumn(ColumnName = "date")]
         public int? Date { get; set; }
+
+        /// <summary>
+        /// 是否已经排程 
+        ///</summary>
+        [SugarColumn(ColumnName = "isarrange")]
+        public string Isarrange { get; set; }
+
+
+        /// <summary>
+        /// 优先级
+        ///</summary>
+        [SugarColumn(ColumnName = "priority")]
+        public string Priority { get; set; }
+
         /// <summary>
         /// 排产开始时间 
         ///</summary>