From c50d72c01e1b1477969e59b359420f3e510e9488 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Thu, 18 Jul 2024 10:17:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A704?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/ProWorkorderScheduleController.cs   |  4 ++--
 DOAN.Model/MES/product/ProWorkorderSchedule.cs  | 10 +++++-----
 ...edule.cs => IProWorkorderScheduleService.cs} |  2 +-
 ...hedule.cs => ProWorkorderScheduleService.cs} | 17 +++++++++++++++--
 4 files changed, 23 insertions(+), 10 deletions(-)
 rename DOAN.Service/MES/product/IService/{IProWorkorderSchedule.cs => IProWorkorderScheduleService.cs} (87%)
 rename DOAN.Service/MES/product/{ProWorkorderSchedule.cs => ProWorkorderScheduleService.cs} (86%)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderScheduleController.cs b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderScheduleController.cs
index 9a3df01..3d2c3bd 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderScheduleController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderScheduleController.cs
@@ -19,9 +19,9 @@ namespace DOAN.Admin.WebApi.Controllers
     [Route("mes/productManagement/ProWorkorderSchedule")]
     public class ProWorkorderScheduleController :  BaseController
     {
-        private readonly IProWorkorderSchedule _ProWorkorderSchedule;
+        private readonly IProWorkorderScheduleService _ProWorkorderSchedule;
 
-        public ProWorkorderScheduleController(IProWorkorderSchedule ProWorkorderSchedule) 
+        public ProWorkorderScheduleController(IProWorkorderScheduleService ProWorkorderSchedule) 
         {
             _ProWorkorderSchedule = ProWorkorderSchedule;
         }
diff --git a/DOAN.Model/MES/product/ProWorkorderSchedule.cs b/DOAN.Model/MES/product/ProWorkorderSchedule.cs
index 5ce4085..9cb53aa 100644
--- a/DOAN.Model/MES/product/ProWorkorderSchedule.cs
+++ b/DOAN.Model/MES/product/ProWorkorderSchedule.cs
@@ -12,11 +12,11 @@ namespace  DOAN.Model.MES.product
     [SugarTable("pro_workorder_schedule")]
     public class ProWorkorderSchedule
     {
-        /// <summary>
-        /// 工位任务id 
-        /// </summary>
-        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "task_id")]
-        public string TaskId { get; set; }
+        ///// <summary>
+        ///// 工位任务id 
+        ///// </summary>
+        //[SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "task_id")]
+        //public string TaskId { get; set; }
 
         /// <summary>
         /// 工单id 
diff --git a/DOAN.Service/MES/product/IService/IProWorkorderSchedule.cs b/DOAN.Service/MES/product/IService/IProWorkorderScheduleService.cs
similarity index 87%
rename from DOAN.Service/MES/product/IService/IProWorkorderSchedule.cs
rename to DOAN.Service/MES/product/IService/IProWorkorderScheduleService.cs
index 47554b7..a101741 100644
--- a/DOAN.Service/MES/product/IService/IProWorkorderSchedule.cs
+++ b/DOAN.Service/MES/product/IService/IProWorkorderScheduleService.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 namespace DOAN.Service.MES.product.IService
 {
 
-    public interface IProWorkorderSchedule : IBaseService<ProWorkorder>
+    public interface IProWorkorderScheduleService : IBaseService<ProWorkorder>
     {
         PagedInfo<ProWorkorderDto> GetList(ProWorkorderQueryDto parm);
 
diff --git a/DOAN.Service/MES/product/ProWorkorderSchedule.cs b/DOAN.Service/MES/product/ProWorkorderScheduleService.cs
similarity index 86%
rename from DOAN.Service/MES/product/ProWorkorderSchedule.cs
rename to DOAN.Service/MES/product/ProWorkorderScheduleService.cs
index 7038996..69e862b 100644
--- a/DOAN.Service/MES/product/ProWorkorderSchedule.cs
+++ b/DOAN.Service/MES/product/ProWorkorderScheduleService.cs
@@ -20,8 +20,8 @@ namespace DOAN.Service.MES.product
     /// <summary>
     /// 生产工单Service业务层处理
     /// </summary>
-    [AppService(ServiceType = typeof(IProWorkorderSchedule), ServiceLifetime = LifeTime.Transient)]
-    public class ProWorkorderSchedule : BaseService<ProWorkorder>, IProWorkorderSchedule
+    [AppService(ServiceType = typeof(IProWorkorderScheduleService), ServiceLifetime = LifeTime.Transient)]
+    public class ProWorkorderScheduleService : BaseService<ProWorkorder>, IProWorkorderScheduleService
     {
         /// <summary>
         /// 查询生产工单列表
@@ -100,5 +100,18 @@ namespace DOAN.Service.MES.product
             return query;
         }
 
+        /// <summary>
+        /// 新增排产任务
+        /// </summary>
+        /// <param name="schedule"></param>
+        /// <returns></returns>
+        public  int  AddProuductSchedule(ProWorkorderSchedule  schedule)
+        {
+           return Context.Insertable(schedule).ExecuteCommand();
+            
+        }
+
+        //
+
     }
 }
\ No newline at end of file