From 1ec3de8254a3dc8d77f01283ab4d85f52d446192 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 09 五月 2025 08:00:59 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/Model/InterFaceModel/AgvModel.cs | 12 ++++++++++++
Wms/Utility/Tools/RcsHelper.cs | 21 ++++++++++-----------
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/Wms/Model/InterFaceModel/AgvModel.cs b/Wms/Model/InterFaceModel/AgvModel.cs
index c5e2f77..876dd22 100644
--- a/Wms/Model/InterFaceModel/AgvModel.cs
+++ b/Wms/Model/InterFaceModel/AgvModel.cs
@@ -192,9 +192,21 @@
public class TaskDetial
{
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
public string Taskno { get; set; }
+ /// <summary>
+ /// 璧峰浣嶇疆
+ /// </summary>
public string Startport { get; set; }
+ /// <summary>
+ /// 鐩爣浣嶇疆
+ /// </summary>
public string Endport { get; set; }
+ /// <summary>
+ /// 鎵樼洏鍙�/妗跺彿
+ /// </summary>
public string Pallno { get; set; }
/// <summary>
diff --git a/Wms/Utility/Tools/RcsHelper.cs b/Wms/Utility/Tools/RcsHelper.cs
index 30c1662..0cd9b43 100644
--- a/Wms/Utility/Tools/RcsHelper.cs
+++ b/Wms/Utility/Tools/RcsHelper.cs
@@ -10,6 +10,14 @@
{
public static class RcsHelper
{
+ /// <summary>
+ /// 涓嬪彂浠诲姟
+ /// </summary>
+ /// <param name="taskDetial">璇锋眰鍙傛暟</param>
+ /// <param name="url">璇锋眰鍦板潃</param>
+ /// <param name="agvMsg">杩斿洖淇℃伅</param>
+ /// <param name="priority">浼樺厛绾�</param>
+ /// <returns></returns>
public static bool CreateTaskForAgv(TaskDetial taskDetial, string url, out string agvMsg, string priority = null)
{
bool result = false;
@@ -48,17 +56,8 @@
}
else
{
- string logMsg = "";
- if (taskDetial.Crtype == "1")//鍙《锛堟《鍑哄簱锛�
- {
- logMsg = "鐢宠鍙《";
- }
- else if (taskDetial.Crtype == "0")//鐢宠鍌ㄤ綅锛堟《鍏ュ簱锛�
- {
- logMsg = "鐢宠鍌ㄤ綅";
- }
- var logStr = $@".\log\AGV\AGV{logMsg}" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- LogFile.SaveLogToFile($"AGV{logMsg}寮傚父锛�( {agvModel.Message} ),", logStr);
+ var logStr = $@".\log\AGV\涓嬪彂缁橝GV杞繍鍛戒护" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ LogFile.SaveLogToFile($"涓嬪彂缁橝GV杞繍鍛戒护寮傚父锛�( {agvModel.Message} ),", logStr);
agvMsg = agvModel.Message;
}
--
Gitblit v1.8.0