From d2a7c65ddb2b1652ecec24fa9ceda110738344bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Mon, 4 Aug 2025 17:27:16 +0800 Subject: [PATCH] =?UTF-8?q?Controller=E5=B1=82=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MmCallRequestsController.cs | 110 ++++++++++-------- .../IService/IMmCallService.cs | 4 +- .../MES/mm/paintedparts_call/MmCallService.cs | 15 ++- 3 files changed, 72 insertions(+), 57 deletions(-) diff --git a/DOAN.Admin.WebApi/Controllers/MES/mm/paintedparts_call/MmCallRequestsController.cs b/DOAN.Admin.WebApi/Controllers/MES/mm/paintedparts_call/MmCallRequestsController.cs index eeef49c..5e36127 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/mm/paintedparts_call/MmCallRequestsController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/mm/paintedparts_call/MmCallRequestsController.cs @@ -13,17 +13,17 @@ namespace DOAN.Admin.WebApi.Controllers /// 叫料需求表 /// [Verify] - [Route("mes/materialManagement/paintedparts_call/MmCallRequests")] - public class MmCallRequestsController : BaseController + [Route("mes/materialManagement/paintedparts_call/mmcall")] + public class mmcallController : BaseController { /// /// 叫料需求表接口 /// - private readonly IMmCallRequestsService _MmCallRequestsService; + private readonly IMmCallService _MmCallService; - public MmCallRequestsController(IMmCallRequestsService MmCallRequestsService) + public mmcallController(IMmCallService mmcallService) { - _MmCallRequestsService = MmCallRequestsService; + _MmCallService = mmcallService; } /// @@ -32,10 +32,10 @@ namespace DOAN.Admin.WebApi.Controllers /// /// [HttpGet("list")] - [ActionPermissionFilter(Permission = "materialManagement:mmcallrequests:list")] - public IActionResult QueryMmCallRequests([FromQuery] MmCallRequestsQueryDto parm) + [ActionPermissionFilter(Permission = "materialManagement:mmcall:list")] + public IActionResult Querymmcall([FromQuery] MmCallQueryDto parm) { - var response = _MmCallRequestsService.GetList(parm); + var response = _MmCallService.GetList(parm); return SUCCESS(response); } @@ -46,12 +46,12 @@ namespace DOAN.Admin.WebApi.Controllers /// /// [HttpGet("{Id}")] - [ActionPermissionFilter(Permission = "materialManagement:mmcallrequests:query")] - public IActionResult GetMmCallRequests(int Id) + [ActionPermissionFilter(Permission = "materialManagement:mmcall:query")] + public IActionResult Getmmcall(int Id) { - var response = _MmCallRequestsService.GetInfo(Id); + var response = _MmCallService.GetInfo(Id); - var info = response.Adapt(); + var info = response.Adapt(); return SUCCESS(info); } @@ -60,13 +60,13 @@ namespace DOAN.Admin.WebApi.Controllers /// /// [HttpPost] - [ActionPermissionFilter(Permission = "materialManagement:mmcallrequests:add")] + [ActionPermissionFilter(Permission = "materialManagement:mmcall:add")] [Log(Title = "叫料需求表", BusinessType = BusinessType.INSERT)] - public IActionResult AddMmCallRequests([FromBody] MmCallRequestsDto parm) + public IActionResult Addmmcall([FromBody] MmCallDto parm) { - var modal = parm.Adapt().ToCreate(HttpContext); + var modal = parm.Adapt().ToCreate(HttpContext); - var response = _MmCallRequestsService.AddMmCallRequests(modal); + var response = _MmCallService.AddMmCallMrp(modal); return SUCCESS(response); } @@ -76,12 +76,12 @@ namespace DOAN.Admin.WebApi.Controllers /// /// [HttpPut] - [ActionPermissionFilter(Permission = "materialManagement:mmcallrequests:edit")] + [ActionPermissionFilter(Permission = "materialManagement:mmcall:edit")] [Log(Title = "叫料需求表", BusinessType = BusinessType.UPDATE)] - public IActionResult UpdateMmCallRequests([FromBody] MmCallRequestsDto parm) + public IActionResult Updatemmcall([FromBody] MmCallDto parm) { - var modal = parm.Adapt().ToUpdate(HttpContext); - var response = _MmCallRequestsService.UpdateMmCallRequests(modal); + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _MmCallService.UpdateMmCallMrp(modal); return ToResponse(response); } @@ -91,14 +91,14 @@ namespace DOAN.Admin.WebApi.Controllers /// /// [HttpDelete("{ids}")] - [ActionPermissionFilter(Permission = "materialManagement:mmcallrequests:delete")] + [ActionPermissionFilter(Permission = "materialManagement:mmcall:delete")] [Log(Title = "叫料需求表", BusinessType = BusinessType.DELETE)] - public IActionResult DeleteMmCallRequests(string ids) + public IActionResult Deletemmcall(string ids) { int[] idsArr = Tools.SpitIntArrary(ids); if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } - var response = _MmCallRequestsService.Delete(idsArr); + var response = _MmCallService.Delete(idsArr); return ToResponse(response); } @@ -110,13 +110,13 @@ namespace DOAN.Admin.WebApi.Controllers [HttpPost("GenerateLineMmCallMRP")] [AllowAnonymous] [Log(Title = "生成产线油漆件MRP", BusinessType = BusinessType.OTHER)] - public IActionResult GenerateLineMmCallMRP([FromBody] MmCallRequestsDto parm) + public IActionResult GenerateLineMmCallMRP([FromBody] MmCallDto parm) { try { - var modal = parm.Adapt().ToCreate(HttpContext); + var modal = parm.Adapt().ToCreate(HttpContext); - var response = _MmCallRequestsService.GenerateLineMmCallMRP(modal); + var response = _MmCallService.GenerateLineMmCallMRP(modal); return SUCCESS(response); } @@ -128,13 +128,13 @@ namespace DOAN.Admin.WebApi.Controllers } /// - /// 产线领料 + /// 涂装油漆件产线叫料 /// /// - [HttpPost("DoLineReceiveMaterial")] + [HttpPost("DoLineCallMaterial")] [AllowAnonymous] - [Log(Title = "产线领料", BusinessType = BusinessType.OTHER)] - public IActionResult DoLineReceiveMaterial([FromBody] MmCallRequestsDto parm) + [Log(Title = "涂装油漆件产线叫料", BusinessType = BusinessType.OTHER)] + public IActionResult DoLineCallMaterial([FromBody] MmCallDto parm) { try { @@ -150,9 +150,9 @@ namespace DOAN.Admin.WebApi.Controllers { return ToResponse(new ApiResult(500, "料号不可为空")); } - var modal = parm.Adapt().ToCreate(HttpContext); + var modal = parm.Adapt().ToCreate(HttpContext); - var response = _MmCallRequestsService.GenerateLineMmCallMRP(modal); + var response = _MmCallService.DoLineCallMaterial(modal); return SUCCESS(response); } @@ -163,31 +163,47 @@ namespace DOAN.Admin.WebApi.Controllers } /// - /// 产线退料 + /// 涂装油漆件产线领料 + /// + /// + [HttpPost("DoLineReceiveMaterial")] + [AllowAnonymous] + [Log(Title = "涂装油漆件产线领料", BusinessType = BusinessType.OTHER)] + public IActionResult DoLineReceiveMaterial([FromBody] MmCallReceive parm) + { + try + { + if (parm == null || parm.Id <= 0) + { + return ToResponse(new ApiResult(500, "id不可为空")); + } + var response = _MmCallService.DoLineReceiveMaterial(parm); + + return SUCCESS(response); + } + catch (Exception ex) + { + return ToResponse(new ApiResult(500, ex.Message)); + } + } + + /// + /// 涂装油漆件产线退料 /// /// [HttpPost("DoLineReturnBackMaterial")] [AllowAnonymous] - [Log(Title = "产线退料", BusinessType = BusinessType.OTHER)] - public IActionResult DoLineReturnBackMaterial([FromBody] MmCallRequestsDto parm) + [Log(Title = "涂装油漆件产线退料", BusinessType = BusinessType.OTHER)] + public IActionResult DoLineReturnBackMaterial([FromBody] MmCallReceive parm) { try { - if (string.IsNullOrEmpty(parm.LineCode)) + if (parm == null || parm.Id <= 0) { - return ToResponse(new ApiResult(500, "线别不可为空")); + return ToResponse(new ApiResult(500, "id不可为空")); } - if (parm.RequestTime == null) - { - return ToResponse(new ApiResult(500, "时间不可为空")); - } - if (string.IsNullOrEmpty(parm.MaterialCode)) - { - return ToResponse(new ApiResult(500, "料号不可为空")); - } - var modal = parm.Adapt().ToCreate(HttpContext); - var response = _MmCallRequestsService.GenerateLineMmCallMRP(modal); + var response = _MmCallService.DoLineReturnBackMaterial(parm); return SUCCESS(response); } diff --git a/DOAN.Service/MES/mm/paintedparts_call/IService/IMmCallService.cs b/DOAN.Service/MES/mm/paintedparts_call/IService/IMmCallService.cs index 6a4940a..f4c1ad2 100644 --- a/DOAN.Service/MES/mm/paintedparts_call/IService/IMmCallService.cs +++ b/DOAN.Service/MES/mm/paintedparts_call/IService/IMmCallService.cs @@ -17,9 +17,9 @@ namespace DOAN.Service.MES.mm.paintedparts_call.IService MmCallMrp GetInfo(int Id); - MmCallMrp AddMmCallRequests(MmCallMrp parm); + MmCallMrp AddMmCallMrp(MmCallMrp parm); - int UpdateMmCallRequests(MmCallMrp parm); + int UpdateMmCallMrp(MmCallMrp parm); // 生成产线油漆件MRP int GenerateLineMmCallMRP(MmCallMrp parm); diff --git a/DOAN.Service/MES/mm/paintedparts_call/MmCallService.cs b/DOAN.Service/MES/mm/paintedparts_call/MmCallService.cs index 94d36d5..2746dc1 100644 --- a/DOAN.Service/MES/mm/paintedparts_call/MmCallService.cs +++ b/DOAN.Service/MES/mm/paintedparts_call/MmCallService.cs @@ -51,21 +51,21 @@ namespace DOAN.Service.MES.mm.paintedparts_call } /// - /// 添加叫料需求表 + /// 添加MRP叫料需求表 /// /// /// - public MmCallMrp AddMmCallRequests(MmCallMrp model) + public MmCallMrp AddMmCallMrp(MmCallMrp model) { return Context.Insertable(model).ExecuteReturnEntity(); } /// - /// 修改叫料需求表 + /// 修改MRP叫料需求表 /// /// /// - public int UpdateMmCallRequests(MmCallMrp model) + public int UpdateMmCallMrp(MmCallMrp model) { //var response = Update(w => w.Id == model.Id, it => new MmCallRequests() //{ @@ -251,15 +251,14 @@ namespace DOAN.Service.MES.mm.paintedparts_call /// public int DoLineReceiveMaterial(MmCallReceive parm) { - int MmCallReceiveId = parm.Id; - if (MmCallReceiveId > 0) + if (parm == null || parm.Id <= 0) { - throw new Exception("MmCallReceiveId传入出现异常"); + throw new ArgumentException("参数无效：MmCallReceiveId 必须为正整数", nameof(parm.Id)); } // 1.获取对应叫料信息 var mmCallReceive = Context .Queryable() - .Where(it => it.Id == MmCallReceiveId) + .Where(it => it.Id == parm.Id) .First(); if (mmCallReceive == null) {