完成工单和报工

This commit is contained in:
qianhao.xu 2024-09-19 14:41:13 +08:00
parent 337173fa2d
commit 81d640ee8b
3 changed files with 65 additions and 0 deletions

View File

@ -2,6 +2,8 @@
using DOAN.Admin.WebApi.Filters;
using DOAN.Service.JobKanban.IService;
using DOAN.Service.JobKanban;
using DOAN.Model.MES.product.Dto;
using DOAN.Model.MES.product;
namespace DOAN.WebApi.Controllers.JobKanban
{
/// <summary>
@ -147,6 +149,23 @@ namespace DOAN.WebApi.Controllers.JobKanban
return SUCCESS(response);
}
/// <summary>
/// TODO 完成 工单和报工 (启用)
/// </summary>
/// <param name="workorder"></param>
/// <returns></returns>
[HttpPost("finish_workorder2")]
public IActionResult FinishWorkOrder2([FromBody] ProReportworkDto3 reportWorkDto)
{
if (reportWorkDto == null)
{
return SUCCESS(null);
}
ProReportwork reportWork = reportWorkDto.Adapt<ProReportwork>();
reportWork.ToCreate(HttpContext);
var response = workorderProgressService.FinishWorkOrder(reportWork);
return SUCCESS(response);
}
}

View File

@ -32,5 +32,8 @@ namespace DOAN.Service.JobKanban.IService
int LabelWorkOrderMatch(string LabelContext, string workOrder);
int FinishWorkOrder(ProReportwork reportWorkDto);
}
}

View File

@ -194,6 +194,49 @@ namespace DOAN.Service.JobKanban
.ExecuteCommand();
}
/// <summary>
/// 完成工单和报工
/// </summary>
/// <param name="workorder"></param>
/// <param name="num">完成数量</param>
/// <returns></returns>
public int FinishWorkOrder(ProReportwork reportWorkDto)
{
int result = 0;
int DispatchNum = Context.Queryable<ProWorkorder>()
.Where(it => it.Workorder == reportWorkDto.FkWorkorder)
.Select(it => it.DeliveryNum.Value).First();
UseTran2(() =>
{
result = Context.Updateable<ProWorkorder>()
.Where(it => it.Workorder == reportWorkDto.FkWorkorder)
.SetColumns(it => it.Status == 3)
.ExecuteCommand();
reportWorkDto.Id = XueHua;
reportWorkDto.DispatchNum = DispatchNum;
Context.Storageable(reportWorkDto)
.WhereColumns(it => it.FkWorkorder)
.ExecuteCommand();
});
//ProReportwork reportWork = new ProReportwork();
//reportWork.Id = XueHua;
//reportWork.FkWorkorder = reportWorkDto.FkWorkorder;
//reportWork.DispatchNum = DispatchNum;
//reportWork.FinishedNum = reportWorkDto.FinishedNum;
//reportWork.GroupCode = reportWorkDto.GroupCode;
//reportWork.LineCode = reportWorkDto.LineCode;
//reportWork.GroupLeader = reportWorkDto.GroupLeader;
//reportWork.CreatedTime = DateTime.Now;
//reportWork.CreatedBy = reportWorkDto.CreatedBy;
return result;
}
}
}