diff --git a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
index b261e2e..6e60552 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
@@ -37,7 +37,7 @@ namespace DOAN.Admin.WebApi.Controllers
}
///
- /// 查询生产工单列表
+ /// 查询生产工单列表 启用(9/14)
///
///
///
@@ -66,7 +66,7 @@ namespace DOAN.Admin.WebApi.Controllers
}
///
- /// 添加生产工单
+ /// 添加生产工单
///
///
[HttpPost]
@@ -172,7 +172,7 @@ namespace DOAN.Admin.WebApi.Controllers
}
///
- /// 生产工单导入模板下载 workorder
+ /// 生产工单导入模板下载 workorder 启用(9/14)
///
///
[HttpGet("importTemplate")]
@@ -185,7 +185,7 @@ namespace DOAN.Admin.WebApi.Controllers
}
///
- /// 导入
+ /// 导入 启用(9/14)
///
/// 使用IFromFile必须使用name属性否则获取不到文件
/// 导入成功数 若-1 则excel读取异常
@@ -209,7 +209,7 @@ namespace DOAN.Admin.WebApi.Controllers
///
- /// 工单导出
+ /// 工单导出 启用(9/14)
///
///
///
@@ -269,7 +269,7 @@ namespace DOAN.Admin.WebApi.Controllers
return SUCCESS(response);
}
- //TODO 获取全部工艺路线
+ //TODO 获取全部工艺路线 启用(9/14)
[HttpGet("get_all_route")]
public IActionResult GetAllRoute()
{
@@ -292,7 +292,8 @@ namespace DOAN.Admin.WebApi.Controllers
// return SUCCESS(response);
//}
- [HttpGet("get_groups")]
+ // 启用(9/14)
+ [HttpGet("get_groups")]
public IActionResult GetGroupList()
{
var response = _ProWorkorderService.GetGroupList();
@@ -314,5 +315,14 @@ namespace DOAN.Admin.WebApi.Controllers
}
+
+ //TODO 工单变更日志
+ [HttpGet("workorder_log")]
+ public IActionResult WorkOrderLog(string workorder,string log)
+ {
+ if(string.IsNullOrEmpty(workorder)) { return SUCCESS(null); }
+ var response = _ProWorkorderService.WorkOrderLog(workorder, log);
+ return SUCCESS(response);
+ }
}
}
diff --git a/DOAN.Service/MES/product/IService/IProWorkorderService.cs b/DOAN.Service/MES/product/IService/IProWorkorderService.cs
index c8b3e0f..b45a410 100644
--- a/DOAN.Service/MES/product/IService/IProWorkorderService.cs
+++ b/DOAN.Service/MES/product/IService/IProWorkorderService.cs
@@ -54,5 +54,7 @@ namespace DOAN.Service.MES.product.IService
List SearchBOMNum(string workorder_num);
+ int WorkOrderLog(string workorder, string log);
+
}
}
diff --git a/DOAN.Service/MES/product/ProWorkorderService.cs b/DOAN.Service/MES/product/ProWorkorderService.cs
index f0cbd1a..c2996e9 100644
--- a/DOAN.Service/MES/product/ProWorkorderService.cs
+++ b/DOAN.Service/MES/product/ProWorkorderService.cs
@@ -835,6 +835,24 @@ namespace DOAN.Service.MES.product
}
+
+
+ ///
+ /// 工单日志
+ ///
+ ///
+ ///
+ ///
+ public int WorkOrderLog(string workorder, string log)
+ {
+ ProWorkorderUpdateLog logObj = new ProWorkorderUpdateLog();
+ logObj.Id = XueHua;
+ logObj.Workorder = workorder;
+ logObj.Log = log;
+ return Context.Insertable(logObj).ExecuteCommand();
+
+ }
+
}