diff --git a/DOAN.Service/MES/product/ProWorkorderService.cs b/DOAN.Service/MES/product/ProWorkorderService.cs index cb38ab8..5d2d0ed 100644 --- a/DOAN.Service/MES/product/ProWorkorderService.cs +++ b/DOAN.Service/MES/product/ProWorkorderService.cs @@ -159,11 +159,19 @@ namespace DOAN.Service.MES.product List proWorkorderList = Context.Queryable().Where(it => it.WorkorderDate == update_time) .Where(it => it.Status == 1) .OrderBy(it => it.Sort).ToList(); - + string maxs= Context.Queryable().Where(it => it.WorkorderDate == update_time) + .Where(it => it.Status == 3).Max(it => it.Workorder); if (proWorkorderList != null && proWorkorderList.Count() > 0) { + string baseSort = update_time.ToString("yyyyMMdd"); int index = 1; + if (!string.IsNullOrEmpty(maxs)) + { + index = Convert.ToInt32(maxs.Substring(maxs.Length - 3))+1; + + } + foreach (ProWorkorder item in proWorkorderList) { item.Workorder = baseSort + index.ToString("000");