From e67cf2cf9f6e528521c605bb8227215f060f5412 Mon Sep 17 00:00:00 2001
From: "xiaowei.song" <xiaowei.song@doan-tech.com>
Date: Wed, 15 Nov 2023 14:53:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/pro/ProWorkplanController.cs          | 60 ++++++++++++++++++-
 .../mes/pro/IService/IProWorkplanService.cs   |  6 ++
 ZR.Service/mes/pro/ProWorkplanService.cs      | 16 +++++
 3 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
index 6f124724..43cf33bb 100644
--- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
@@ -49,8 +49,8 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
             int data = 0;
             if (proWorkplan!=null)
             {
-                data = proWorkplanService.AddWorkPlan(proWorkplan);
                 proWorkplan.ToCreate(HttpContext);
+                data = proWorkplanService.AddWorkPlan(proWorkplan);
             }
 
             return ToResponse(new ApiResult(200, "success", data));
@@ -67,8 +67,9 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
             int data = 0;
             if (proWorkplan != null)
             {
-                data = proWorkplanService.UpdateWorkPlan(proWorkplan);
                 proWorkplan.ToUpdate(HttpContext);
+                data = proWorkplanService.UpdateWorkPlan(proWorkplan);
+                
             }
 
             return ToResponse(new ApiResult(200, "success", data));
@@ -108,5 +109,60 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
 
             return ToResponse(new ApiResult(200, "success", lst));
         }
+
+        /// <summary>
+        /// 新增生产工单
+        /// </summary>
+        /// <param name="proWorkorder">生产工单对象</param>
+        /// <returns></returns>
+        [HttpPost("addworkorder")]
+        public IActionResult AddWorkorder([FromBody] ProWorkorder proWorkorder)
+        {
+            int data = 0;
+            if (proWorkorder != null)
+            {
+                proWorkorder.ToCreate(HttpContext);
+                data = proWorkplanService.AddWorkorder(proWorkorder);
+                
+            }
+
+            return ToResponse(new ApiResult(200, "success", data));
+        }
+
+        /// <summary>
+        /// 更新生产工单
+        /// </summary>
+        /// <param name="proWorkorder">生产工单对象</param>
+        /// <returns></returns>
+        [HttpPost("updateworkplan")]
+        public IActionResult UpdateWorkorder([FromBody] ProWorkorder proWorkorder)
+        {
+            int data = 0;
+            if (proWorkorder != null)
+            {
+                proWorkorder.ToUpdate(HttpContext);
+                data = proWorkplanService.UpdateWorkorder(proWorkorder);
+                
+            }
+
+            return ToResponse(new ApiResult(200, "success", data));
+        }
+
+        /// <summary>
+        /// 删除生产工单
+        /// </summary>
+        /// <param name="id">工单ID</param>
+        /// <returns></returns>
+        [HttpGet("deleteworkorder/{id}")]
+        public IActionResult DeleteWorkorder(string id)
+        {
+            int data = 0;
+            if (!string.IsNullOrEmpty(id))
+            {
+                data = proWorkplanService.DeleteWorkPlan(id);
+            }
+
+            return ToResponse(new ApiResult(200, "success", data));
+        }
     }
 }
diff --git a/ZR.Service/mes/pro/IService/IProWorkplanService.cs b/ZR.Service/mes/pro/IService/IProWorkplanService.cs
index f02daa0d..27723f6c 100644
--- a/ZR.Service/mes/pro/IService/IProWorkplanService.cs
+++ b/ZR.Service/mes/pro/IService/IProWorkplanService.cs
@@ -21,5 +21,11 @@ namespace ZR.Service.mes.pro.IService
         public int DeleteWorkPlan(string id);
 
         public List<ProWorkorder> GetWorkorderList(string id);
+
+        public int AddWorkorder(ProWorkorder proWorkorder);
+
+        public int UpdateWorkorder(ProWorkorder proWorkorder);
+
+        public int DeleteWorkorder(string id);
     }
 }
diff --git a/ZR.Service/mes/pro/ProWorkplanService.cs b/ZR.Service/mes/pro/ProWorkplanService.cs
index 2ecbea53..a767886b 100644
--- a/ZR.Service/mes/pro/ProWorkplanService.cs
+++ b/ZR.Service/mes/pro/ProWorkplanService.cs
@@ -54,5 +54,21 @@ namespace ZR.Service.mes.pro
         {
             return Context.Queryable<ProWorkorder>().Where(it => it.FkProPlanId == id).ToList();
         }
+
+        public int AddWorkorder(ProWorkorder proWorkorder)
+        {
+            proWorkorder.Id = DateTime.Now.ToString("yyyyMMddHHmmss");
+            return Context.Insertable(proWorkorder).ExecuteCommand();
+        }
+
+        public int UpdateWorkorder(ProWorkorder proWorkorder)
+        {
+            return Context.Updateable(proWorkorder).ExecuteCommand();
+        }
+
+        public int DeleteWorkorder(string id)
+        {
+            return Context.Deleteable<ProWorkorder>().In(id).ExecuteCommand();
+        }
     }
 }