From 33b47abc54be9d7047936d5e93fb6b0401052933 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 11 六月 2025 00:08:07 +0800
Subject: [PATCH] 1

---
 代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b6af8aaf-3f61-4ae8-8aa3-21b424e50cc7.vsidx |    0 
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/QMS/QmsController.cs                                |   32 ++++++++++++++++----------------
 代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/70239ec4-f79f-45a1-a15d-2edc3d3b13f0.vsidx |    0 
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs                                |   24 +++++++++++++++++++++---
 4 files changed, 37 insertions(+), 19 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9d223ae2-4a90-4efd-ae67-f1131a379c2f.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/70239ec4-f79f-45a1-a15d-2edc3d3b13f0.vsidx"
similarity index 98%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9d223ae2-4a90-4efd-ae67-f1131a379c2f.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/70239ec4-f79f-45a1-a15d-2edc3d3b13f0.vsidx"
index a6f2c49..e407628 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9d223ae2-4a90-4efd-ae67-f1131a379c2f.vsidx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/70239ec4-f79f-45a1-a15d-2edc3d3b13f0.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ecf85f9b-999c-489f-bcd0-f5a76920c64b.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b6af8aaf-3f61-4ae8-8aa3-21b424e50cc7.vsidx"
similarity index 69%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ecf85f9b-999c-489f-bcd0-f5a76920c64b.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b6af8aaf-3f61-4ae8-8aa3-21b424e50cc7.vsidx"
index 3e6363f..4993ef6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ecf85f9b-999c-489f-bcd0-f5a76920c64b.vsidx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b6af8aaf-3f61-4ae8-8aa3-21b424e50cc7.vsidx"
Binary files differ
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 0c04ed1..7f37857 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"
@@ -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("鎴愬姛");
+        }
     }
 }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/QMS/QmsController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/QMS/QmsController.cs"
index 08263c7..f6955b6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/QMS/QmsController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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("鎴愬姛");
+        //}
     }
 }

--
Gitblit v1.9.3