- 在IProReportworkService接口中添加导出方法定义 - 实现报工数据导出服务逻辑 - 添加导出API接口 - 为ProReportworkDto添加ExcelColumn属性用于导出映射 - 调整查询参数类型为可空类型以支持更灵活的查询
215 lines
7.0 KiB
C#
215 lines
7.0 KiB
C#
using DOAN.Model.BZFM.Dto;
|
|
using DOAN.Model.MES.base_;
|
|
using DOAN.Model.MES.product;
|
|
using DOAN.Repository;
|
|
using DOAN.Service.MES.product.IService;
|
|
using Infrastructure.Attribute;
|
|
|
|
namespace DOAN.Service.MES.product;
|
|
|
|
/// <summary>
|
|
/// 报工Service业务层处理
|
|
/// </summary>
|
|
[AppService(ServiceType = typeof(IProReportworkService), ServiceLifetime = LifeTime.Transient)]
|
|
public class ProReportworkService : BaseService<ProReportwork01>, IProReportworkService
|
|
{
|
|
public List<BaseWorkRoute> GetRoute()
|
|
{
|
|
return Context.Queryable<BaseWorkRoute>().ToList();
|
|
}
|
|
|
|
/// <summary>
|
|
/// 查询全部工序
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
public List<BaseWorkProcesses> GetBaseWorkProcesses()
|
|
{
|
|
return Context.Queryable<BaseWorkProcesses>().ToList();
|
|
}
|
|
|
|
public List<BaseWorkProcesses> GetProcessByRoute(int route_id)
|
|
{
|
|
return Context
|
|
.Queryable<BaseRelWorkRouteProcesses>()
|
|
.LeftJoin<BaseWorkProcesses>((rel, pro) => rel.FkWorkProcesses == pro.Id)
|
|
.Where((rel, pro) => rel.FkWorkRoute == route_id)
|
|
.Select((rel, pro) => pro)
|
|
.ToList();
|
|
}
|
|
|
|
/// <summary>
|
|
/// 查询报工列表
|
|
/// </summary>
|
|
/// <param name="parm"></param>
|
|
/// <returns></returns>
|
|
public PagedInfo<ProReportworkDto> GetList(ProReportworkQueryDto parm)
|
|
{
|
|
var predicate = QueryExp(parm);
|
|
|
|
var query = Queryable().Where(predicate.ToExpression());
|
|
var response = Context
|
|
.Queryable(query)
|
|
.LeftJoin<BaseWorkProcesses>((q, w) => q.ProcessId == w.Id)
|
|
.LeftJoin<ProWorkorder>((q, w, wo) => q.Workorder == wo.Workorder)
|
|
.OrderBy((q, w, wo) => new { q.Workorder, w.Id })
|
|
.Select(
|
|
(q, w, wo) =>
|
|
new ProReportworkDto
|
|
{
|
|
PlanNum = wo.PlanNum,
|
|
ProcessName = w.Name,
|
|
FeedOrder = wo.FeedOrder,
|
|
ProductionName = wo.productionName,
|
|
ProductionCode = wo.productionCode,
|
|
MaterialCode = wo.MaterialCode,
|
|
MaterialName = wo.MaterialName,
|
|
StoveCode = wo.StoveCode,
|
|
},
|
|
true
|
|
)
|
|
.ToPage_NO_Convert(parm);
|
|
|
|
return response;
|
|
}
|
|
|
|
/// <summary>
|
|
/// 获取详情
|
|
/// </summary>
|
|
/// <param name="Id"></param>
|
|
/// <returns></returns>
|
|
public ProReportwork01 GetInfo(string Id)
|
|
{
|
|
var response = Queryable().Where(x => x.Id == Id).First();
|
|
|
|
return response;
|
|
}
|
|
|
|
/// <summary>
|
|
/// 添加报工
|
|
/// </summary>
|
|
/// <param name="model"></param>
|
|
/// <returns></returns>
|
|
public ProReportwork01 AddProReportwork(ProReportwork01 model)
|
|
{
|
|
//出货工序
|
|
if (model.ProcessId == 90 && !string.IsNullOrEmpty(model.Workorder))
|
|
{
|
|
Context
|
|
.Updateable<ProWorkorder>()
|
|
.SetColumns(it => it.ShipmentNum == model.FinishNum)
|
|
.Where(it => it.Workorder == model.Workorder)
|
|
.ExecuteCommand();
|
|
}
|
|
|
|
return Insertable(model).ExecuteReturnEntity();
|
|
}
|
|
|
|
/// <summary>
|
|
/// 修改报工
|
|
/// </summary>
|
|
/// <param name="model"></param>
|
|
/// <returns></returns>
|
|
public int UpdateProReportwork(ProReportwork01 model)
|
|
{
|
|
//出货工序
|
|
if (model.ProcessId == 90 && !string.IsNullOrEmpty(model.Workorder))
|
|
{
|
|
Context
|
|
.Updateable<ProWorkorder>()
|
|
.SetColumns(it => it.ShipmentNum == model.FinishNum)
|
|
.Where(it => it.Workorder == model.Workorder)
|
|
.ExecuteCommand();
|
|
}
|
|
return Update(model, true);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 查询导出表达式
|
|
/// </summary>
|
|
/// <param name="parm"></param>
|
|
/// <returns></returns>
|
|
private static Expressionable<ProReportwork01> QueryExp(ProReportworkQueryDto parm)
|
|
{
|
|
var predicate = Expressionable
|
|
.Create<ProReportwork01>()
|
|
.AndIF(
|
|
!string.IsNullOrEmpty(parm.Workorder),
|
|
it => it.Workorder.Contains(parm.Workorder)
|
|
)
|
|
//.AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker))
|
|
.AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker))
|
|
.AndIF(parm.RouteId.HasValue && parm.RouteId > 0, it => it.RouteId == parm.RouteId)
|
|
.AndIF(parm.ProcessId.HasValue && parm.ProcessId > 0, it => it.ProcessId == parm.ProcessId)
|
|
.AndIF(
|
|
parm.JobDateTime != null && parm.JobDateTime[0] > DateTime.MinValue,
|
|
it => it.JobDateTime >= parm.JobDateTime[0]
|
|
)
|
|
.AndIF(
|
|
parm.JobDateTime != null && parm.JobDateTime[1] > DateTime.MinValue,
|
|
it => it.JobDateTime <= parm.JobDateTime[1].AddDays(1)
|
|
);
|
|
|
|
return predicate;
|
|
}
|
|
|
|
/// <summary>
|
|
/// 执行报工数据查询
|
|
/// </summary>
|
|
/// <param name="query"></param>
|
|
/// <returns></returns>
|
|
private List<ProReportworkDto> ExecuteExportQuery(ISugarQueryable<ProReportwork01> query)
|
|
{
|
|
var response = Context
|
|
.Queryable(query)
|
|
.LeftJoin<BaseWorkProcesses>((q, w) => q.ProcessId == w.Id)
|
|
.LeftJoin<ProWorkorder>((q, w, wo) => q.Workorder == wo.Workorder)
|
|
.OrderBy((q, w, wo) => new { q.Workorder, w.Id })
|
|
.Select(
|
|
(q, w, wo) =>
|
|
new ProReportworkDto
|
|
{
|
|
PlanNum = wo.PlanNum,
|
|
ProcessName = w.Name,
|
|
FeedOrder = wo.FeedOrder,
|
|
ProductionName = wo.productionName,
|
|
ProductionCode = wo.productionCode,
|
|
MaterialCode = wo.MaterialCode,
|
|
MaterialName = wo.MaterialName,
|
|
StoveCode = wo.StoveCode,
|
|
},
|
|
true
|
|
)
|
|
.ToList();
|
|
|
|
return response;
|
|
}
|
|
|
|
/// <summary>
|
|
/// 导出报工数据
|
|
/// </summary>
|
|
/// <param name="extportDate"></param>
|
|
/// <returns></returns>
|
|
public List<ProReportworkDto> ReportWorkExport(DateTime extportDate)
|
|
{
|
|
var startDate = extportDate.Date;
|
|
var endDate = startDate.AddDays(1);
|
|
|
|
var query = Queryable()
|
|
.Where(it => it.JobDateTime >= startDate && it.JobDateTime < endDate);
|
|
|
|
return ExecuteExportQuery(query);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 导出报工数据(带查询参数)
|
|
/// </summary>
|
|
/// <param name="parm"></param>
|
|
/// <returns></returns>
|
|
public List<ProReportworkDto> GetExportList(ProReportworkQueryDto parm)
|
|
{
|
|
var predicate = QueryExp(parm);
|
|
var query = Queryable().Where(predicate.ToExpression());
|
|
return ExecuteExportQuery(query);
|
|
}
|
|
}
|