From 45d24431c11b79d31f7dca4bacfb2c5e952f612b Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Sat, 14 Sep 2024 10:44:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=8F=98=E6=9B=B4=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/MES/product/ProWorkorderController.cs | 11 ++++++-----
 DOAN.Model/MES/product/ProWorkorderUpdateLog.cs       |  9 +++++++++
 .../MES/product/IService/IProWorkorderService.cs      |  2 +-
 DOAN.Service/MES/product/ProWorkorderService.cs       |  6 +++++-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
index 6e60552..6c8cc4c 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
@@ -293,7 +293,7 @@ namespace DOAN.Admin.WebApi.Controllers
 
         //}
         // 启用（9/14）
-        [HttpGet("get_groups")]  
+        [HttpGet("get_groups")]
         public IActionResult GetGroupList()
         {
             var response = _ProWorkorderService.GetGroupList();
@@ -307,7 +307,8 @@ namespace DOAN.Admin.WebApi.Controllers
         /// <param name="workorder_num">工单号</param>
         /// <returns></returns>
         [HttpGet("search_BOM_num")]
-        public IActionResult SearchBOMNum(string  workorder_num) { 
+        public IActionResult SearchBOMNum(string workorder_num)
+        {
             if (string.IsNullOrEmpty(workorder_num)) { return SUCCESS(null); }
 
             var response = _ProWorkorderService.SearchBOMNum(workorder_num);
@@ -318,10 +319,10 @@ namespace DOAN.Admin.WebApi.Controllers
 
         //TODO  工单变更日志
         [HttpGet("workorder_log")]
-        public IActionResult  WorkOrderLog(string workorder,string log)
+        public IActionResult WorkOrderLog(string workorder, string log)
         {
-            if(string.IsNullOrEmpty(workorder)) { return SUCCESS(null); }
-            var response = _ProWorkorderService.WorkOrderLog(workorder, log);
+            if (string.IsNullOrEmpty(workorder)) { return SUCCESS(null); }
+            var response = _ProWorkorderService.WorkOrderLog(workorder, log, HttpContext.GetName());
             return SUCCESS(response);
         }
     }
diff --git a/DOAN.Model/MES/product/ProWorkorderUpdateLog.cs b/DOAN.Model/MES/product/ProWorkorderUpdateLog.cs
index 99d16c3..90cdb99 100644
--- a/DOAN.Model/MES/product/ProWorkorderUpdateLog.cs
+++ b/DOAN.Model/MES/product/ProWorkorderUpdateLog.cs
@@ -38,5 +38,14 @@ namespace DOAN.Model.MES.product
         /// </summary>
         [SugarColumn(ColumnName = "change_time")]
         public DateTime? ChangeTime { get; set; }
+
+
+        /// <summary>
+        /// 操作者
+        /// </summary>
+        [SugarColumn(ColumnName = "operator")]
+        public string Operator { get; set; }
+
+
     }
 }
diff --git a/DOAN.Service/MES/product/IService/IProWorkorderService.cs b/DOAN.Service/MES/product/IService/IProWorkorderService.cs
index b45a410..243447e 100644
--- a/DOAN.Service/MES/product/IService/IProWorkorderService.cs
+++ b/DOAN.Service/MES/product/IService/IProWorkorderService.cs
@@ -54,7 +54,7 @@ namespace DOAN.Service.MES.product.IService
 
         List<WorkOrderBom> SearchBOMNum(string workorder_num);
 
-        int WorkOrderLog(string workorder, string log);
+        int WorkOrderLog(string workorder, string log, string Operator);
 
     }
 }
diff --git a/DOAN.Service/MES/product/ProWorkorderService.cs b/DOAN.Service/MES/product/ProWorkorderService.cs
index c2996e9..3f8594e 100644
--- a/DOAN.Service/MES/product/ProWorkorderService.cs
+++ b/DOAN.Service/MES/product/ProWorkorderService.cs
@@ -843,12 +843,16 @@ namespace DOAN.Service.MES.product
         /// <param name="workorder"></param>
         /// <param name="log"></param>
         /// <returns></returns>
-        public int WorkOrderLog(string workorder, string log)
+        public int WorkOrderLog(string workorder, string log,string Operator)
         {
             ProWorkorderUpdateLog logObj = new ProWorkorderUpdateLog();
             logObj.Id = XueHua;
             logObj.Workorder = workorder;
             logObj.Log = log;
+            logObj.ChangeTime = DateTime.Now;
+            logObj.Operator = Operator;
+
+
            return  Context.Insertable(logObj).ExecuteCommand();
 
         }