From 9021596951ef5f903bc2b38e0ca726c73d7821fa Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期三, 18 十二月 2024 16:59:51 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs" index 2ba94bd..7c91fd8 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs" @@ -10,6 +10,7 @@ using WIDESEA_ITaskInfoService; using WIDESEA_TaskInfoService; using WIDESEA_DTO.ERP; +using WIDESEA_DTO.MES; namespace WIDESEA_WMSServer.Controllers.MES { @@ -24,7 +25,7 @@ private readonly IOutboundOrderService _outboundOrderService; private readonly ITaskService _taskService; - public MesController(IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderService purchaseOrderService, ISupplierInfoService supplierInfoService, IMaterielInfoService materielInfoService, IOutboundOrderService outboundOrderService,ITaskService taskService) + public MesController(IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderService purchaseOrderService, ISupplierInfoService supplierInfoService, IMaterielInfoService materielInfoService, IOutboundOrderService outboundOrderService, ITaskService taskService) { _purchaseOrderRepository = purchaseOrderRepository; _purchaseOrderService = purchaseOrderService; @@ -33,16 +34,15 @@ _outboundOrderService = outboundOrderService; _taskService = taskService; } - /// <summary> /// 鎺ユ敹MES娴嬭瘯鏋跺嚭搴� /// </summary> /// <param name="model"></param> /// <returns></returns> - [HttpPost, Route("TestToolOut"), AllowAnonymous, MethodParamsValidate] - public MesResponseContent TestToolOut([FromBody] Root<TestToolOutModel> model) - { - return _taskService.TestToolOut(model.Content); - } + //[HttpPost, Route("TestToolOut"), AllowAnonymous, MethodParamsValidate] + //public MesResponseContent TestToolOut([FromBody] Root<TestToolOutModel> model) + //{ + // return _taskService.TestToolOut(model.Content); + //} } } -- Gitblit v1.9.3