From 8dfba1cab2ea59fca7b2c9cfad2da68e9f49b440 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期三, 09 七月 2025 16:39:40 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/自定义类.cs | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\350\207\252\345\256\232\344\271\211\347\261\273.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\350\207\252\345\256\232\344\271\211\347\261\273.cs"
index 9159ff1..51db9f9 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\350\207\252\345\256\232\344\271\211\347\261\273.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\350\207\252\345\256\232\344\271\211\347\261\273.cs"
@@ -143,7 +143,7 @@
/// </summary>
static LogFactory()
{
- var loggerNames = new List<string>() { "HosttoagvTask", "HosttoagvCar", "NDC", "鏉ゥ" };
+ var loggerNames = new List<string>() { "HosttoagvTask", "HosttoagvCar", "NDC", "鏉ゥ","IP鍦ㄧ嚎妫�祴" };
LogManager.Configuration = DefaultConfig(loggerNames);
}
public static ILogger CreateLogger(string name)
@@ -522,15 +522,13 @@
{
#region [鑷畾涔夌被][20250325131633664][SYSHelper]
private static object locker = new object();
- internal static int GetSerialNumber(string snType, string prefix, string Vend = "0")
+ internal static int GetSerialNumber(string snType, string prefix)
{
- if (Vend == "1")
- Vend = DateTime.Now.ToString("yyMMdd");
int result = 0;
lock (locker)
{
SYSRepository sysservice = new SYSRepository();
- var sId = sysservice.FindEntity(a => a.CN_S_TYPE.Trim() == snType && a.CN_S_PRE.Trim() == prefix + Vend);
+ var sId = sysservice.FindEntity(a => a.CN_S_TYPE.Trim() == snType && a.CN_S_PRE.Trim() == prefix);
if (sId != null)
{
@@ -552,7 +550,7 @@
}
else
{
- sId = new SYSEntity { CN_S_TYPE = snType, CN_T_LAST = DateTime.Now, CN_S_PRE = prefix + Vend, CN_N_MAX = 0, CN_S_APP_TYPE = "WCS" };
+ sId = new SYSEntity { CN_S_TYPE = snType, CN_T_LAST = DateTime.Now, CN_S_PRE = prefix , CN_N_MAX = 0, CN_S_APP_TYPE = "WCS" };
sysservice.Insert(sId);
}
}
@@ -563,7 +561,7 @@
public class TaskProcess
{
#region [鑷畾涔夌被][20250325152141671][TaskProcess]
- internal static bool CreateTask(string no, string from, string to, string taskType, int pri, List<string> cntrs, string workMode = "AGV", int cntrCount = 1, int startLayer = 1, int endLayer = 1)
+ internal static bool CreateTask(string no, string from, string to, string taskType, int pri, List<string> cntrs, string workMode = "AGV", string S_INDEX = "", int cntrCount = 1, int startLayer = 1, int endLayer = 1)
{
LogHelper.Info($"鍒涘缓浠诲姟 from:{from}>to {to}寮�鍒涘缓>");
@@ -572,11 +570,12 @@
var fromLoc = locc.FindEntity(x => x.S_LOC_CODE == from);
var endLoc = locc.FindEntity(x => x.S_LOC_CODE == to);
- var s = Settings.deviceInfos.Find(x => x.location.Contains(from)) != null;
- var e = Settings.deviceInfos.Find(x => x.location.Contains(to)) != null;
string t = "";
- if (workMode == "AGV")
+ if (workMode == "AGV" && string.IsNullOrEmpty(S_INDEX))
{
+ var s = Settings.deviceInfos.Find(x => x.location.Contains(from)) != null;
+ var e = Settings.deviceInfos.Find(x => x.location.Contains(to)) != null;
+
t = "F01";
if (s && !e) t = "A002";
if (!s && e) t = "A003";
@@ -652,10 +651,10 @@
taskserice.Insert(action);
}
- public static System.String GenerateTaskNo()
+ public static System.String GenerateTaskNo(string snType = "浠诲姟鍙�)
{
- var id = SYSHelper.GetSerialNumber("浠诲姟鍙�, "TN", "1");
var date = DateTime.Now.ToString("yyMMdd");
+ var id = SYSHelper.GetSerialNumber(snType, date);
return $"TN{date}{id.ToString().PadLeft(4, '0')}";
}
#endregion [鑷畾涔夌被][20250325152141671][TaskProcess]
--
Gitblit v1.9.1