From 0d783a041e71c91e24c338ee43a1b5f62d7954f2 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期三, 23 七月 2025 15:25:04 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/自定义类.cs | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 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 1795ae3..52e3c02 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)
@@ -430,7 +430,10 @@
/// <summary>
/// 1 缁村笇灏旀満姊拌噦
/// 2 鎹风灛鏈烘鑷傝噦
- /// 3 鎹风灛杈撻�绾�+ /// 3 楂樺啿鏈烘鎵�+ /// 4 SSXaAGV 浜や簰鐨勮緭閫佺嚎 绾や綋缂栧彿
+ /// 5 瀹氬瓙涓婃枡鏈烘鎵�+ /// 6 杞瓙涓婃枡鏈烘鎵� /// </summary>
public int deviceType { get; set; }
public int enable { get; set; }
@@ -446,7 +449,8 @@
#region [鑷畾涔夌被][20250325095622918][HttpHelper]
public string Post(string url, string postData, string contentType = "application/json", string sessionId = "")
{
- LogHelper.Info(url + "+" + postData);
+ var SendPRO = TaskProcess.GenerateTaskNo("鏃ュ織娴佹按鍙�, "LOG");
+ LogHelper.Info($"娴佹按鍙枫�{SendPRO}銆� + url + "+" + postData);
WebRequest request = WebRequest.Create(url);
request.Method = "POST";
byte[] byteArray = Encoding.UTF8.GetBytes(postData);
@@ -472,12 +476,12 @@
stream = rsp.GetResponseStream();
reader = new StreamReader(stream);
string rrend = reader.ReadToEnd();
- LogHelper.Info($"{url} response={rrend}");
+ LogHelper.Info($"娴佹按鍙枫�{SendPRO}銆�response={rrend}");
return rrend;
}
catch (Exception ex)
{
- LogHelper.Info($"{url} err={ex.Message}");
+ LogHelper.Info($"娴佹按鍙枫�{SendPRO}銆�err={ex.Message}");
return "";
}
finally
@@ -519,15 +523,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)
{
@@ -549,9 +551,10 @@
}
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);
}
+ sysservice.Disnull();
}
return result;
}
@@ -560,24 +563,25 @@
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}寮�鍒涘缓>");
var cntrInfo = string.Join(",", cntrs);
- ILocRepository locc = new LocRepository();
+ LocRepository locc = new LocRepository();
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")
+ //string t = "";
+ if (workMode == "AGV" && string.IsNullOrEmpty(S_INDEX))
{
- t = "F01";
- if (s && !e) t = "A002";
- if (!s && e) t = "A003";
- if (s && e) t = "A004";
+ var s = Settings.deviceInfos.Find(x => x.location.Contains(from)) != null;
+ var e = Settings.deviceInfos.Find(x => x.location.Contains(to)) != null;
+
+ S_INDEX = "F01";
+ if (s && !e) S_INDEX = "A002";
+ if (!s && e) S_INDEX = "A003";
+ if (s && e) S_INDEX = "A004";
}
try
{
@@ -604,9 +608,9 @@
N_START_LAYER = startLayer,
N_END_LAYER = endLayer,
N_CNTR_COUNT = cntrCount,
- S_INDEX = t,
+ S_INDEX = S_INDEX,
};
- ITaskRepository taskserice = new TaskRepository();
+ TaskRepository taskserice = new TaskRepository();
taskserice.Insert(wmsTask);
if (workMode == "AGV")
@@ -616,6 +620,9 @@
locc.Update(fromLoc);
locc.Update(endLoc);
}
+
+ locc.Disnull();
+ taskserice.Disnull();
LogHelper.Info($"鍒涘缓浠诲姟 from:{from}>to {to} 鍒涘缓{wmsTask.S_TASK_NO}鎴愬姛");
return true;
@@ -647,13 +654,14 @@
};
TaskActRepository taskserice = new TaskActRepository();
taskserice.Insert(action);
+ taskserice.Disnull();
}
- public static System.String GenerateTaskNo()
+ public static System.String GenerateTaskNo(string snType = "浠诲姟鍙�, string Snt = "TN")
{
- var id = SYSHelper.GetSerialNumber("浠诲姟鍙�, "TN", "1");
var date = DateTime.Now.ToString("yyMMdd");
- return $"TN{date}{id.ToString().PadLeft(4, '0')}";
+ var id = SYSHelper.GetSerialNumber(snType, date);
+ return $"{Snt}{date}{id.ToString().PadLeft(4, '0')}";
}
#endregion [鑷畾涔夌被][20250325152141671][TaskProcess]
}
--
Gitblit v1.9.1