From e867f048e92c830af97ddb346a618e08eb1ff662 Mon Sep 17 00:00:00 2001 From: DESKTOP-9BNTV8O <DESKTOP-9BNTV8O@163.com> Date: 星期五, 13 十二月 2024 10:30:45 +0800 Subject: [PATCH] 修改问题 --- Wms/Wms/Controllers/UpApiController.cs | 78 +------------------------------------- 1 files changed, 3 insertions(+), 75 deletions(-) diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs index 7a4852e..448e85f 100644 --- a/Wms/Wms/Controllers/UpApiController.cs +++ b/Wms/Wms/Controllers/UpApiController.cs @@ -33,8 +33,9 @@ private readonly IStockCheckServer _stockCheckSvc;//鐩樼偣鍗昐vc private readonly IProcurePlanServer _procurePlanSvc;//閲囪喘鍗昐vs private readonly IRcsServer _rcsserver;//RCS鐩稿叧浠诲姟 + private readonly INoticeServer _noticeSvc;//浜屾ゼ鍗曟嵁鐩稿叧 - public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc,IRcsServer rcsserver) + public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc,IRcsServer rcsserver, INoticeServer noticeSvc) { _config = setting.Value; _exNoticeSvc = exNoticeSvc; @@ -42,7 +43,7 @@ _stockCheckSvc = stockCheckSvc; _procurePlanSvc = procurePlanSvc; _rcsserver = rcsserver; - + _noticeSvc = noticeSvc; } #endregion @@ -398,79 +399,6 @@ } catch (Exception e) { - result.Message = e.Message; - return Ok(result); - } - } - - //RCS鍙《 - [HttpPost] - public IActionResult GetPalletNo(Pallnetmsg pallmsg) - { - var Pallnet = ""; - var locate = ""; - var result = new ErpModel { Success = -1, Message = "",}; - try - { - if (pallmsg.lotno != null) - { - _rcsserver.GetPalletNo(pallmsg.warehouseno, pallmsg.type, pallmsg.lotno, out Pallnet, out locate); - } - else - { - _rcsserver.GetPalletNo(pallmsg.warehouseno, pallmsg.type, out Pallnet, out locate); - } - - result.Success = 0; - result.Message = "鍙《鎴愬姛锛�"; - return Ok(result); - } - catch (Exception e) - { - result.Message = e.Message; - return Ok(result); - } - } - //RCS鐢宠鍌ㄤ綅 - [HttpPost] - public IActionResult ApplyLocatNo(Pallnetmsg pallmsg) - { - var lotno = ""; - var result = new ErpModel { Success = -1, Message = "" }; - try - { - _rcsserver.ApplyLocatNo(pallmsg.palletno,pallmsg.type, out lotno); - result.Success = 0; - result.Message = "鐢宠鍌ㄤ綅鎴愬姛锛�"; - return Ok(result); - } - catch (Exception e) - { - - result.Message = e.Message; - return Ok(result); - } - } - - //涓嬪彂璋冨害RCS浠诲姟 - //RCS鐢宠鍌ㄤ綅 - [HttpPost] - public IActionResult genAgvSchedulingTask(AgvTask agvtask) - { - var lotno = ""; - var url = ""; - genAgvSchedulingTaskRep chrep = new genAgvSchedulingTaskRep(); - var result = new ErpModel { Success = -1, Message = "" }; - try - { - _rcsserver.genAgvSchedulingTask(agvtask,url,ref chrep); - result.Success = 0; - result.Message = "鐢宠鍌ㄤ綅鎴愬姛锛�"; - return Ok(result); - } - catch (Exception e) - { - result.Message = e.Message; return Ok(result); } -- Gitblit v1.8.0