Merge branch 'master' of https://gitee.com/doan-tech/zhuangpei-mesbackend
This commit is contained in:
commit
5fbc154ef4
@ -8,6 +8,7 @@ using DOAN.Model.MES.quality.IPQC.Dto;
|
||||
using DOAN.Model.MES.quality.IPQC;
|
||||
using DOAN.Service.MES.quality.IQC.IService;
|
||||
using DOAN.Service.MES.quality.IPQC;
|
||||
using Infrastructure.Converter;
|
||||
|
||||
//创建时间:2024-09-30
|
||||
namespace DOAN.WebApi.Controllers.MES.quality.IQC
|
||||
@ -32,6 +33,26 @@ namespace DOAN.WebApi.Controllers.MES.quality.IQC
|
||||
var response = qcReportService.GetLossList(parm);
|
||||
return SUCCESS(response);
|
||||
}
|
||||
|
||||
|
||||
//TODO 导出excel 报损单
|
||||
|
||||
/// <summary>
|
||||
/// 报损单导出 启用(9/14)
|
||||
/// </summary>
|
||||
/// <param name="user"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("export")]
|
||||
[Log(Title = "工单导出", BusinessType = BusinessType.EXPORT)]
|
||||
[AllowAnonymous]
|
||||
public IActionResult ReportLossExport([FromQuery] DateTime extportDate)
|
||||
{
|
||||
extportDate= DOANConvertDateTime.ConvertLocalDate(extportDate);
|
||||
var list = qcReportService.ReportLossExport(extportDate);
|
||||
|
||||
var result = ExportExcelMini(list, "ReportLoss", "报损单列表");
|
||||
return ExportExcel(result.Item2, result.Item1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -15,5 +15,8 @@ namespace DOAN.Service.MES.quality.IQC.IService
|
||||
PagedInfo<QcDefectCollectionDto> GetCompensationList(QcDefectCollectionQueryDto2 parm);
|
||||
|
||||
List<QcDefectCollection> ClaimFormExport(DateTime extportDate);
|
||||
|
||||
|
||||
List<QcDefectCollection> ReportLossExport(DateTime extportDate);
|
||||
}
|
||||
}
|
||||
|
||||
@ -79,6 +79,13 @@ namespace DOAN.Service.MES.quality.IQC
|
||||
.Where(it=>it.Type==2)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
public List<QcDefectCollection> ReportLossExport(DateTime extportDate)
|
||||
{
|
||||
return Context.Queryable<QcDefectCollection>().Where(it => it.Type == 2)
|
||||
.Where(it => it.DateTime == extportDate)
|
||||
.ToList();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user