From 6bb25a0e2443749c07834048c4afab136dff7a67 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 10 9月 2025 11:12:59 +0800
Subject: [PATCH] 优化任务号
---
wcs/yunneiWCS/yunneiWCS/Utils/TaskNoHelper.cs | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/Utils/TaskNoHelper.cs b/wcs/yunneiWCS/yunneiWCS/Utils/TaskNoHelper.cs
index 7c2d8d7..e59858f 100644
--- a/wcs/yunneiWCS/yunneiWCS/Utils/TaskNoHelper.cs
+++ b/wcs/yunneiWCS/yunneiWCS/Utils/TaskNoHelper.cs
@@ -17,24 +17,7 @@
private readonly static object lock_Agv = new object();
- ///// <summary>
- ///// 闅忔満鐢熸垚1-10000鐨凱LC浠诲姟鍙�
- ///// </summary>
- ///// <returns></returns>
- //public static string CreatePlcTaskId()
- //{
- // int iSeed = 10000;
- // return new Random(Guid.NewGuid().GetHashCode()).Next(1, iSeed).ToString();
- //}
- ///// <summary>
- ///// 鍒涘缓杈撻�佺嚎浠诲姟鍙凤紝闅忔満鐢熸垚(1, 3000)鐨凱LC浠诲姟鍙�
- ///// </summary>
- ///// <returns></returns>
- //public static string CreatePlcTaskIdForConveyorTask()
- //{
- // int iSeed = 3000;
- // return new Random(Guid.NewGuid().GetHashCode()).Next(1, iSeed).ToString();
- //}
+
/// <summary>
/// 鍒涘缓鍫嗗灈鏈轰换鍔″彿锛岄殢鏈虹敓鎴� 锛�1-999999锛夌殑PLC浠诲姟鍙�
@@ -78,8 +61,10 @@
{
lock (lock_Srm)
{
+ int startNum = 100001;
int iSeed = 999999;
- return new Random(Guid.NewGuid().GetHashCode()).Next(1, iSeed).ToString();
+ //鎸夌収AGV鐨勮姹傦紝蹇呴』鏄�6浣嶆暟瀛� 銆怑ditby shaocx,2025-09-09銆�
+ return new Random(Guid.NewGuid().GetHashCode()).Next(startNum, iSeed).ToString();
}
}
@@ -89,10 +74,22 @@
/// <returns></returns>
public static string CreateTaskIdForAgvTask(string plcTaskNo)
{
+ var formattedPlcTaskNo = plcTaskNo;
+ //鎸夌収AGV鐨勮姹傦紝蹇呴』鏄�6浣嶆暟瀛� 銆怑ditby shaocx,2025 - 09 - 09銆�
+ //if (plcTaskNo.Length < 6)
+ //{
+ // 涓嶈冻 6 浣嶏紝鍦ㄥ彸渚цˉ 0锛岃ˉ瓒冲埌 6 浣�
+ // formattedPlcTaskNo = plcTaskNo.PadRight(6, '0');
+ //}
+ //else
+ //{
+ // 宸茬粡鏄� 6 浣嶆垨鏇撮暱锛岀洿鎺ヤ娇鐢紙濡傛灉涓氬姟涓婅姹備笉鑳借秴杩� 6 浣嶏紝鍙互鍐嶆埅鍙� Substring(0,6)锛�
+ // formattedPlcTaskNo = plcTaskNo;
+ //}
lock (lock_Agv)
{
//骞存湀鏃ユ椂鍒嗙-plc浠诲姟鍙凤紝濡� 20220325190023-1234
- return DateTime.Now.ToString("yyyyMMddHHmmss") + "-" + plcTaskNo;
+ return DateTime.Now.ToString("yyyyMMddHHmmss") + "-" + formattedPlcTaskNo;
}
}
/// <summary>
--
Gitblit v1.9.3