From f4e01fb44b5428e61780e63d272df1d03f7281f3 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期六, 28 十二月 2024 13:49:32 +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 | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 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..6809ade 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,8 @@
using WIDESEA_ITaskInfoService;
using WIDESEA_TaskInfoService;
using WIDESEA_DTO.ERP;
+using WIDESEA_DTO.MES;
+using WIDESEA_Core.Helper;
namespace WIDESEA_WMSServer.Controllers.MES
{
@@ -24,7 +26,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,7 +35,6 @@
_outboundOrderService = outboundOrderService;
_taskService = taskService;
}
-
/// <summary>
/// 鎺ユ敹MES娴嬭瘯鏋跺嚭搴�
/// </summary>
@@ -42,7 +43,37 @@
[HttpPost, Route("TestToolOut"), AllowAnonymous, MethodParamsValidate]
public MesResponseContent TestToolOut([FromBody] Root<TestToolOutModel> model)
{
- return _taskService.TestToolOut(model.Content);
+ return _taskService.TestToolOut(model.Content);
+ }
+ /// <summary>
+ /// 鎺ユ敹MES娴嬭瘯鏋堕��搴�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("TestToolBack"), AllowAnonymous, MethodParamsValidate]
+ public MesResponseContent TestToolBack([FromBody] Root<TestToolBackModel> model)
+ {
+ return _taskService.TestToolBack(model.Content);
+ }
+ /// <summary>
+ /// 娴嬭瘯鏋舵姤搴�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("TestToolScrap"), AllowAnonymous, MethodParamsValidate]
+ public MesResponseContent TestScrap([FromBody] Root<TestToolScrap> model)
+ {
+ return _taskService.TestScrap(model.Content);
+ }
+ [HttpPost, Route("TestSynStock"), AllowAnonymous]
+ public WebResponseContent TestSynStock([FromBody]TestToolSynInfo toolSynInfo)
+ {
+ return _taskService.TestSynStock(toolSynInfo);
+ }
+ [HttpPost, Route("testHttp"), AllowAnonymous, MethodParamsValidate]
+ public string TestScrap(string str)
+ {
+ return HttpMesHelper.GetStr(str);
}
}
}
--
Gitblit v1.9.3