From caaa702b4455439216bbd615b8067eec90e9bab7 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 21 八月 2024 11:55:19 +0800
Subject: [PATCH] 修改接口和所需参数问题
---
Wms/Wms/Controllers/UpApiController.cs | 2
Wms/Wms/appsettings.json | 4 ++
Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs | 2
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 35 +++++++++++++----
Wms/Wms/Tools/ApiUrlConfig.cs | 17 ++++++++
Wms/Model/InterFaceModel/HttpModel.cs | 23 +++++++++++
6 files changed, 71 insertions(+), 12 deletions(-)
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index 47d6be3..1445bc4 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -5,6 +5,8 @@
namespace Model.InterFaceModel
{
+ #region Erp-Model
+
/// <summary>
/// 鍙戦�佹帴鏀秂rp鎺ュ彛鍙傛暟鐨刴odel
/// </summary>
@@ -20,6 +22,27 @@
public string Message { get; set; }
}
+ #endregion
+
+ #region MES-Model
+
+ /// <summary>
+ /// 鍙戦�佹帴鏀秏es鎺ュ彛鍙傛暟鐨刴odel
+ /// </summary>
+ public class MesModel
+ {
+ /// <summary>
+ /// 鐘舵�佺爜 0 鎴愬姛 -1澶辫触
+ /// </summary>
+ public int Success { get; set; }
+ /// <summary>
+ /// 淇℃伅璇︽儏
+ /// </summary>
+ public string Message { get; set; }
+ }
+
+ #endregion
+
#region WCS-Model
/// <summary>
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 723c6e5..fa13375 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -984,7 +984,7 @@
}
//璁㈠崟鍥炰紶涓婃父绯荤粺
- public bool FinishAsn(int id, string url, int userId)
+ public bool FinishAsn(int id, string erpUrl, string mesUrl, int userId)
{
try
{
@@ -1025,17 +1025,34 @@
AsnDetails = list
};
- #region 閫氳繃鎺ュ彛鍙戦�佽嚦erp
+ #region 閫氳繃鎺ュ彛鍙戦�佽嚦erp 鎴� mes
//绯荤粺瀵规帴鍚庢斁寮�
- /*var jsonData = JsonConvert.SerializeObject(soInfo);
+ var jsonData = JsonConvert.SerializeObject(soInfo);
+ var mesList = new List<string>() { "0", "4" }; //0 鎴愬搧鍏ュ簱 4浣欐枡閫�鍥炲叆搴�
+ var erpList = new List<string>() { "1", "2", "3" }; //1 閲囪喘鍏ュ簱 2涓棿鍝佸叆搴� 3 閫�璐у叆搴�
- var response = HttpHelper.DoPost(url, jsonData, "鍏ュ簱鍗曞畬鎴愪笂浼�", "ERP");
-
- var obj = JsonConvert.DeserializeObject<ErpModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
- if (obj.Success != 0)
+ if (mesList.Contains(notice.Type)) // mes
{
- throw new Exception("涓婁紶澶辫触" + obj.Message);
- }*/
+ var response = HttpHelper.DoPost(mesUrl, jsonData, "鍏ュ簱鍗曞畬鎴愪笂浼�", "MES");
+
+ var obj = JsonConvert.DeserializeObject<MesModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+ if (obj.Success != 0)
+ {
+ throw new Exception("涓婁紶澶辫触" + obj.Message);
+ }
+ }
+ else if (erpList.Contains(notice.Type)) //erp
+ {
+ var response = HttpHelper.DoPost(erpUrl, jsonData, "鍏ュ簱鍗曞畬鎴愪笂浼�", "ERP");
+
+ var obj = JsonConvert.DeserializeObject<ErpModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+ if (obj.Success != 0)
+ {
+ throw new Exception("涓婁紶澶辫触" + obj.Message);
+ }
+ }
+
+
#endregion
notice.Status = "4";
diff --git a/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs b/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
index 4429ee0..366dfba 100644
--- a/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
@@ -101,7 +101,7 @@
/// <param name="url">涓婁紶璺緞</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool FinishAsn(int id, string url, int userId);
+ bool FinishAsn(int id, string erpurl, string mesUrl, int userId);
#endregion
}
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 857538a..589782f 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -88,7 +88,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _arrivalNoticeSvc.FinishAsn(model.Id, _config.ErpHost + _config.AsnFinishUrl, int.Parse(userId));
+ _arrivalNoticeSvc.FinishAsn(model.Id, _config.ErpHost + _config.AsnFinishUrl, _config.MesHost + _config.MesAsnFinishUrl, int.Parse(userId));
return Ok(new { code = 0, count = 0, msg = "鍏ュ簱鍗曞鏍稿苟涓婁紶鎴愬姛" });
}
diff --git a/Wms/Wms/Tools/ApiUrlConfig.cs b/Wms/Wms/Tools/ApiUrlConfig.cs
index 04ca867..b80fa6a 100644
--- a/Wms/Wms/Tools/ApiUrlConfig.cs
+++ b/Wms/Wms/Tools/ApiUrlConfig.cs
@@ -11,6 +11,12 @@
/// Erp鐨処P
/// </summary>
public string ErpHost { get; set; }
+
+ /// <summary>
+ /// Mes鐨処P
+ /// </summary>
+ public string MesHost { get; set; }
+
/// <summary>
/// Wcs鐨処P
/// </summary>
@@ -20,7 +26,7 @@
/// </summary>
public string BoxHost { get; set; }
- #region 涓婃父绯荤粺
+ #region Erp绯荤粺
/// <summary>
/// 鍏ュ簱璁㈠崟鍏抽棴涓婁紶
@@ -44,6 +50,15 @@
#endregion
+ #region Mes绯荤粺
+
+ /// <summary>
+ /// 鍏ュ簱璁㈠崟鍏抽棴涓婁紶
+ /// </summary>
+ public string MesAsnFinishUrl { get; set; }
+
+ #endregion
+
#region 涓嬫父绯荤粺
/// <summary>
diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index 76f35d5..287a51a 100644
--- a/Wms/Wms/appsettings.json
+++ b/Wms/Wms/appsettings.json
@@ -24,6 +24,7 @@
},
"ApiUrlConfig": {
"ErpHost": "http://10.110.24.30:8081", //erpIP
+ "MesHost": "http://10.110.24.30:8081", //mesIP
"WcsHost": "http://localhost:57061", //wcsIPhttp://localhost:57061/
"BoxHost": "http://10.110.24.30:8081", //boxIP
@@ -37,6 +38,9 @@
"DataChangeUrl": "/api/wmsInterface/OutStockTask", //搴撳瓨鍙樻洿鍥炰紶
"GetBoxUrl": "/api/wmsInterface/OutStockTask", //鑾峰彇绠辩爜淇℃伅
+ //MES
+ "MesAsnFinishUrl": "/api/wmsInterface/OutStockTask",//鍏ュ簱鍗曞叧鍗�
+
// 璧嬬爜
--
Gitblit v1.8.0