From 950fac9fd7b9477fc2bbe3253d217f62ac7608e5 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 21 七月 2025 17:01:21 +0800
Subject: [PATCH] SAP接口开发

---
 Wms/Wms/Controllers/UpApiController.cs |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 637e32f..bc1297e 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -30,6 +30,7 @@
 using System.Xml.Linq;
 using WMS.IBLL.ISysServer;
 using ZXing;
+using WMS.IBLL.IBllQualityServer;
 
 namespace Wms.Controllers
 {
@@ -49,12 +50,13 @@
         private readonly IPdaAsnServer _pdaAsnServer;// PDA
         private readonly IMaterialsServer _materialSvc;//鐗╂枡Svc 
         private readonly ICustomerServer _customerSvc;//瀹㈡埛Svc 
+        private readonly IQualityInspectServer _inspectSvc;//璐ㄩ噺Svc
         private readonly IHttpServer _http;
 
 
         private string logStr = $@".\log\SAP璧嬬爜\Sap涓嬪彂鎶ユ枃" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
 
-        public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc, IPdaAsnServer pdaAsnServer, IMaterialsServer materialSvc, ICustomerServer customerSvc, IHttpServer http)
+        public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc, IPdaAsnServer pdaAsnServer, IMaterialsServer materialSvc, ICustomerServer customerSvc,IQualityInspectServer inspectSvc, IHttpServer http)
         {
             _config = setting.Value;
             _exNoticeSvc = exNoticeSvc;
@@ -64,6 +66,7 @@
             _pdaAsnServer = pdaAsnServer;
             _materialSvc = materialSvc;
             _customerSvc = customerSvc;
+            _inspectSvc = inspectSvc;
             _http = http;
         }
         #endregion
@@ -154,21 +157,21 @@
             try
             {
                 var jsonData = JsonConvert.SerializeObject(model);
-                LogFile.SaveLogToFile($"Sap鍏ュ簱鍗曚笅鍙戯細( {jsonData} ),", logStr);
+                LogFile.SaveLogToFile($"Sap鍏ュ簱鍗曟暟鎹細( {jsonData} ),", logStr);
 
                 var _result = _arrivalNoticeSvc.CreateAsn(model.data, model.@operator);
 
                 var list = new { Success = 0, Message = "涓嬪彂鎴愬姛" };
                 if (_result.Success == 0)
                 {
-                    LogFile.SaveLogToFile($"瀹㈡埛渚涘簲鍟嗕富鏁版嵁鍚屾锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
+                    LogFile.SaveLogToFile($"Sap鍏ュ簱鍗曚笅鍙戞垚鍔燂細( {JsonConvert.SerializeObject(list)} ),", logStr);
                     return Ok(new { result = true, code = "1", message = "success" });
                 }
                 else
                 {
                     list = new { Success = -1, Message = _result.Message };
 
-                    LogFile.SaveLogToFile($"瀹㈡埛渚涘簲鍟嗕富鏁版嵁鍚屾锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
+                    LogFile.SaveLogToFile($"Sap鍏ュ簱鍗曚笅鍙戝け璐ワ細( {JsonConvert.SerializeObject(list)} ),", logStr);
                     return Ok(new { result = false, code = "400", message = _result.Message });
                 }                
             }
@@ -211,14 +214,15 @@
         /// <returns></returns>
         [AllowAnonymous]
         [HttpPost]
-        public IActionResult UpQuality(object model)
+        public IActionResult UpQuality(SapQualityVm model)
         {
-
+            var logStr = $@".\log\SAP\搴撳瓨璐ㄩ噺鐘舵�佹帴鏀�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
             try
             {
-                //    var sd = JsonConvert.SerializeObject(model);
-                //    var sd2 = JsonConvert.DeserializeObject<BoxPalletBindVm>(sd);
-                LogFile.SaveLogToFile($"Sap璐ㄩ噺鐘舵�佸彉鏇达細( {model} ),", logStr);
+                var jsonData = JsonConvert.SerializeObject(model);
+                LogFile.SaveLogToFile($"Sap搴撳瓨璐ㄩ噺鐘舵�佷笅鍙戯細( {jsonData} ),", logStr);
+
+                _inspectSvc.InsertQualitySap(model.data);
                 return Ok(new { result = true, code = "1", message = "success" });
             }
             catch (Exception e)
@@ -375,7 +379,7 @@
                 {
                     return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
                 }
-                _exNoticeSvc.FinishSo(model.Id, _config.ErpHost + _config.SoFinishUrl, int.Parse(userId));
+                _exNoticeSvc.FinishSo(model.Id, _config.ErpHost + _config.SoFinishUrl, _config.ErpHost + _config.SoFinishUrl2, int.Parse(userId));
                 return Ok(new { code = 0, count = 0, msg = "鍑哄簱鍗曞鏍稿苟涓婁紶鎴愬姛" });
             }
             catch (Exception e)

--
Gitblit v1.8.0