From 9c6f213884183f6f3a49f224fc9723e84e53f226 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 25 三月 2024 14:07:34 +0800
Subject: [PATCH] 数据库更新
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask_Mes.cs | 62 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 21 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask_Mes.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask_Mes.cs"
index 69994bc..709dd44 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask_Mes.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask_Mes.cs"
@@ -1,5 +1,7 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing Confluent.Kafka;
+using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using WIDESEA_Comm.LogInfo;
using WIDESEA_Comm.MES_Info;
using WIDESEA_Comm.MES_Info.Request;
using WIDESEA_Common;
@@ -18,32 +20,29 @@
/// </summary>
/// <param name="task"></param>
/// <exception cref="Exception"></exception>
- public static void UploadMESInfo(dt_agvtask task)
+ public static MES_Response UploadMESInfo(dt_agvtask task)
{
+ object obj = new object(); //涓婁紶MES鏁版嵁
+ string mesData = "";//杩斿洖鏁版嵁
+ string ActionName = ""; //璋冪敤MES鏂规硶鍚�
+ string name = "";
+ MES_Response requestMes = new MES_Response();
try
{
- object obj = new object(); //涓婁紶MES鏁版嵁
- string ActionName = ""; //璋冪敤MES鏂规硶鍚�
List<detail> list = new List<detail>(); //杞﹁疆淇℃伅
if (task == null)
{
throw new Exception("鏃犱换鍔℃暟鎹�");
}
- foreach (var item in task.bindSN.Split(","))
- {
- detail detail = new detail();
- detail.sn = item;
- list.Add(detail);
- }
if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() || task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceOutbound.ToString())
{
- //agvOutWarehousePara outWarehousePara = new agvOutWarehousePara()
- //{
- // JobID = task.jobID,
- // processCode=task.agv_worktype.ToString(),
- // details = list
- //};
+ foreach (var item in task.bindSN.Split(","))
+ {
+ detail detail = new detail();
+ detail.sn = item;
+ list.Add(detail);
+ }
agvInWarehousePara outWarehousePara = new agvInWarehousePara()
{
details = list,
@@ -56,9 +55,16 @@
};
obj = outWarehousePara;
ActionName = "agvOutWarehouse";//AGV->MES杞﹁疆鍑哄簱
+ name = "AGV鍚屾MES杞﹁疆鍑哄簱";
}
- else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString() || task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceInbound.ToString())
+ else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString() /*|| task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceInbound.ToString()*/)
{
+ foreach (var item in task.bindSN.Split(","))
+ {
+ detail detail = new detail();
+ detail.sn = item;
+ list.Add(detail);
+ }
agvInWarehousePara inWarehousePara = new agvInWarehousePara()
{
details = list,
@@ -71,6 +77,7 @@
};
obj = inWarehousePara;
ActionName = "agvInWarehouse";//AGV->MES杞﹁疆鍏ュ簱
+ name = "AGV鍚屾MES杞﹁疆鍏ュ簱";
}
//else if (task.agv_tasktype == "Transfer") //绉诲簱鍖哄垎 搴撳唴绉诲簱
else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Carry.ToString()) //绉诲簱鍖哄垎 搴撳唴绉诲簱
@@ -89,6 +96,7 @@
};
obj = moveWarehousePara;
ActionName = "agvMoveWarehouse";//AGV->MES杞﹁疆绉诲簱
+ name = "AGV鍚屾MES杞﹁疆AB搴撶Щ搴�";
}
else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString())// 澶栧崗绉诲簱
{
@@ -102,26 +110,38 @@
fromWarehouse = "AGV搴�",
toWarehouse = "姣涜疆搴�",
Operator = task.agv_userid,
- updateTime = task.agv_createtime
+ updateTime = task.agv_createtime.ToString(),
};
obj = agvTransferListPara;
ActionName = "agvTransferList";
+ name = "AGV鍚屾MES杞﹁疆绉诲簱AB搴�->BC搴�";
}
var postJson = JsonConvert.SerializeObject(obj);
- string mesData = Request.RequestData(postJson, MESAPIAddress.IPAddress_MES + ActionName);
- var requestMes = JsonConvert.DeserializeObject<MES_Response>(mesData);
+ mesData = Request.RequestData(postJson, MESAPIAddress.IPAddress_MES + ActionName);
+ if (mesData.Contains("杩炴帴灏濊瘯澶辫触"))
+ throw new Exception(mesData);
+ requestMes = JsonConvert.DeserializeObject<MES_Response>(mesData);
if (requestMes.code == "200" && requestMes.Type == "success")
{
//鏃ュ織璁板綍涓婁紶鏁版嵁鎴愬姛
+ WriteWMSLog.LogAdd(task.agv_tasknum, "鎴愬姛", "MES", "WMS", JsonConvert.SerializeObject(obj), mesData, name, ActionName, requestMes.message);
}
+ else
+ throw new Exception(requestMes.message);
}
catch (Exception ex)
{
- throw new Exception(ex.Message);
+ requestMes.message = ex.Message;
+ WriteWMSLog.LogAdd(task.agv_tasknum, "澶辫触", "MES", "WMS", JsonConvert.SerializeObject(obj), mesData, name, ActionName, ex.Message);
}
+ return requestMes;
+ //finally
+ //{
+ // WriteWMSLog.LogAdd(task.agv_tasknum, "澶辫触", "MES", "WMS", JsonConvert.SerializeObject(obj), mesData, name, ActionName, requestMes.message);
+ //}
}
}
}
--
Gitblit v1.9.3