´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/70239ec4-f79f-45a1-a15d-2edc3d3b13f0.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b6af8aaf-3f61-4ae8-8aa3-21b424e50cc7.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs
@@ -14,6 +14,8 @@ using WIDESEA_Core.Helper; using Autofac.Core; using WIDESEA_DTO.Stock; using WIDESEA_External.Model; using WIDESEA_External.ERPService; namespace WIDESEA_WMSServer.Controllers.MES { @@ -26,11 +28,12 @@ { private readonly IOutboundService _outboundService; private readonly ITaskService _taskService; public MesController(IOutboundService outboundService, ITaskService taskService) private readonly IInvokeERPService _invokeERPService; public MesController(IOutboundService outboundService, ITaskService taskService,IInvokeERPService invokeERPService) { _outboundService = outboundService; _taskService = taskService; _invokeERPService = invokeERPService; } /// <summary> @@ -245,6 +248,21 @@ { return _taskService.PPGeneratePKOutboundTask(orderDetailId, stockSelectViews); } /// <summary> /// æ£éªååä¼ æ´æ° /// </summary> /// <param name="model"></param> /// <returns></returns> [HttpPost, Route("CheckResultReturn"), AllowAnonymous, MethodParamsValidate] public MesResponseContent CheckResultReturn([FromBody] ERPCheckModel model) { string content = _invokeERPService.InvokeCheckOrderApi(model); ErpRequestContent requestContent = content.DeserializeObject<ErpRequestContent>(); if (requestContent.res != 1) { return MesResponseContent.Instance.Error(requestContent.Data); } return MesResponseContent.Instance.OK("æå"); } } } ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/QMS/QmsController.cs
@@ -74,21 +74,21 @@ string content = _invokeQMSService.InvokeReceiveCheckApi(model); return content; } /// <summary> /// æ£éªååä¼ æ´æ° /// </summary> /// <param name="model"></param> /// <returns></returns> [HttpPost, Route("CheckResultReturn"), AllowAnonymous, MethodParamsValidate] public MesResponseContent CheckResultReturn([FromBody] ERPCheckModel model) { string content = _invokeERPService.InvokeCheckOrderApi(model); ErpRequestContent requestContent = content.DeserializeObject<ErpRequestContent>(); if (requestContent.res != 1) { return MesResponseContent.Instance.Error(requestContent.Data); } return MesResponseContent.Instance.OK("æå"); } ///// <summary> ///// æ£éªååä¼ æ´æ° ///// </summary> ///// <param name="model"></param> ///// <returns></returns> //[HttpPost, Route("CheckResultReturn"), AllowAnonymous, MethodParamsValidate] //public MesResponseContent CheckResultReturn([FromBody] ERPCheckModel model) //{ // string content = _invokeERPService.InvokeCheckOrderApi(model); // ErpRequestContent requestContent = content.DeserializeObject<ErpRequestContent>(); // if (requestContent.res != 1) // { // return MesResponseContent.Instance.Error(requestContent.Data); // } // return MesResponseContent.Instance.OK("æå"); //} } }