Files
kunshan-bzfm-mes-backend/DOAN.Service/MES/Product/ProReportworkService.cs
git_rabbit 3d5ad78fad feat: 添加报废记录功能及相关字段扩展
- 新增报废记录表及相关服务、控制器
- 扩展工单报表DTO,增加炉号、领料批次等字段
- 修改报表查询服务,关联工单表获取更多信息
- 在物料入库DTO中添加工单号字段
- 新增IQC文件夹结构
2026-01-22 17:25:17 +08:00

154 lines
4.9 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
{
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 > 0, it => it.RouteId == parm.RouteId)
.AndIF(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;
}
}