From d3e81088f1afdc01b14af6bdac533116ab0cdb60 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 27 六月 2025 17:04:54 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/Wms/Controllers/UpApiController.cs | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index ffa1384..3f77a43 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -28,6 +28,7 @@
using WMS.IBLL;
using ZXing.QrCode.Internal;
using System.Xml.Linq;
+using WMS.IBLL.ISysServer;
namespace Wms.Controllers
{
@@ -45,11 +46,14 @@
private readonly IStockCheckServer _stockCheckSvc;//鐩樼偣鍗昐vc
private readonly IProcurePlanServer _procurePlanSvc;//閲囪喘鍗昐vs
private readonly IPdaAsnServer _pdaAsnServer;// PDA
+ private readonly IMaterialsServer _materialSvc;//鐗╂枡Svc
+ private readonly ICustomerServer _customerSvc;//瀹㈡埛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, IHttpServer http)
+ public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc, IPdaAsnServer pdaAsnServer, IMaterialsServer materialSvc, ICustomerServer customerSvc, IHttpServer http)
{
_config = setting.Value;
_exNoticeSvc = exNoticeSvc;
@@ -57,6 +61,8 @@
_stockCheckSvc = stockCheckSvc;
_procurePlanSvc = procurePlanSvc;
_pdaAsnServer = pdaAsnServer;
+ _materialSvc = materialSvc;
+ _customerSvc = customerSvc;
_http = http;
}
#endregion
@@ -69,11 +75,23 @@
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
- public IActionResult CreateSku(object model)
+ public async Task<IActionResult> CreateSku(SapSkuInfoVm model)
{
+ var logStr = $@".\log\SAP\鐗╂枡涓绘暟鎹笅鍙�" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
try
{
- LogFile.SaveLogToFile($"Sap鐗╂枡涓绘暟鎹細( {model} ),", logStr);
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"Sap鐗╂枡涓绘暟鎹細( {jsonData} ),", logStr);;
+
+ var str = await _materialSvc.AddSkuSap(model.data);
+
+ var list = new { Success = 0, Message = "涓嬪彂鎴愬姛" };
+ if (!str.Contains("0"))
+ {
+ list = new { Success = -1, Message = str };
+ }
+
+ LogFile.SaveLogToFile($"SAP鐗╂枡涓绘暟鎹笅鍙戯細( {JsonConvert.SerializeObject(list)} ),", logStr);
return Ok(new { result = true, code = "1" ,message = "success" });
}
catch (Exception e)
@@ -90,12 +108,24 @@
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
- public IActionResult CreateCustomer(object model)
+ public async Task<IActionResult> CreateCustomer(SapCustomerVm model)
{
-
+ var logStr = $@".\log\SAP\瀹㈡埛渚涘簲鍟嗕富鏁版嵁鍚屾" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
try
{
- LogFile.SaveLogToFile($"Sap瀹㈡埛淇℃伅涓绘暟鎹細( {model} ),", logStr);
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"Sap瀹㈡埛淇℃伅涓绘暟鎹細( {jsonData} ),", logStr);
+
+ var str = await _customerSvc.AddCustomerSap(model.data);
+
+ var list = new { Success = 0, Message = "涓嬪彂鎴愬姛" };
+ if (!str.Contains("0"))
+ {
+ list = new { Success = -1, Message = str };
+ }
+
+ LogFile.SaveLogToFile($"瀹㈡埛渚涘簲鍟嗕富鏁版嵁鍚屾锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
+
return Ok(new { result = true, code = "1", message = "success" });
}
catch (Exception e)
--
Gitblit v1.8.0