Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
qianhao.xu
2024-12-03 16:17:06 +08:00
parent 3b9e182c5d
commit 6595026c8c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs
View File

@@ -99,8 +99,7 @@ namespace DOAN.Model.MES.product.Dto
[ExcelColumn(Name = "工单状态（1 init,2 start 3 end)）")]
public string StatusLabel { get; set; }
} }

6
DOAN.Service/MES/Product/ProWorkorderService.cs
View File

@@ -640,7 +640,7 @@ namespace DOAN.Service.MES.product
workorder.WorkorderDate = dateValue; workorder.WorkorderDate = dateValue;
workorder.Status = 1; workorder.Status = 1;
//工单 2024-9-13-组-线-序号 //工单 2024-9-13-组-线-序号
int index = (row - 2); int index = (row - 3);
workorder.Workorder = dateValue.ToString("yyyyMMdd") + "_" + workorder.GroupCode + "_" + workorder.RouteCode + "_" + index.ToString("000"); workorder.Workorder = dateValue.ToString("yyyyMMdd") + "_" + workorder.GroupCode + "_" + workorder.RouteCode + "_" + index.ToString("000");
workorder.Sort = index * 10; 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); IRow currentRow = sheet.GetRow(row);
if (currentRow != null) // 确保行不为空 if (currentRow != null) // 确保行不为空
@@ -929,7 +929,7 @@ namespace DOAN.Service.MES.product
.Select(it => new { it.Workorder, it.Sort }) .Select(it => new { it.Workorder, it.Sort })
.First(); .First();
//工单 2024-9-13-组-线-序号 //工单 2024-9-13-组-线-序号
int index = (row - 2); int index = (row - 3);
int flowNum = index + int flowNum = index +
Convert.ToInt16(MaxWorkorder.Workorder.Substring(MaxWorkorder.Workorder.Length - 3, 3)); Convert.ToInt16(MaxWorkorder.Workorder.Substring(MaxWorkorder.Workorder.Length - 3, 3));