From 733c975cd8647f6d006736f1863bad731e32e6fb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 26 十月 2025 17:15:52 +0800
Subject: [PATCH] 上传最新代码，ERP接口，MES接口优化，WMS业务优化等
---
项目代码/WMS/WMSServices/WIDESEA_External/ERPService/InvokeERPService.cs | 298 ++++++++---------------------------------------------------
1 files changed, 40 insertions(+), 258 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/ERPService/InvokeERPService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/ERPService/InvokeERPService.cs"
index f279c45..5a5b191 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/ERPService/InvokeERPService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/ERPService/InvokeERPService.cs"
@@ -6,6 +6,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.APIEnum;
+using WIDESEA_Common.CommonEnum;
using WIDESEA_Core.Helper;
using WIDESEA_External.Model;
using WIDESEA_IBasicRepository;
@@ -29,278 +30,59 @@
ContractResolver = new CamelCasePropertyNamesContractResolver()
};
/// <summary>
- /// ERP鏀惰揣鍗曟帴鍙ｈ皟鐢�
+ /// 璋冪敤BST涓婃姤RFID鎺ュ彛
/// </summary>
- /// <param name="receiveModel"></param>
- /// <returns></returns>
- public string InvokeMatReceiveApi(ERPReceiveModel receiveModel)
+ public string BSTPurchaseUp(BSTPurchaseUpModel bSTPurchaseUpModel)
{
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPReceiveModel> model = new ERPBaseModel<ERPReceiveModel>()
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x=>x.ApiCode==APIEnum.BSTPurchaseUp.ToString());
+ if (apiInfo.Enable == WhetherEnum.False.ObjToInt())
{
- Data = receiveModel,
- Desc = "WMS鏀惰揣鍗曟帹閫�",
- Type = "toTCWMSReceive",
- SecurityCode = "TeChuang"
- };
+ BSTResponse<object> bSTResponse = new BSTResponse<object>() { Code=200,Msg="鎺ュ彛绂佺敤"};
+ return bSTResponse.Serialize();
+ }
+ string request = JsonConvert.SerializeObject(bSTPurchaseUpModel, settings);
+
+ string response = HttpHelper.Post(apiInfo.ApiAddress, request);
+
+ return response;
+ }
+ /// <summary>
+ /// 璋冪敤ERP鍘熺焊搴撳瓨鎺ュ彛
+ /// </summary>
+ public string BSTStockAsync(string barCode)
+ {
- string request = JsonConvert.SerializeObject(model, settings);
-
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.BSTStockAsync.ToString() && x.Enable == WhetherEnum.True.ObjToInt());
- /// <summary>
- /// ERP鐗╂枡IQC妫�楠屽崟鎺ュ彛璋冪敤
- /// </summary>
- /// <param name="checkModel"></param>
- /// <returns></returns>
- public string InvokeCheckOrderApi(ERPCheckModel checkModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPCheckModel> model = new ERPBaseModel<ERPCheckModel>()
- {
- Data = checkModel,
- Desc = "鐗╂枡IQC妫�楠屽崟",
- Type = "toTCWMSIQCTest",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
+ string response = HttpHelper.Post(apiInfo.ApiAddress + "?barcode=" + barCode);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
return response;
}
+ /// <summary>
+ /// 鎺ㄩ�佸師绾搁噰璐叆搴�
+ /// </summary>
+ /// <param name="eRPPurchaseUpModel"></param>
+ /// <returns></returns>
+ public string ERPPurchaseUp(ERPPurchaseUpModel eRPPurchaseUpModel)
+ {
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.ERPPurchaseUpModel.ToString() && x.Enable == WhetherEnum.True.ObjToInt());
+ string response = HttpHelper.Post(apiInfo.ApiAddress, eRPPurchaseUpModel.Serialize().ToUpper());
+
+ return response;
+ }
/// <summary>
- /// ERP鐗╂枡鍏ュ簱鍗曟帴鍙ｈ皟鐢�
+ /// 鎺ㄩ�佹垚鍝侀攢鍞嚭搴�
/// </summary>
- /// <param name="inboundModel"></param>
+ /// <param name="eRPProOutUpModel"></param>
/// <returns></returns>
- public string InvokeInboundOrderApi(ERPInboundModel inboundModel)
+ public string ERPProOutUp(ERPProOutUpModel eRPProOutUpModel)
{
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPInboundModel> model = new ERPBaseModel<ERPInboundModel>()
- {
- Data = inboundModel,
- Desc = "鐗╂枡鍏ュ簱鍗�",
- Type = "toTCWMSMaterialWarehousing",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.ERPProOutUp.ToString() && x.Enable == WhetherEnum.True.ObjToInt());
+
+ string response = HttpHelper.Post(apiInfo.ApiAddress, eRPProOutUpModel.Serialize().ToUpper());
+
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>
- /// ERP閫�鏂欎笂鎶ユ帴鍙ｈ皟鐢�
- /// </summary>
- public string InvokeReturnApi(ERPReturnModel returnModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPReturnModel> model = new ERPBaseModel<ERPReturnModel>()
- {
- Data = returnModel,
- Desc = "鏉愭枡閫�搴�",
- Type = "importMaterialsIssueNoteWMS",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings).Replace("issitem", "Issitem");
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// ERP鐩樿耽/浜忎笂鎶ユ帴鍙ｈ皟鐢�
- /// </summary>
- public string InvokeTakeStockApi(ERPTakeStockModel takeModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPTakeStockModel> model = new ERPBaseModel<ERPTakeStockModel>()
- {
- Data = takeModel,
- Desc = "鏉愭枡鐩樼偣",
- Type = "toTCWMSMaterialCounting",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// ERP鎴愬搧鍑哄簱涓婃姤鎺ュ彛璋冪敤
- /// </summary>
- public string InvokeProOutApi(ERPProOutOrderModel outOrderModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPProOutOrderModel> model = new ERPBaseModel<ERPProOutOrderModel>()
- {
- Data = outOrderModel,
- Desc = "鍑哄簱鎴愬搧閫氱煡",
- Type = "toOrderAssignment",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// ERP鎴愬搧璁㈠崟瀹㈡埛鏌ヨ鎺ュ彛璋冪敤
- /// </summary>
- /// <param name="saleOrderNo"></param>
- /// <returns></returns>
- public string InvokeProSaleCustomer(string saleOrderNo)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpSaleCustomApi.ToString());
- object saleObj = new { soNumber=saleOrderNo };
- string request = JsonConvert.SerializeObject(saleObj, settings);
- Dictionary<string,string> requestHeader =new Dictionary<string, string>
- {
- { "AccessToken", "TCKJF60B03C07E8E41B0B3CF759B7B01AB81HATC"},
- };
- string response = HttpHelper.Post(apiInfo.ApiAddress, request,headers:requestHeader);
- return response;
- }
- /// <summary>
- /// ERP鎴愬搧璁㈠崟鍑哄簱搴撳瓨鏌ヨ
- /// </summary>
- /// <returns></returns>
- public string InvokeOutProErpSync(string outProOrderNo)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpOutProErpSyncApi.ToString());
- object outNoObj = new { shippingNumber = outProOrderNo };
- string request = JsonConvert.SerializeObject(outNoObj, settings);
- Dictionary<string, string> requestHeader = new Dictionary<string, string>
- {
- { "AccessToken", "TCKJF60B03C07E8E41B0B3CF759B7B01AB81HATC"},
- };
- string response = HttpHelper.Post(apiInfo.ApiAddress, request, headers: requestHeader);
- return response;
- }
- /// <summary>
- /// ERP鎴愬搧鍏ュ簱浜у搧鍨嬪彿闈㈢Н鏌ヨ
- /// </summary>
- /// <returns></returns>
- public string InvokeProInErpStatic(string partNum,string partNumWithRev)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeProInErpStatic.ToString());
- object inObj = new { partNum, partNumWithRev };
- string request = JsonConvert.SerializeObject(inObj, settings);
- Dictionary<string, string> requestHeader = new Dictionary<string, string>
- {
- { "AccessToken", "TCKJF60B03C07E8E41B0B3CF759B7B01AB81HATC"},
- };
- string response = HttpHelper.Post(apiInfo.ApiAddress, request, headers: requestHeader);
- return response;
- }
- /// <summary>
- /// ERP鎴愬搧鍏ュ簱涓婃姤鎺ュ彛璋冪敤
- /// </summary>
- public string InvokeProInApi(ERPProInboundModel inboundModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPProInboundModel> model = new ERPBaseModel<ERPProInboundModel>()
- {
- Data = inboundModel,
- Desc = "鎴愬搧鍏ュ簱",
- Type = "toWOStockForm",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// 鎴愬搧浠撴鎶ュ簾鍑哄簱鎺ㄩ�丒RP
- /// </summary>
- /// <param name="checkModel"></param>
- /// <returns></returns>
- public string InvokeProCheckApi(ERPProductCheckModel checkModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPProductCheckModel> model = new ERPBaseModel<ERPProductCheckModel>()
- {
- Data = checkModel,
- Desc = "鎴愬搧妫�楠屽崟",
- Type = "toFGIIqcChecked",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// 鎴愬搧瓒呭懆鏈熸姤搴熸帹閫丒RP
- /// </summary>
- /// <param name="sheetModel"></param>
- /// <returns></returns>
- public string InvokeProScrapSheetApi(ERPScrapSheetModel sheetModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPScrapSheetModel> model = new ERPBaseModel<ERPScrapSheetModel>()
- {
- Data = sheetModel,
- Desc = "鎴愬搧鎶ュ簾鍗�",
- Type = "toFGIScrapSheet",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// 鎴愬搧鐩樼偣鐩樿耽/鐩樹簭
- /// </summary>
- /// <param name="stockCheckModel"></param>
- /// <returns></returns>
- public string InvokeProStockCheckApi(ERPProStockCheckModel stockCheckModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPProStockCheckModel> model = new ERPBaseModel<ERPProStockCheckModel>()
- {
- Data = stockCheckModel,
- Desc = "鎴愬搧鐩樼偣鍗�",
- Type = "toStockCheck",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// ERP鐗╂枡鍑哄簱鎺ュ彛璋冪敤
- /// </summary>
- /// <param name="outboundModel"></param>
- /// <returns></returns>
- #region 寮冪敤
- //public string InvokeOutboundOrderApi(ERPOutboundModel outboundModel)
- //{
- // Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- // ERPBaseModel<ERPOutboundModel> model = new ERPBaseModel<ERPOutboundModel>()
- // {
- // Data = outboundModel,
- // Desc = "鏉愭枡鍑哄簱",
- // Type = "toBomMaterialOutTC",
- // SecurityCode = "TeChuang"
- // };
- // string request = JsonConvert.SerializeObject(model, settings);
- // string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- // return response;
- //}
- #endregion
}
}
--
Gitblit v1.9.3