diff --git a/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs b/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs index 0006ff8..730724d 100644 --- a/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs +++ b/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs @@ -99,8 +99,7 @@ namespace DOAN.Model.MES.product.Dto - [ExcelColumn(Name = "工单状态(1 init,2 start 3 end))")] - public string StatusLabel { get; set; } + } diff --git a/DOAN.Service/MES/Product/ProWorkorderService.cs b/DOAN.Service/MES/Product/ProWorkorderService.cs index 398b656..56270ff 100644 --- a/DOAN.Service/MES/Product/ProWorkorderService.cs +++ b/DOAN.Service/MES/Product/ProWorkorderService.cs @@ -640,7 +640,7 @@ namespace DOAN.Service.MES.product workorder.WorkorderDate = dateValue; workorder.Status = 1; //工单 2024-9-13-组-线-序号 - int index = (row - 2); + int index = (row - 3); workorder.Workorder = dateValue.ToString("yyyyMMdd") + "_" + workorder.GroupCode + "_" + workorder.RouteCode + "_" + index.ToString("000"); workorder.Sort = index * 10; @@ -705,7 +705,7 @@ namespace DOAN.Service.MES.product // 遍历每一行 - for (int row = 3; row <= sheet.LastRowNum; row++) + for (int row = 4; row <= sheet.LastRowNum; row++) { IRow currentRow = sheet.GetRow(row); if (currentRow != null) // 确保行不为空 @@ -929,7 +929,7 @@ namespace DOAN.Service.MES.product .Select(it => new { it.Workorder, it.Sort }) .First(); //工单 2024-9-13-组-线-序号 - int index = (row - 2); + int index = (row - 3); int flowNum = index + Convert.ToInt16(MaxWorkorder.Workorder.Substring(MaxWorkorder.Workorder.Length - 3, 3));