RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

节拍

Browse Source
This commit is contained in:
qianhao.xu 2024-11-06 10:22:26 +08:00
parent 1f5df92451
commit 4bd3c613c5
5 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
View File

@ -46,8 +46,9 @@ namespace DOAN.Admin.WebApi.Controllers
[ActionPermissionFilter(Permission = "productManagement:proworkorder:list")]
public IActionResult QueryProWorkorder([FromBody] ProWorkorderQueryDto parm)
{
parm.WorkorderDate[0]=ConvertDateTime.ConvertLocalDate(parm.WorkorderDate[0]);
parm.WorkorderDate[0] = ConvertDateTime.ConvertLocalDate(parm.WorkorderDate[0]);
parm.WorkorderDate[1]=ConvertDateTime.ConvertLocalDate(parm.WorkorderDate[1]);
parm.GroupCode = parm.GroupCode.TrimEnd();
var response = _ProWorkorderService.GetList(parm);
return SUCCESS(response);
}

BIN
DOAN.Admin.WebApi/wwwroot/ImportTemplate/workorder.xlsx
View File

Binary file not shown.

5
DOAN.Model/MES/product/Dto/ProWorkorderDto.cs
View File

@ -116,6 +116,11 @@ namespace DOAN.Model.MES.product.Dto
/// 优先级 1-100
/// </summary>
public int? Priority { get; set; }
/// <summary>
/// 节拍 （秒）
/// </summary>
public int? Beat { get; set; }
/// <summary>
/// 工单状态

5
DOAN.Model/MES/product/ProWorkorder.cs
View File

@ -105,6 +105,11 @@ namespace DOAN.Model.MES.product
/// 工单状态
/// </summary>
public int? Status { get; set; }
/// <summary>
/// 节拍 （秒）
/// </summary>
public int? Beat { get; set; }
/// <summary>
/// 工单开始时间

5
DOAN.Service/MES/product/ProWorkorderService.cs
View File

@ -737,10 +737,13 @@ namespace DOAN.Service.MES.product
}
}
NPOI.SS.UserModel.ICell currentCell_12 = currentRow.GetCell(10);
workorder.Beat = (int)currentCell_12?.NumericCellValue;
NPOI.SS.UserModel.ICell currentCell_010 = currentRow.GetCell(10);
NPOI.SS.UserModel.ICell currentCell_010 = currentRow.GetCell(11);
workorder.Remark = currentCell_010.StringCellValue;
workorder.Id = XueHua;