Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

报工修改

Browse Source
This commit is contained in:
qianhao.xu
2024-12-03 20:24:07 +08:00
parent 3ae2ceb7d9
commit b4aafa8345
2 changed files with 71 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DOAN.Model/MES/Product/Dto/ProReportworkDto.cs
View File

@@ -30,6 +30,7 @@ namespace DOAN.Model.BZFM.Dto
public string RouteCode { get; set; } public string RouteCode { get; set; }
public int ProcessId { get; set; } public int ProcessId { get; set; }
public string ProcessName { get; set; }
public int? PlanNum { get; set; } public int? PlanNum { get; set; }

138
DOAN.Service/MES/Product/ProReportworkService.cs
View File

@@ -1,89 +1,91 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using DOAN.Model.BZFM.Dto; using DOAN.Model.BZFM.Dto;
using DOAN.Model.BZFM; using DOAN.Model.MES.base_;
using DOAN.Model.MES.product; using DOAN.Model.MES.product;
using DOAN.Repository; using DOAN.Repository;
using DOAN.Service.MES.product.IService; using DOAN.Service.MES.product.IService;
using Infrastructure.Attribute;
namespace DOAN.Service.MES.product;
namespace DOAN.Service.MES.product /// <summary>
/// 报工Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IProReportworkService), ServiceLifetime = LifeTime.Transient)]
public class ProReportworkService : BaseService<ProReportwork01>, IProReportworkService
{ {
/// <summary> /// <summary>
/// 报工Service业务层处理 /// 查询报工列表
/// </summary> /// </summary>
[AppService(ServiceType = typeof(IProReportworkService), ServiceLifetime = LifeTime.Transient)] /// <param name="parm"></param>
public class ProReportworkService : BaseService<ProReportwork01>, IProReportworkService /// <returns></returns>
public PagedInfo<ProReportworkDto> GetList(ProReportworkQueryDto parm)
{ {
/// <summary> var predicate = QueryExp(parm);
/// 查询报工列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<ProReportworkDto> GetList(ProReportworkQueryDto parm)
{
var predicate = QueryExp(parm);
var response = Queryable() var query = Queryable()
.Where(predicate.ToExpression()) .Where(predicate.ToExpression());
.ToPage<ProReportwork01, ProReportworkDto>(parm); var response = Context.Queryable(query).LeftJoin<BaseWorkProcesses>((q, w) => q.ProcessId == w.Id)
.Select((q, w) => new ProReportworkDto
{
ProcessName = w.Name
}, true
)
.ToPage_NO_Convert(parm);
return response; return response;
} }
/// <summary> /// <summary>
/// 获取详情 /// 获取详情
/// </summary> /// </summary>
/// <param name="Id"></param> /// <param name="Id"></param>
/// <returns></returns> /// <returns></returns>
public ProReportwork01 GetInfo(string Id) public ProReportwork01 GetInfo(string Id)
{ {
var response = Queryable() var response = Queryable()
.Where(x => x.Id == Id) .Where(x => x.Id == Id)
.First(); .First();
return response; return response;
} }
/// <summary> /// <summary>
/// 添加报工 /// 添加报工
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
public ProReportwork01 AddProReportwork(ProReportwork01 model) public ProReportwork01 AddProReportwork(ProReportwork01 model)
{ {
return Insertable(model).ExecuteReturnEntity(); return Insertable(model).ExecuteReturnEntity();
} }
/// <summary> /// <summary>
/// 修改报工 /// 修改报工
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
public int UpdateProReportwork(ProReportwork01 model) public int UpdateProReportwork(ProReportwork01 model)
{ {
return Update(model, true); return Update(model, true);
} }
/// <summary> /// <summary>
/// 查询导出表达式 /// 查询导出表达式
/// </summary> /// </summary>
/// <param name="parm"></param> /// <param name="parm"></param>
/// <returns></returns> /// <returns></returns>
private static Expressionable<ProReportwork01> QueryExp(ProReportworkQueryDto parm) private static Expressionable<ProReportwork01> QueryExp(ProReportworkQueryDto parm)
{ {
var predicate = Expressionable.Create<ProReportwork01>() var predicate = Expressionable.Create<ProReportwork01>()
.AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder)) .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(!string.IsNullOrEmpty(parm.RouteCode), it => it.RouteCode==parm.RouteCode) .AndIF(!string.IsNullOrEmpty(parm.RouteCode), it => it.RouteCode == parm.RouteCode)
.AndIF(parm.ProcessId>0, it => it.ProcessId==parm.ProcessId) .AndIF(parm.ProcessId > 0, it => it.ProcessId == parm.ProcessId)
.AndIF(parm.JobDate != null && parm.JobDate[0] > DateTime.MinValue, it => it.JobDate >= parm.JobDate[0]) .AndIF(parm.JobDate != null && parm.JobDate[0] > DateTime.MinValue, it => it.JobDate >= parm.JobDate[0])
.AndIF(parm.JobDate != null && parm.JobDate[1] > DateTime.MinValue, it => it.JobDate <= parm.JobDate[1]) .AndIF(parm.JobDate != null && parm.JobDate[1] > DateTime.MinValue, it => it.JobDate <= parm.JobDate[1])
;
;
return predicate; return predicate;
}
} }
} }