From e9f11eec6cbb720dcb456edaf5af6db715b131e9 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 11 一月 2025 17:38:53 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/ERPService/InvokeERPService.cs | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/ERPService/InvokeERPService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/ERPService/InvokeERPService.cs"
index 9f898a1..b2b161f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/ERPService/InvokeERPService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/ERPService/InvokeERPService.cs"
@@ -1,4 +1,6 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -19,8 +21,13 @@
private readonly IApiInfoRepository _apiInfoRepository;
public InvokeERPService(IApiInfoRepository apiInfoRepository)
{
- _apiInfoRepository= apiInfoRepository;
+ _apiInfoRepository = apiInfoRepository;
}
+ // 鍒涘缓涓�涓娇鐢ㄥ皬椹煎嘲鍛藉悕娉曠殑搴忓垪鍖栬缃�
+ JsonSerializerSettings settings = new JsonSerializerSettings
+ {
+ ContractResolver = new CamelCasePropertyNamesContractResolver()
+ };
/// <summary>
/// ERP鏀惰揣鍗曟帴鍙ｈ皟鐢�
/// </summary>
@@ -28,15 +35,18 @@
/// <returns></returns>
public string InvokeMatReceiveApi(ERPReceiveModel receiveModel)
{
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x=>x.ApiCode==APIEnum.InvokeMatReceiveApi.ToString());
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
ERPBaseModel<ERPReceiveModel> model = new ERPBaseModel<ERPReceiveModel>()
{
Data = receiveModel,
Desc = "鏀惰揣鍗�",
Type = "toTCWMSReceive",
- SecurityCode = ""
+ SecurityCode = "TeChuang"
};
- string response = HttpHelper.Post(apiInfo.ApiAddress, model.Serialize());
+
+ string request = JsonConvert.SerializeObject(model, settings);
+
+ string response = HttpHelper.Post(apiInfo.ApiAddress, request);
return response;
}
@@ -47,16 +57,17 @@
/// <returns></returns>
public string InvokeCheckOrderApi(ERPCheckModel checkModel)
{
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeCheckOrderApi.ToString());
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
ERPBaseModel<ERPCheckModel> model = new ERPBaseModel<ERPCheckModel>()
{
Data = checkModel,
- Desc = "鏀惰揣鍗�",
+ Desc = "鐗╂枡IQC妫�楠屽崟",
Type = "toTCWMSIQCTest",
- SecurityCode = ""
+ SecurityCode = "TeChuang"
};
+ string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, model.Serialize());
+ string response = HttpHelper.Post(apiInfo.ApiAddress, request);
return response;
}
@@ -67,16 +78,33 @@
/// <returns></returns>
public string InvokeInboundOrderApi(ERPInboundModel inboundModel)
{
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeInboundOrderApi.ToString());
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
ERPBaseModel<ERPInboundModel> model = new ERPBaseModel<ERPInboundModel>()
{
Data = inboundModel,
- Desc = "鏀惰揣鍗�",
+ Desc = "鐗╂枡鍏ュ簱鍗�",
Type = "toTCWMSMaterialWarehousing",
- SecurityCode = ""
+ SecurityCode = "TeChuang"
};
-
- string response = HttpHelper.Post(apiInfo.ApiAddress, model.Serialize());
+ string request = JsonConvert.SerializeObject(model, settings);
+ string response = HttpHelper.Post(apiInfo.ApiAddress, request);
+ return response;
+ }
+ /// <summary>
+ /// ERP棰嗘枡閫氱煡鍗曞嚭搴�
+ /// </summary>
+ public string InvokeOutStandardsApi(ERPIssueModel issueModel)
+ {
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
+ ERPBaseModel<ERPIssueModel> model = new ERPBaseModel<ERPIssueModel>()
+ {
+ Data = issueModel,
+ Desc = "棰嗘枡鍑哄簱閫氱煡鍗�",
+ Type = "toStandardPickList",
+ SecurityCode = "TeChuang"
+ };
+ string request = JsonConvert.SerializeObject(model, settings).Replace("issitem", "Issitem");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, request);
return response;
}
/// <summary>
@@ -86,15 +114,16 @@
/// <returns></returns>
public string InvokeOutboundOrderApi(ERPOutboundModel outboundModel)
{
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeOutboundOrderApi.ToString());
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
ERPBaseModel<ERPOutboundModel> model = new ERPBaseModel<ERPOutboundModel>()
{
Data = outboundModel,
Desc = "鏉愭枡鍑哄簱",
Type = "toBomMaterialOutTC",
- SecurityCode = "LxkgPgN3$U"
+ SecurityCode = "TeChuang"
};
- string response = HttpHelper.Post(apiInfo.ApiAddress, model.Serialize());
+ string request = JsonConvert.SerializeObject(model, settings);
+ string response = HttpHelper.Post(apiInfo.ApiAddress, request);
return response;
}
}
--
Gitblit v1.9.3