From acb273acb0771a9c5f5c46afbbe661fde215e507 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 28 八月 2024 09:12:27 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs | 2
Wms/Model/InterFaceModel/SoModel.cs | 55 ++++++++++++++++++
Wms/Wms/appsettings.json | 3
Wms/Wms/Tools/ApiUrlConfig.cs | 8 ++
Wms/Wms/Controllers/BllCheckController.cs | 2
Wms/Model/InterFaceModel/HttpModel.cs | 9 ++-
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 44 ++++++++++++++
7 files changed, 113 insertions(+), 10 deletions(-)
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index 9040f1a..57c5de1 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -49,8 +49,9 @@
/// </summary>
public string message { get; set; }
}
+
/// <summary>
- /// Mes浠ょ墝Model
+ /// 鎺ユ敹Mes浠ょ墝Model
/// </summary>
public class MesTokenModel
{
@@ -78,15 +79,17 @@
}
+ /// <summary>
+ /// 鎺ユ敹MES浠ょ墝token鍊糓doel
+ /// </summary>
public class GetTokenModel
{
public string token { get; set; }
public string expire_time { get; set; }
}
-
/// <summary>
- /// 閲婃斁澶囨枡鍖哄偍浣嶇姸鎬丮odel
+ /// 鎺ユ敹閲婃斁澶囨枡鍖哄偍浣嶇姸鎬丮odel
/// </summary>
public class UpLocateModel
{
diff --git a/Wms/Model/InterFaceModel/SoModel.cs b/Wms/Model/InterFaceModel/SoModel.cs
index 6133d9b..c9a93c0 100644
--- a/Wms/Model/InterFaceModel/SoModel.cs
+++ b/Wms/Model/InterFaceModel/SoModel.cs
@@ -4,7 +4,60 @@
namespace Model.InterFaceModel
{
-
+ /// <summary>
+ /// 璇锋眰鍙戦�佸鏂欎俊鎭嚦MES
+ /// </summary>
+ public class RequertBeiliaoModel
+ {
+ /// <summary>
+ /// 澶囨枡鐢宠鍗曞彿 銆恠tring(30)/闈炵┖銆�
+ /// </summary>
+ public string morder_no { get; set; }
+ /// <summary>
+ /// 璐т綅缂栧彿銆恠tring(30)/闈炵┖銆�
+ /// </summary>
+ public string layer_no { get; set; }
+ /// <summary>
+ /// 鎵樼洏鍙枫�恠tring(30)/闈炵┖銆�
+ /// </summary>
+ public string pallet { get; set; }
+
+ public List<RequertBeiliaoInfoModel> items { get; set; }
+
+ }
+ /// <summary>
+ /// 璇锋眰鍙戦�佸鏂欎俊鎭嚦MES鐨勬槑缁嗕俊鎭�
+ /// </summary>
+ public class RequertBeiliaoInfoModel
+ {
+ /// <summary>
+ /// 鐗╂枡缂栧彿銆恠tring(100)/闈炵┖銆�
+ /// </summary>
+ public string materiel_no { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О銆恠tring(100)銆�
+ /// </summary>
+ public string materiel_name { get; set; }
+ /// <summary>
+ /// 鏁伴噺銆恉ecimal銆�
+ /// </summary>
+ public decimal? qty { get; set; }
+ /// <summary>
+ /// 鎵规鍙枫�恠tring(30)銆�
+ /// </summary>
+ public string batch { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡銆恲yyy-MM-dd
+ /// </summary>
+ public DateTime? producttime { get; set; }
+ /// <summary>
+ /// 鏈夋晥鏈熻嚦銆恲yyy-MM-dd
+ /// </summary>
+ public DateTime? expiry { get; set; }
+
+
+ }
+
/// <summary>
/// 鍑哄簱鍗曚俊鎭�
/// </summary>
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index 889ab1e..016a51a 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -14,6 +14,7 @@
using SqlSugar.Extensions;
using Utility.Tools;
using WMS.BLL.LogServer;
+using WMS.BLL.SysServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
using WMS.Entity.BllCheckEntity;
@@ -1295,7 +1296,7 @@
}
//AGV绉诲簱瀹屾垚
- public void MoveSuccess(string taskNo, int userId)
+ public void MoveSuccess(string taskNo,string mesTokenUrl, string mesUrl, int userId)
{
try
{
@@ -1337,6 +1338,7 @@
throw new Exception("鐩爣鍌ㄤ綅鐘舵�侀潪绉诲叆涓�");
}
}
+ var data = new List<RequertBeiliaoInfoModel>();
//鏇存敼搴撳瓨鏄庣粏
foreach (var item in stockDetail)
{
@@ -1376,6 +1378,18 @@
if (endLocate != null && endLocate.AreaNo == "B12") //鏄惁鏄�3妤肩紦瀛樺尯 鏄細鍒犻櫎搴撳瓨
{
+ //璁板綍鎵樼洏涓婁俊鎭粰MES
+
+ data.Add(new RequertBeiliaoInfoModel()
+ {
+ materiel_no = item.SkuNo,
+ materiel_name = item.SkuName,
+ qty = item.Qty,
+ batch = item.LotNo,
+ producttime = item.ProductionTime,
+ expiry = item.ExpirationTime
+
+ });
//搴撳瓨绠辩爜鏄庣粏鍒犻櫎
var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).ToList();
Db.Deleteable(boxInfo).ExecuteCommand();
@@ -1400,8 +1414,34 @@
//鏇存敼鐩爣鍌ㄤ綅鐘舵��
endLocate.Status = "1";//鏈夌墿鍝�
Db.Updateable(endLocate).ExecuteCommand();
- }
+ }
+ if (endLocate!= null && endLocate.AreaNo == "B12")
+ {
+ //鑾峰彇浠ょ墝
+ var token = new Token().GetMesToken(mesTokenUrl);
+ Dictionary<string, string> mesDic = new Dictionary<string, string>()
+ {
+ {"Authorization",token }
+ };
+ var mesData = new RequertBeiliaoModel()
+ {
+ morder_no = stockDetail.First().SONo,
+ pallet = stockDetail.First().PalletNo,
+ layer_no = endLocate.LocatNo,
+ items = data
+ };
+ var jsonData = JsonConvert.SerializeObject(mesData);
+ //璋冪敤鎺ュ彛
+ var response = HttpHelper.DoPost(mesUrl, jsonData, "澶囨枡瀹屾垚杩愯嚦缂撳瓨鍖哄弽棣堣嚦MES", "MES", mesDic);
+
+ var obj = JsonConvert.DeserializeObject<MesModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+ if (obj.status != "0")
+ {
+ throw new Exception("澶囨枡鍚屾MES澶辫触锛�" + obj.message);
+ }
+
+ }
if (userId != 0)
{
//娣诲姞鎿嶄綔鏃ュ織璁板綍
diff --git a/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs b/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs
index 4649c24..04bb247 100644
--- a/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs
+++ b/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs
@@ -129,7 +129,7 @@
/// </summary>
/// <param name="taskNo"></param>
/// <param name="userId"></param>
- void MoveSuccess(string taskNo, int userId);
+ void MoveSuccess(string taskNo, string mesTokenUrl, string mesUrl, int userId);
/// <summary>
/// 鍙栨秷AGV绉诲簱浠诲姟
/// </summary>
diff --git a/Wms/Wms/Controllers/BllCheckController.cs b/Wms/Wms/Controllers/BllCheckController.cs
index 0791db7..268ce91 100644
--- a/Wms/Wms/Controllers/BllCheckController.cs
+++ b/Wms/Wms/Controllers/BllCheckController.cs
@@ -428,7 +428,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _stockCheckSvc.MoveSuccess(model.taskNo, int.Parse(userId));
+ _stockCheckSvc.MoveSuccess(model.taskNo, _config.MesHost+_config.MesGetTokenUrl, _config.MesHost+ _config.MesBeiLiaoUrl, int.Parse(userId));
return Ok(new { code = 0, msg = "鎴愬姛瀹屾垚浠诲姟", data = "" });
}
diff --git a/Wms/Wms/Tools/ApiUrlConfig.cs b/Wms/Wms/Tools/ApiUrlConfig.cs
index 7c8a345..e037216 100644
--- a/Wms/Wms/Tools/ApiUrlConfig.cs
+++ b/Wms/Wms/Tools/ApiUrlConfig.cs
@@ -56,7 +56,13 @@
/// 鍏ュ簱璁㈠崟鍏抽棴涓婁紶
/// </summary>
public string MesAsnFinishUrl { get; set; }
-
+ /// <summary>
+ /// 澶囨枡淇℃伅鍙戦�佽嚦MES璺緞
+ /// </summary>
+ public string MesBeiLiaoUrl { get; set; }
+ /// <summary>
+ /// 鑾峰彇MES浠ょ墝璺緞
+ /// </summary>
public string MesGetTokenUrl { get; set; }
#endregion
diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index f7539d7..e34e40d 100644
--- a/Wms/Wms/appsettings.json
+++ b/Wms/Wms/appsettings.json
@@ -39,7 +39,8 @@
"GetBoxUrl": "/api/wmsInterface/OutStockTask", //鑾峰彇绠辩爜淇℃伅
//MES
- "MesAsnFinishUrl": "/port/mes/service/mes/save_worder_feedback", //鍏ュ簱鍗曞叧鍗�
+ "MesAsnFinishUrl": "/port/mes/service/mes/save_worder_feedback", //鍏ュ簱鍗曞叧鍗曞弽棣�
+ "MesBeiLiaoUrl": "/port/mes/service/mes/save_morder_feedback", //澶囨枡鍙嶉(鍘熸枡澶囨枡鍒扮敓浜ц溅闂寸紦瀛樺尯)
"MesGetTokenUrl": "/port/mes/service/system/sign_login", //鑾峰彇浠ょ墝
// 璧嬬爜
--
Gitblit v1.8.0