From 4b403ca5072dc74fbebf36f816df7d0c92241a91 Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期一, 19 一月 2026 17:04:58 +0800
Subject: [PATCH] '测试'
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MESTaskService.cs | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MESTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MESTaskService.cs"
index d1ce784..f3fff84 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MESTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MESTaskService.cs"
@@ -1,4 +1,5 @@
锘縰sing MailKit.Search;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
@@ -9,6 +10,7 @@
using System.Linq;
using System.Reflection;
using System.Reflection.Metadata;
+using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.LocationEnum;
@@ -31,7 +33,7 @@
//鍏ュ簱锛岀┖鐩樺洖搴�
public ApiResponse AddInStoreDoc(MES_InTask mES_In)
{
- WriteLog.GetLog("鎺ユ敹MES鍏ュ簱浠诲姟涓嬪彂").Write($"鍙傛暟锛歿mES_In.ToJson()}", $"浠诲姟鎺ユ敹鍙傛暟");
+ WriteLog.Write_Log("MES_鎺ユ敹MES鍏ュ簱浠诲姟涓嬪彂", $"浠诲姟鎺ユ敹鍙傛暟", "鎺ユ敹鍙傛暟", $"鍙傛暟锛歿mES_In.ToJson()}");
ApiResponse apiResponse = new ApiResponse();
try
{
@@ -56,7 +58,7 @@
string TargetAddress = "";
string CurrentAddress = mES_In.startPosition;
string NextAddress = "";
- int WarehouseId = 0;
+ int WarehouseId = dt_Warehouse.WarehouseId;
if (dt_Warehouse.WarehouseCode == mES_In.endPosition)
@@ -74,10 +76,17 @@
//鑾峰彇瀵瑰簲PLC绔欏彴淇℃伅
Dt_roadwayinfo _Roadwayinfo = _roadWayinfoService.QbtainPlatform(Roadway);
NextAddress = _Roadwayinfo.InStationCode;
- WarehouseId = dt_Warehouse.WarehouseId;
}
else
{
+ if (dt_Warehouse.WarehouseType == (int)WarehouseEnum.YMYL)
+ {
+ Roadway="1";
+ }
+ else if (dt_Warehouse.WarehouseType == (int)WarehouseEnum.YMCP)
+ {
+ Roadway = "2";
+ }
TargetAddress = mES_In.endPosition;
NextAddress = mES_In.endPosition;
}
@@ -111,13 +120,13 @@
BaseDal.AddData(task);
//_stockInfoService.Repository.AddData(dt_StockInfo);
_unitOfWorkManage.CommitTran();
- WriteLog.GetLog("鎺ユ敹MES鍏ュ簱浠诲姟涓嬪彂").Write($"鍙傛暟锛歿mES_In.containerNo}", $"鍏ュ簱浠诲姟娣诲姞鎴愬姛");
+ WriteLog.Write_Log("MES_鎺ユ敹MES鍏ュ簱浠诲姟涓嬪彂", $"鍙嶉淇℃伅", "鎴愬姛", $"浠诲姟娣诲姞鎴愬姛锛屾墭鐩樻潯鐮侊細{task.PalletCode}");
return apiResponse.OK();
}
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- WriteLog.GetLog("鎺ユ敹MES鍏ュ簱浠诲姟涓嬪彂").Write($"鍘熷洜锛歿ex.Message}", $"鍏ュ簱浠诲姟娣诲姞");
+ WriteLog.Write_Log("MES_鎺ユ敹MES鍏ュ簱浠诲姟涓嬪彂", $"鍙嶉淇℃伅", "澶辫触", $"浠诲姟娣诲姞澶辫触锛屾墭鐩樻潯鐮侊細{mES_In.containerNo},绯荤粺鍑洪敊鍘熷洜锛歿ex.Message}");
return apiResponse.Error($"WMS浠诲姟娣诲姞閿欒锛屽師鍥狅細{ex.Message}");
}
@@ -127,7 +136,8 @@
//鍑哄簱浠诲姟
public ApiResponse AddOutStoreDoc(MES_InTask mES_In)
{
- WriteLog.GetLog("鎺ユ敹MES鍑哄簱浠诲姟涓嬪彂").Write($"鍙傛暟锛歿mES_In.ToJson()}", $"浠诲姟鎺ユ敹鍙傛暟");
+ WriteLog.Write_Log("MES_鎺ユ敹MES鍑哄簱浠诲姟涓嬪彂", $"浠诲姟鎺ユ敹鍙傛暟", "鎺ユ敹鍙傛暟", $"鍙傛暟锛歿mES_In.ToJson()}");
+
ApiResponse apiResponse = new ApiResponse();
try
{
@@ -177,13 +187,14 @@
_locationInfoService.Repository.UpdateData(dt_LocationInfo);
_unitOfWorkManage.CommitTran();
- WriteLog.GetLog("鎺ユ敹MES鍑哄簱浠诲姟涓嬪彂").Write($"娣诲姞鎴愬姛锛屾墭鐩樻潯鐮侊細{dt_Stock.PalletCode}", $"鍑哄簱浠诲姟娣诲姞");
+
+ WriteLog.Write_Log("MES_鎺ユ敹MES鍑哄簱浠诲姟涓嬪彂", $"鍑哄簱浠诲姟娣诲姞", "鎴愬姛", $"娣诲姞鎴愬姛锛屾墭鐩樻潯鐮侊細{dt_Stock.PalletCode}");
return apiResponse.OK();
}
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- WriteLog.GetLog("鎺ユ敹MES鍑哄簱浠诲姟涓嬪彂").Write($"鍘熷洜锛歿ex.Message}", $"鍑哄簱浠诲姟娣诲姞");
+ WriteLog.Write_Log("MES_鎺ユ敹MES鍑哄簱浠诲姟涓嬪彂", $"鍑哄簱浠诲姟娣诲姞", "澶辫触", $"浠诲姟娣诲姞澶辫触锛屾墭鐩樻潯鐮侊細{mES_In.containerNo},绯荤粺鍑洪敊鍘熷洜锛歿ex.Message}");
return apiResponse.Error($"WMS浠诲姟娣诲姞閿欒锛屽師鍥狅細{ex.Message}");
}
}
@@ -191,7 +202,8 @@
//鍌ㄤ綅鏌ヨ鎺ュ彛
public ApiResponse GetLocationByContainer(MES_InTask mES_In)
{
- WriteLog.GetLog("鍌ㄤ綅鏌ヨ鎺ュ彛").Write($"鍙傛暟锛歿mES_In.ToJson()}", $"浠诲姟鎺ユ敹鍙傛暟");
+ WriteLog.Write_Log("MES_鍌ㄤ綅鏌ヨ鎺ュ彛", $"鍌ㄤ綅鏌ヨ鎺ュ彛", "鍙傛暟", $"鎵樼洏鏉＄爜锛歿mES_In.ToJson()}");
+
ApiResponse apiResponse = new ApiResponse();
try
{
@@ -221,7 +233,7 @@
}
catch (Exception ex)
{
- WriteLog.GetLog("鍌ㄤ綅鏌ヨ鎺ュ彛").Write($"鍘熷洜锛歿ex.Message}", $"鍌ㄤ綅鏌ヨ鏌ヨ澶辫触");
+ WriteLog.Write_Log("MES_鍌ㄤ綅鏌ヨ鎺ュ彛", $"鍌ㄤ綅鏌ヨ鎺ュ彛", "鏌ヨ澶辫触", $"鎵樼洏鏉＄爜锛歿mES_In.ToJson()}");
return apiResponse.Error($"WMS鍌ㄤ綅鏌ヨ閿欒锛屽師鍥狅細{ex.Message}");
}
@@ -230,6 +242,7 @@
//浠诲姟鏌ヨ鎺ュ彛
public ApiResponse GetTaskInfo(MES_InTask mES_In)
{
+ WriteLog.Write_Log("MES_浠诲姟鏌ヨ鎺ュ彛", $"浠诲姟鏌ヨ鎺ュ彛", "鍙傛暟", $"鎺ユ敹鐨勫弬鏁帮細{mES_In.ToJson()}");
ApiResponse apiResponse = new ApiResponse();
try
{
@@ -256,7 +269,7 @@
}
catch (Exception ex)
{
- WriteLog.GetLog("浠诲姟鏌ヨ鎺ュ彛").Write($"鍘熷洜锛歿ex.Message}", $"浠诲姟鏌ヨ澶辫触");
+ WriteLog.Write_Log("MES_浠诲姟鏌ヨ鎺ュ彛", $"浠诲姟鏌ヨ鎺ュ彛", "澶辫触", $"鏉＄爜锛歿mES_In.transNo}锛屽師鍥狅細{ex.Message}");
return apiResponse.Error($"WMS浠诲姟鏌ヨ鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}");
}
}
@@ -287,17 +300,19 @@
_stockInfoService.Repository.UpdateData(dt_StockInfo);
_locationInfoService.Repository.UpdateData(dt_LocationInfo);
BaseDal.DeleteData(dt_Task);
+ WriteLog.Write_Log("MES_浠诲姟鍙栨秷鎺ュ彛", $"浠诲姟鍙栨秷鎺ュ彛", "鎴愬姛", $"鍗曟嵁缂栧彿锛歿mES_In.transNo}");
return apiResponse.OK();
}
else
{
+ WriteLog.Write_Log("MES_浠诲姟鍙栨秷鎺ュ彛", $"浠诲姟鍙栨秷鎺ュ彛", "澶辫触", $"鍗曟嵁缂栧彿锛歿mES_In.transNo},浠诲姟宸茬粡鍦ㄦ墽琛屼腑锛屼笉鍙彇娑�");
return apiResponse.Error("浠诲姟宸茬粡鍦ㄦ墽琛屼腑锛屼笉鍙彇娑�");
}
}
catch (Exception ex)
{
- WriteLog.GetLog("浠诲姟鍙栨秷鎺ュ彛").Write($"鍘熷洜锛歿ex.Message}", $"浠诲姟鍙栨秷澶辫触");
+ WriteLog.Write_Log("MES_浠诲姟鍙栨秷鎺ュ彛", $"浠诲姟鍙栨秷鎺ュ彛", "澶辫触", $"鍗曟嵁缂栧彿锛歿mES_In.transNo}锛屽師鍥狅細{ex.Message}");
return apiResponse.Error($"WMS浠诲姟鍙栨秷鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}");
}
}
@@ -315,13 +330,15 @@
mesInResult.ContainerNo = ContainerNo;
mesInResult.LocationCode = LocationCode;
mES_Parame = HttpHelper.Post<MES_parameter>(MES_InReporttask, mesInResult, "鍏ュ簱浠诲姟姹囨姤");
- WriteLog.GetLog("鍏ュ簱浠诲姟鍙嶉鎺ュ彛").Write($"璁㈠崟缂栧彿锛歿TransNo}锛屾墽琛岀粨鏋滐細{Result}锛屾墽琛岀粨鏋滄弿杩帮細{ResultMsg}锛屾墭鐩樻潯鐮侊細{ContainerNo}锛屽簱浣嶇紪鍙凤細{LocationCode}锛屾帴鏀跺埌鐨勫洖鍙傦細{mesInResult.ToJson()}", $"浠诲姟涓婃姤淇℃伅");
+
+ WriteLog.Write_Log("MES_鍏ュ簱浠诲姟鍙嶉鎺ュ彛", $"鍏ュ簱浠诲姟鍙嶉鎺ュ彛", "鎴愬姛", $"璁㈠崟缂栧彿锛歿TransNo}锛屾墽琛岀粨鏋滐細{Result}锛屾墽琛岀粨鏋滄弿杩帮細{ResultMsg}锛屾墭鐩樻潯鐮侊細{ContainerNo}锛屽簱浣嶇紪鍙凤細{LocationCode}锛屼笂浼犵殑鍙傛暟锛歿mesInResult.ToJson()}锛屽洖浼犵殑鍙傛暟锛歿mES_Parame.ToJson()}");
return mES_Parame;
}
catch (Exception ex)
{
mES_Parame.Result = "N";
mES_Parame.ResultMsg= $"鍏ュ簱锛歐MS绯荤粺涓婁紶澶辫触,鍘熷洜锛歿ex.Message}";
+ WriteLog.Write_Log("MES_鍏ュ簱浠诲姟鍙嶉鎺ュ彛", $"鍏ュ簱浠诲姟鍙嶉鎺ュ彛", "澶辫触", $"璁㈠崟缂栧彿锛歿TransNo}锛屾墽琛岀粨鏋滐細{Result}锛屾墽琛岀粨鏋滄弿杩帮細{ResultMsg}锛屾墭鐩樻潯鐮侊細{ContainerNo}锛屽簱浣嶇紪鍙凤細{LocationCode}锛屼笂浼犲け璐ワ紝鍘熷洜:{ex.Message}");
return mES_Parame;
}
@@ -337,13 +354,14 @@
mesInResult.Result = Result;
mesInResult.ResultMsg = ResultMsg;
mES_Parame = HttpHelper.Post<MES_parameter>(MES_OutReporttask, mesInResult, "鍑哄簱浠诲姟姹囨姤");
- WriteLog.GetLog("鍑哄簱浠诲姟鍙嶉鎺ュ彛").Write($"璁㈠崟缂栧彿锛歿TransNo}锛屾墽琛岀粨鏋滐細{Result}锛屾墽琛岀粨鏋滄弿杩帮細{ResultMsg}锛屾帴鏀跺埌鐨勫洖鍙傦細{mesInResult.ToJson()}", $"浠诲姟涓婃姤淇℃伅");
+ WriteLog.Write_Log("MES_鍑哄簱浠诲姟鍙嶉鎺ュ彛", $"鍑哄簱浠诲姟鍙嶉鎺ュ彛", "鎴愬姛", $"璁㈠崟缂栧彿锛歿TransNo}锛屾墽琛岀粨鏋滐細{Result}锛屾墽琛岀粨鏋滄弿杩帮細{ResultMsg}锛屼笂浼犵殑鍙傛暟锛歿mesInResult.ToJson()}锛屽洖浼犵殑鍙傛暟锛歿mES_Parame.ToJson()}");
return mES_Parame;
}
catch (Exception ex)
{
mES_Parame.Result = "N";
mES_Parame.ResultMsg = $"鍑哄簱锛歐MS绯荤粺涓婁紶澶辫触,鍘熷洜锛歿ex.Message}";
+ WriteLog.Write_Log("MES_鍑哄簱浠诲姟鍙嶉鎺ュ彛", $"鍑哄簱浠诲姟鍙嶉鎺ュ彛", "澶辫触", $"璁㈠崟缂栧彿锛歿TransNo}锛屾墽琛岀粨鏋滐細{Result}锛屾墽琛岀粨鏋滄弿杩帮細{ResultMsg}锛屼笂浼犲け璐ワ紝鍘熷洜:{ex.Message}");
return mES_Parame;
}
}
@@ -365,12 +383,14 @@
Storagelocation.OriginalLocationCode = OriginalLocationCode;
Storagelocation.NewLocationCode = NewLocationCode;
mES_Parame = HttpHelper.Post<MES_parameter>(MES_InventoryUpdateApply, Storagelocation, "鍌ㄤ綅寮傚姩鐢宠");
+ WriteLog.Write_Log("MES_鍌ㄤ綅寮傚姩鐢宠", $"鍌ㄤ綅寮傚姩鐢宠", "鎴愬姛", $"鎵樼洏鏉＄爜锛歿ContainerNo}锛屽師搴撲綅锛歿OriginalLocationCode}锛屾柊搴撲綅锛歿NewLocationCode}锛屼笂浼犵殑鍙傛暟锛歿Storagelocation.ToJson()}锛屽洖浼犵殑鍙傛暟锛歿mES_Parame.ToJson()}");
return mES_Parame;
}
catch (Exception ex)
{
mES_Parame.Result = "N";
mES_Parame.ResultMsg = $"鍌ㄤ綅寮傚姩鐢宠锛歐MS绯荤粺璋冨彇澶辫触,鍘熷洜锛歿ex.Message}";
+ WriteLog.Write_Log("MES_鍌ㄤ綅寮傚姩鐢宠", $"鍌ㄤ綅寮傚姩鐢宠", "澶辫触", $"鎵樼洏鏉＄爜锛歿ContainerNo}锛屽師搴撲綅锛歿OriginalLocationCode}锛屾柊搴撲綅锛歿NewLocationCode}锛屼笂浼犲け璐ワ紝鍘熷洜:{ex.Message}");
return mES_Parame;
}
}
@@ -392,12 +412,14 @@
Storagelocation.OriginalLocationCode = OriginalLocationCode;
Storagelocation.NewLocationCode = NewLocationCode;
mES_Parame = HttpHelper.Post<MES_parameter>(MES_InventoryUpdateCallback, Storagelocation, "鍌ㄤ綅寮傚姩");
+ WriteLog.Write_Log("MES_鍌ㄤ綅寮傚姩涓婁紶", $"鍌ㄤ綅寮傚姩涓婁紶", "鎴愬姛", $"鎵樼洏鏉＄爜锛歿ContainerNo}锛屽師搴撲綅锛歿OriginalLocationCode}锛屾柊搴撲綅锛歿NewLocationCode}锛屼笂浼犵殑鍙傛暟锛歿Storagelocation.ToJson()}锛屽洖浼犵殑鍙傛暟锛歿mES_Parame.ToJson()}");
return mES_Parame;
}
catch (Exception ex)
{
mES_Parame.Result = "N";
mES_Parame.ResultMsg = $"鍌ㄤ綅寮傚姩锛歐MS绯荤粺璋冨彇澶辫触,鍘熷洜锛歿ex.Message}";
+ WriteLog.Write_Log("MES_鍌ㄤ綅寮傚姩涓婁紶", $"鍌ㄤ綅寮傚姩涓婁紶", "澶辫触", $"鎵樼洏鏉＄爜锛歿ContainerNo}锛屽師搴撲綅锛歿OriginalLocationCode}锛屾柊搴撲綅锛歿NewLocationCode}锛屼笂浼犲け璐ワ紝鍘熷洜:{ex.Message}");
return mES_Parame;
}
}
@@ -420,12 +442,14 @@
Storagelocation.EquipmentNumber = EquipmentNumber;
Storagelocation.ErrorInfo = ErrorInfo;
mES_Parame = HttpHelper.Post<MES_parameter>(MES_TaskErrorInfoCallback, Storagelocation, "浠诲姟寮傚父");
+ WriteLog.Write_Log("MES_浠诲姟寮傚父", $"浠诲姟寮傚父", "鎴愬姛", $"鍗曟嵁缂栧彿锛歿TransNo}锛岃澶囩被鍨嬶細{EquipmentType}锛岃澶囩紪鐮侊細{EquipmentNumber}锛屽紓甯告姤鏂噞ErrorInfo}锛岋紝涓婁紶鐨勫弬鏁帮細{Storagelocation.ToJson()}锛屽洖浼犵殑鍙傛暟锛歿mES_Parame.ToJson()}");
return mES_Parame;
}
catch (Exception ex)
{
mES_Parame.Result = "N";
mES_Parame.ResultMsg = $"浠诲姟寮傚父锛歐MS绯荤粺璋冨彇澶辫触,鍘熷洜锛歿ex.Message}";
+ WriteLog.Write_Log("MES_浠诲姟寮傚父", $"浠诲姟寮傚父", "澶辫触", $"鍗曟嵁缂栧彿锛歿TransNo}锛岃澶囩被鍨嬶細{EquipmentType}锛岃澶囩紪鐮侊細{EquipmentNumber}锛屽紓甯告姤鏂噞ErrorInfo}锛屼笂浼犲け璐ワ紝鍘熷洜:{ex.Message}");
return mES_Parame;
}
}
--
Gitblit v1.9.3