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
/// 工单号
///
[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
///
[SugarColumn(ColumnName = "change_time")]
public DateTime? ChangeTime { get; set; }
+
+
+ ///
+ /// 操作者
+ ///
+ [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 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
///
///
///
- 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();
}