Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

油漆实验室添加产品描述

Browse Source
This commit is contained in:
赵正易
2024-09-14 15:17:33 +08:00
parent ad17ac8926
commit 1b12c975ce
18 changed files with 87 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Admin.WebApi/Controllers/mes/qc/FQC/QCStatisticsController.cs
View File

@@ -91,12 +91,12 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.FQC
/// <param name="isShowDetail">是否展示细节，展示细节则根据三行,两行合并规则</param>
/// <returns></returns>
[HttpGet("downloadStatisticsTableExcel")]
public IActionResult DownloadStatisticsTableExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize, int type, bool isShowDetail)
public IActionResult DownloadStatisticsTableExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize, int type, bool isShowDetail,int sortType)
{
try
{
string fileName = @"导出统计报表-" + DateTime.Now.ToString("yyyyMMddHHmmss") + "-" + Guid.NewGuid() + ".xlsx";
List<QcQualityStatisticsFirstDto> excelDataList = qcStatistics.DownloadStatisticsTableExcel(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize, type);
List<QcQualityStatisticsFirstDto> excelDataList = qcStatistics.DownloadStatisticsTableExcel(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize, type, sortType);
XSSFWorkbook workbook = new XSSFWorkbook();
var sheet = workbook.CreateSheet();
// 单元格样式

6
ZR.Admin.WebApi/Controllers/mes/ql/PainLab02Controller.cs
View File

@@ -21,17 +21,18 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
/// <param name="starttime"></param>
/// <param name="endTime"></param>
/// <param name="workorderid">颜色代码</param>
/// <param name="description">产品描述</param>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
[HttpGet("gettestlist")]
public IActionResult GetTestlist(DateTime starttime, DateTime endTime, string workorderid, int pageNum, int pageSize)
public IActionResult GetTestlist(DateTime starttime, DateTime endTime, string workorderid, string description, int pageNum, int pageSize)
{
//starttime = starttime.AddHours(8);
//endTime = endTime.AddHours(8);
// 时间要增加，8个小时
(List<PLTest>, int) lst = plTestService.GetPLTestTable(starttime, endTime, workorderid, pageNum, pageSize);
(List<PLTest>, int) lst = plTestService.GetPLTestTable(starttime, endTime, workorderid, description, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", lst));
}
@@ -89,6 +90,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
PLTest pLTest = new PLTest();
pLTest.Id = pLTestDto.Id;
pLTest.IdGroup = pLTestDto.plIdGroup;
pLTest.Description = pLTestDto.Description;
pLTest.Code = pLTestDto.plCode;
pLTest.Dt = pLTestDto.plDt;
pLTest.Value01 = pLTestDto.plValue01;

5
ZR.Admin.WebApi/Controllers/mes/ql/PainLab03Controller.cs
View File

@@ -25,13 +25,13 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
/// <param name="pageSize"></param>
/// <returns></returns>
[HttpGet("getbatchlist")]
public IActionResult GetBatchlist(DateTime starttime, DateTime endTime, string workorderid, int pageNum, int pageSize)
public IActionResult GetBatchlist(DateTime starttime, DateTime endTime, string workorderid, string description, int pageNum, int pageSize)
{
//starttime = starttime.AddHours(8);
//endTime = endTime.AddHours(8);
// 时间要增加，8个小时
(List<PLBatch>, int) lst = plBatchService.GetPLBatchTable(starttime, endTime, workorderid, pageNum, pageSize);
(List<PLBatch>, int) lst = plBatchService.GetPLBatchTable(starttime, endTime, workorderid, description, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", lst));
}
@@ -89,6 +89,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
PLBatch pLBatch = new PLBatch();
pLBatch.Id = pLBatchDto.Id;
pLBatch.IdGroup = pLBatchDto.plIdGroup;
pLBatch.Description = pLBatchDto.Description;
pLBatch.Code = pLBatchDto.plCode;
pLBatch.Dt = pLBatchDto.plDt;
pLBatch.Value01 = pLBatchDto.plValue01;

5
ZR.Admin.WebApi/Controllers/mes/ql/PainLabController.cs
View File

@@ -41,13 +41,13 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
/// <param name="pageSize">页大小</param>
/// <returns></returns>
[HttpGet("getrawmateriallist")]
public IActionResult GetRawMateriallist(DateTime starttime, DateTime endTime, string workorderid,string partnumber,int pageNum, int pageSize)
public IActionResult GetRawMateriallist(DateTime starttime, DateTime endTime, string workorderid,string partnumber,string description, int pageNum, int pageSize)
{
//starttime = starttime.AddHours(8);
//endTime = endTime.AddHours(8);
// 时间要增加，8个小时
(List<PLRawMaterial>, int) lst = plRawMaterialService.GetRawMaterialTable(starttime, endTime, workorderid, partnumber,pageNum, pageSize);
(List<PLRawMaterial>, int) lst = plRawMaterialService.GetRawMaterialTable(starttime, endTime, workorderid, partnumber, description, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", lst));
}
@@ -105,6 +105,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
PLRawMaterial pLRawMaterial = new PLRawMaterial();
pLRawMaterial.Id = pLRawMaterialDto.Id;
pLRawMaterial.IdGroup = pLRawMaterialDto.plIdGroup;
pLRawMaterial.Description = pLRawMaterialDto.Description;
pLRawMaterial.Code = pLRawMaterialDto.plCode;
pLRawMaterial.Pci = pLRawMaterialDto.plPci;
pLRawMaterial.Value01 = pLRawMaterialDto.plValue01;