From 28bea7128b8c24a6a664e880f1425e1fa24b9b5f Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期四, 05 六月 2025 17:19:49 +0800
Subject: [PATCH] 11
---
HH.WCS.ZCQTJ/util/HttpHelper.cs | 4 ++--
HH.WCS.ZCQTJ/Program.cs | 2 ++
HH.WCS.ZCQTJ/api/AgvController.cs | 14 +++++++++++++-
HH.WCS.ZCQTJ/util/DingTalk.cs | 6 +++---
HH.WCS.ZCQTJ/core/TaskOver.cs | 1 -
HH.WCS.ZCQTJ/Bll/StateTaskBLL.cs | 4 ++--
HH.WCS.ZCQTJ/api/WmsController.cs | 5 +----
7 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/HH.WCS.ZCQTJ/Bll/StateTaskBLL.cs b/HH.WCS.ZCQTJ/Bll/StateTaskBLL.cs
index 8f77ff0..97b0afd 100644
--- a/HH.WCS.ZCQTJ/Bll/StateTaskBLL.cs
+++ b/HH.WCS.ZCQTJ/Bll/StateTaskBLL.cs
@@ -557,9 +557,9 @@
}
else
{
- Texp.And(e => e.S_AREA_CODE == executeStatePara.transportTask.S_START_LAREA);
+ // Texp.And(e => e.S_AREA_CODE == executeStatePara.transportTask.S_START_LAREA);
+ Texp.And(e => e.S_AREA_CODE == executeStatePara.transportTask.S_END_LAREA);
}
-
Texp.And(e => e.D_DATE == DateTime.Now.ToString("yyyy-MM-dd"));
var taskview = newDb.Queryable<DayAreaTaskEntitys>().Where(Texp.ToExpression())?.First();
if (taskview == null)//鍒涘缓
diff --git a/HH.WCS.ZCQTJ/Program.cs b/HH.WCS.ZCQTJ/Program.cs
index b8cd9ad..116125b 100644
--- a/HH.WCS.ZCQTJ/Program.cs
+++ b/HH.WCS.ZCQTJ/Program.cs
@@ -21,6 +21,8 @@
{
static void Main(string[] args)
{
+
+
string currentProcessName = Process.GetCurrentProcess().ProcessName;
Process[] processes = Process.GetProcessesByName(currentProcessName);
if (processes.Length > 1)
diff --git a/HH.WCS.ZCQTJ/api/AgvController.cs b/HH.WCS.ZCQTJ/api/AgvController.cs
index 88d39c6..da0da6e 100644
--- a/HH.WCS.ZCQTJ/api/AgvController.cs
+++ b/HH.WCS.ZCQTJ/api/AgvController.cs
@@ -29,6 +29,11 @@
{
private static object locko1 = new object();
+ /// <summary>
+ /// hosttoagv涓婃姤
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
[HttpPost]
//[Route("AGVCallbackState")]
public ReturnResult AGVCallbackState(AgvTaskState model)
@@ -45,10 +50,12 @@
var transportTask = newDb.Queryable<WMSTask>().Where(e => e.S_TASK_NO == model.No)?.First();
if (transportTask == null)
{
+ LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
throw new Exception("鏈煡璇㈠埌璇ヤ换鍔�);
}
if (transportTask.S_B_STATE == "鍙栨秷" || transportTask.S_B_STATE == "瀹屾垚")
{
+ LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
return new ReturnResult();
}
if ((model.State == 3 && model.ForkliftNo != "0") || (string.IsNullOrEmpty(transportTask.S_EQ_NO) && model.ForkliftNo != "0"))
@@ -84,6 +91,7 @@
newDb.RollbackTran();
}
+ LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
return new ReturnResult();
}
@@ -109,10 +117,11 @@
newDb.RollbackTran();
}
+ LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
return new ReturnResult();
}
var ta = BLLCreator.Create<StateTaskBLL>().ExecuteState(model.No, SataeLis, logPara, transportTask);
- LogHelper.TaskDetail(logPara, "瀹屽伐鍥炴姤杩斿洖锛� + JsonConvert.SerializeObject(ta));
+ LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤杩斿洖锛氫换鍔″彿涓�{model.No}" + JsonConvert.SerializeObject(ta));
TaskProcess.OperateReq(model.No, model.State, model.ForkliftNo, model.ExtData, transportTask);
if (transportTask.S_NOTE.Equals("agv浠诲姟") && model.State == 7 && ta.Success)
{
@@ -136,14 +145,17 @@
{
TaskProcess.OperateReq(model.No, model.State, model.ForkliftNo, model.ExtData, transportTask);
}
+ LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
return new ReturnResult();
}
catch (Exception ex)
{
LogHelper.TaskDetail(logPara, "瀹屽伐鍥炴姤鎶ラ敊锛� + JsonConvert.SerializeObject(ex));
+ LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
return new ReturnResult();
}
});
+ LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
return new ReturnResult();
}
diff --git a/HH.WCS.ZCQTJ/api/WmsController.cs b/HH.WCS.ZCQTJ/api/WmsController.cs
index d004414..c614874 100644
--- a/HH.WCS.ZCQTJ/api/WmsController.cs
+++ b/HH.WCS.ZCQTJ/api/WmsController.cs
@@ -3475,9 +3475,6 @@
[Route("asss")]
public OperateResult asss()
{
- var transportTask = STAttribute.GetValueTwo("TTXB-閫佹弧鍙栫┖");
- var ListString = JsonConvert.DeserializeObject<List<ConfigValueListTwo>>(transportTask);
- return OperateResult.Succeed(JsonConvert.SerializeObject(ListString));
// List<OperateResult> nn = new List<OperateResult>();
//var ca = BLLCreator.Create<IdGuid>().TaskNo("CK");
//LogHelper.Info("浠诲姟涓嬪彂", "MES涓嬪彂浠诲姟鍙傛暟:");
@@ -3491,7 +3488,7 @@
//nn.Add(OperateResult.Succeed("", GGF2));
//return nn;
// BLLCreator.CreateSingleton<DingDingHelper>().button1_Click($"{Supplier.requestPk} {DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss")}");
- // BLLCreator.CreateSingleton<DingDingHelper>().button1_Click($"{Supplier.requestPk}", Supplier.taskNo ?? "");
+ // BLLCreator.CreateSingleton<DingDingHelper>().ace();
// var gg = BLLCreator.CreateSingleton<DingDingHelper>().SendTextMessageToUser("WMS閫氱煡:搴撳瓨涓嶈冻", "kks53nw");
//BLLCreator.CreateSingleton<DingDingHelper>().button1_Click($"娴嬭瘯 {DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss")} ");
diff --git a/HH.WCS.ZCQTJ/core/TaskOver.cs b/HH.WCS.ZCQTJ/core/TaskOver.cs
index e3a6799..02f3b9d 100644
--- a/HH.WCS.ZCQTJ/core/TaskOver.cs
+++ b/HH.WCS.ZCQTJ/core/TaskOver.cs
@@ -54,7 +54,6 @@
BLLCreator.CreateSingleton<DingDingHelper>().button1_Click(ghh);
}
}
-
}
}
catch (Exception ex)
diff --git a/HH.WCS.ZCQTJ/util/DingTalk.cs b/HH.WCS.ZCQTJ/util/DingTalk.cs
index abc157c..401f83a 100644
--- a/HH.WCS.ZCQTJ/util/DingTalk.cs
+++ b/HH.WCS.ZCQTJ/util/DingTalk.cs
@@ -648,6 +648,9 @@
}
}
+
+
+
static void SendMarkdownMessageItem(string webhookUrl, string accessToken, string secret, string title, string markdownContent, string phone)
{
long timestamp = DateTimeOffset.Now.ToUnixTimeMilliseconds();
@@ -712,9 +715,6 @@
string title = "Markdown Message";
SendMarkdownMessageItem(webhookUrl, accessToken, secret, title, markdownContent, phone);
}
-
-
-
#endregion
}
}
diff --git a/HH.WCS.ZCQTJ/util/HttpHelper.cs b/HH.WCS.ZCQTJ/util/HttpHelper.cs
index 8a0acf2..0f37872 100644
--- a/HH.WCS.ZCQTJ/util/HttpHelper.cs
+++ b/HH.WCS.ZCQTJ/util/HttpHelper.cs
@@ -131,9 +131,9 @@
reader = new StreamReader(stream);
return reader.ReadToEnd();
}
- catch
+ catch (Exception ex)
{
- return "";
+ return ex.Message;
}
finally
{
--
Gitblit v1.9.1