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 19:02:23 +08:00
parent 6cc576e43e
commit d62b577466
7 changed files with 368 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs Normal file
View File

@@ -0,0 +1,106 @@
using Microsoft.AspNetCore.Mvc;
using DOAN.Model.BZFM.Dto;
using DOAN.Model.BZFM;
using DOAN.Service.BZFM.IBZFMService;
using DOAN.Admin.WebApi.Filters;
using DOAN.Model.MES.product;
using Infrastructure.Converter;
//创建时间：2024-12-03
namespace DOAN.Admin.WebApi.Controllers.BZFM
{
/// <summary>
/// 报工
/// </summary>
[Verify]
[Route("mes/productManagement/ProReportwork")]
public class ProReportworkController : BaseController
{
/// <summary>
/// 报工接口
/// </summary>
private readonly IProReportworkService _ProReportworkService;
public ProReportworkController(IProReportworkService ProReportworkService)
{
_ProReportworkService = ProReportworkService;
}
/// <summary>
/// 查询报工列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "proreportwork:list")]
public IActionResult QueryProReportwork([FromQuery] ProReportworkQueryDto parm)
{
parm.JobDate[0] = DOANConvertDate.ConvertLocalDate(parm.JobDate[0]);
parm.JobDate[1] = DOANConvertDate.ConvertLocalDate(parm.JobDate[1]);
var response = _ProReportworkService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询报工详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "proreportwork:query")]
public IActionResult GetProReportwork(string Id)
{
var response = _ProReportworkService.GetInfo(Id);
var info = response.Adapt<ProReportworkDto>();
return SUCCESS(info);
}
/// <summary>
/// 添加报工
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "proreportwork:add")]
[Log(Title = "报工", BusinessType = BusinessType.INSERT)]
public IActionResult AddProReportwork([FromBody] ProReportworkDto parm)
{
var modal = parm.Adapt<ProReportwork01>().ToCreate(HttpContext);
var response = _ProReportworkService.AddProReportwork(modal);
return SUCCESS(response);
}
/// <summary>
/// 更新报工
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "proreportwork:edit")]
[Log(Title = "报工", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateProReportwork([FromBody] ProReportworkDto parm)
{
var modal = parm.Adapt<ProReportwork01>().ToUpdate(HttpContext);
var response = _ProReportworkService.UpdateProReportwork(modal);
return ToResponse(response);
}
/// <summary>
/// 删除报工
/// </summary>
/// <returns></returns>
[HttpPost("delete/{ids}")]
[ActionPermissionFilter(Permission = "proreportwork:delete")]
[Log(Title = "报工", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteProReportwork([FromRoute]string ids)
{
var idArr = Tools.SplitAndConvert<string>(ids);
return ToResponse(_ProReportworkService.Delete(idArr));
}
}
}

2
DOAN.Model/MES/Base/Dto/BaseWorkRouteDto.cs
View File

@@ -52,6 +52,8 @@ namespace DOAN.Model.MES.base_.Dto
{
[Required(ErrorMessage = "主键不能为空")]
public int Id { get; set; }
public string ProductionCode { get; set; }
public List<BaseWorkProcessesDto3> BaseWorkProcessesList { get; set; }
public string Name { get; set; }

57
DOAN.Model/MES/Product/Dto/ProReportworkDto.cs Normal file
View File

@@ -0,0 +1,57 @@
namespace DOAN.Model.BZFM.Dto
{
/// <summary>
/// 报工查询对象
/// </summary>
public class ProReportworkQueryDto : PagerInfo
{
public string Workorder { get; set; }
public string RouteCode { get; set; }
public string ProcessCode { get; set; }
public string Worker { get; set; }
public DateTime[] JobDate { get; set; } = new DateTime[2];
}
/// <summary>
/// 报工输入输出对象
/// </summary>
public class ProReportworkDto
{
[Required(ErrorMessage = "雪花不能为空")]
public string Id { get; set; }
public string Workorder { get; set; }
public string RouteCode { get; set; }
public string ProcessCode { get; set; }
public int? PlanNum { get; set; }
public int? FinishNum { get; set; }
public int? BadNum { get; set; }
public string Worker { get; set; }
public DateTime? JobDate { get; set; }
public string Remark { get; set; }
public string CreatedBy { get; set; }
public DateTime? CreatedTime { get; set; }
public string UpdatedBy { get; set; }
public DateTime? UpdatedTime { get; set; }
}
}

92
DOAN.Model/MES/Product/ProReportwork01.cs Normal file
View File

@@ -0,0 +1,92 @@
namespace DOAN.Model.MES.product
{
/// <summary>
/// 报工
/// </summary>
[SugarTable("pro_reportwork")]
public class ProReportwork01
{
/// <summary>
/// 雪花
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
public string Id { get; set; }
/// <summary>
/// 工单code
/// </summary>
public string Workorder { get; set; }
/// <summary>
/// 路线code
/// </summary>
[SugarColumn(ColumnName = "route_code")]
public string RouteCode { get; set; }
/// <summary>
/// 工序code
/// </summary>
[SugarColumn(ColumnName = "process_code")]
public string ProcessCode { get; set; }
/// <summary>
/// 计划数量
/// </summary>
[SugarColumn(ColumnName = "plan_num")]
public int? PlanNum { get; set; }
/// <summary>
/// 完成数量
/// </summary>
[SugarColumn(ColumnName = "finish_num")]
public int? FinishNum { get; set; }
/// <summary>
/// 不良数量
/// </summary>
[SugarColumn(ColumnName = "bad_num")]
public int? BadNum { get; set; }
/// <summary>
/// 作业员
/// </summary>
public string Worker { get; set; }
/// <summary>
/// 作业日期
/// </summary>
[SugarColumn(ColumnName = "job_date")]
public DateTime? JobDate { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 创建人
/// </summary>
[SugarColumn(ColumnName = "cREATED_BY")]
public string CreatedBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "cREATED_TIME")]
public DateTime? CreatedTime { get; set; }
/// <summary>
/// 更新人
/// </summary>
[SugarColumn(ColumnName = "uPDATED_BY")]
public string UpdatedBy { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[SugarColumn(ColumnName = "uPDATED_TIME")]
public DateTime? UpdatedTime { get; set; }
}
}

1
DOAN.Service/MES/Base/BaseWorkRouteService.cs
View File

@@ -43,6 +43,7 @@ namespace DOAN.Service.MES.base_
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<BaseWorkRoute, BaseWorkRouteDto_bind_process>(parm);
if (response != null && response.Result.Count > 0)
{
foreach (var item in response.Result)

22
DOAN.Service/MES/Product/IService/IProReportworkService.cs Normal file
View File

@@ -0,0 +1,22 @@
using DOAN.Model.BZFM.Dto;
using DOAN.Model.BZFM;
using DOAN.Model.MES.product;
namespace DOAN.Service.BZFM.IBZFMService
{
/// <summary>
/// 报工service接口
/// </summary>
public interface IProReportworkService : IBaseService<ProReportwork01>
{
PagedInfo<ProReportworkDto> GetList(ProReportworkQueryDto parm);
ProReportwork01 GetInfo(string Id);
ProReportwork01 AddProReportwork(ProReportwork01 parm);
int UpdateProReportwork(ProReportwork01 parm);
}
}

88
DOAN.Service/MES/Product/ProReportworkService.cs Normal file
View File

@@ -0,0 +1,88 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using DOAN.Model.BZFM.Dto;
using DOAN.Model.BZFM;
using DOAN.Model.MES.product;
using DOAN.Repository;
using DOAN.Service.BZFM.IBZFMService;
namespace DOAN.Service.BZFM
{
/// <summary>
/// 报工Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IProReportworkService), ServiceLifetime = LifeTime.Transient)]
public class ProReportworkService : BaseService<ProReportwork01>, IProReportworkService
{
/// <summary>
/// 查询报工列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<ProReportworkDto> GetList(ProReportworkQueryDto parm)
{
var predicate = QueryExp(parm);
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<ProReportwork01, ProReportworkDto>(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)
{
return Insertable(model).ExecuteReturnEntity();
}
/// <summary>
/// 修改报工
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateProReportwork(ProReportwork01 model)
{
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.RouteCode), it => it.RouteCode==parm.RouteCode)
.AndIF(!string.IsNullOrEmpty(parm.ProcessCode), it => it.ProcessCode==parm.ProcessCode)
.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])
;
return predicate;
}
}
}