From 17c1c9bb4537f3915e5b53e1a26a1a0b9c8e7c85 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期一, 16 六月 2025 08:37:58 +0800
Subject: [PATCH] 1.定时充电问题排查，增加状态字段增加定时更新状态2.删除webservice所有日志 api接口日志（超时问题优化）
---
dispatch/NDC.cs | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/dispatch/NDC.cs b/dispatch/NDC.cs
index edeb2ee..ae83b31 100644
--- a/dispatch/NDC.cs
+++ b/dispatch/NDC.cs
@@ -83,7 +83,7 @@
{
//< Order TS = '60' Pri = '" + mst.CN_N_PRIORITY.ToString() + "' From = '" + start.CN_N_AGV_TN_Location + "' To = '" + end.CN_N_AGV_TN_Location + "' No = '" + mst.S_CODE + "_1' Ext1 = '1' Ext2 = '" + Constants.TN_MID_COMMANDEQ_CALLAGVOrderCommandType + "' N_CNTR_COUNT = '' FRow = '" + sFloor + "' TRow = '" + eFloor + "' />
var sb = new StringBuilder();
- sb.Append($"<Req><Order ");
+ sb.Append($"<Req> ");
if (ts != 0)
{
sb.Append($"TS='{ts}'");
@@ -95,6 +95,23 @@
sb.Append("/></Req>");
return sb.ToString();
}
+
+ private static string GetReqStrcd(int ts, Dictionary<string, string> param)
+ {
+ //< Order TS = '60' Pri = '" + mst.CN_N_PRIORITY.ToString() + "' From = '" + start.CN_N_AGV_TN_Location + "' To = '" + end.CN_N_AGV_TN_Location + "' No = '" + mst.S_CODE + "_1' Ext1 = '1' Ext2 = '" + Constants.TN_MID_COMMANDEQ_CALLAGVOrderCommandType + "' N_CNTR_COUNT = '' FRow = '" + sFloor + "' TRow = '" + eFloor + "' />
+ var sb = new StringBuilder();
+ sb.Append($"<Req><Order ");
+ if (ts != 0)
+ {
+ sb.Append($"<TS No='{ts}'>");
+ }
+ foreach (var kv in param)
+ {
+ sb.Append($"<Param Name='{kv.Key}' >{kv.Value}</Param>");
+ }
+ sb.Append("</TS>/></Req>");
+ return sb.ToString();
+ }
public static AGVResult OrderAdd(int ts, Dictionary<string, string> param, Dictionary<string, string> param1)
{
//< Req >< Order TS = '1' Pri = '1' No = 'TN2302020001' Ext1 = '' Ext2 = '' N_CNTR_COUNT = '' >< Param Name = 'From' Value = '2' />< Param Name = 'To' Value = '1' /></ Order ></ Req >
@@ -114,6 +131,25 @@
return new AGVResult { Res = new Res { ErrCode = -1, ErrInfo = e.Message } };
}
}
+ public static AGVResult OrderAdd2(int ts, Dictionary<string, string> param)
+ {
+ //< Req >< Order TS = '1' Pri = '1' No = 'TN2302020001' Ext1 = '' Ext2 = '' N_CNTR_COUNT = '' >< Param Name = 'From' Value = '2' />< Param Name = 'To' Value = '1' /></ Order ></ Req >
+
+ var bufin = GetReqStrcd(ts, param);
+
+ try
+ {
+ var result = callClient.OrderAdd(bufin);
+ LogHelper.Info($"OrderAdd req={bufin} res={result}", "NDC");
+ //LogHelper.Info(result.bufout, "ts");
+ return GetResult(result);
+ }
+ catch (Exception e)
+ {
+ LogHelper.Info($"OrderAdd req={bufin} res={e.Message}", "NDC");
+ return new AGVResult { Res = new Res { ErrCode = -1, ErrInfo = e.Message } };
+ }
+ }
public static AGVResult AddNewOrder(int ts, Dictionary<string, string> param) {
//< Req >< Order TS = '1' Pri = '1' No = 'TN2302020001' Ext1 = '' Ext2 = '' N_CNTR_COUNT = '' >< Param Name = 'From' Value = '2' />< Param Name = 'To' Value = '1' /></ Order ></ Req >
--
Gitblit v1.9.1