diff --git a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
index 6c8cc4c..2866d51 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
@@ -82,7 +82,7 @@ namespace DOAN.Admin.WebApi.Controllers
}
///
- /// 更新生产工单
+ /// 更新生产工单 启用(9/14)
///
///
[HttpPut]
@@ -97,7 +97,7 @@ namespace DOAN.Admin.WebApi.Controllers
}
///
- /// 删除生产工单
+ /// 删除生产工单 启用(9/14)
///
///
[HttpDelete("{ids}")]
@@ -133,7 +133,7 @@ namespace DOAN.Admin.WebApi.Controllers
///
- /// 插入工单/或者新增工单
+ /// 插入工单/或者新增工单 启用(9/14)
///
///
/// 1成功 0失败
diff --git a/DOAN.Service/MES/product/ProWorkorderService.cs b/DOAN.Service/MES/product/ProWorkorderService.cs
index 387f1b2..6467fd5 100644
--- a/DOAN.Service/MES/product/ProWorkorderService.cs
+++ b/DOAN.Service/MES/product/ProWorkorderService.cs
@@ -267,12 +267,13 @@ namespace DOAN.Service.MES.product
}
else
{
+ // 新增工单
int sortNum = Context.Queryable().Where(it => it.WorkorderDate == handleDate).Max(it => it.Sort.Value);
ProWorkorder maxWorkorder = Context.Queryable().Where(it => it.WorkorderDate == handleDate).OrderBy(it => it.Sort).First();
string maxs = maxWorkorder.Workorder;
int index = Convert.ToInt32(maxs.Substring(maxs.Length - 3)) + 1;
- proWorkorder.Workorder = handleDate.ToString("yyyyMMdd") + index.ToString("000");
+ proWorkorder.Workorder = handleDate.ToString("yyyyMMdd") + "_" + proWorkorder.GroupCode + "_" + proWorkorder.LineCode + "_" + index.ToString("000") + "H";
proWorkorder.Sort = maxWorkorder.Sort + 10;
proWorkorder.Status = 1;