From b6d4961bb8f5d07ffeba341306b654bd71e2962a Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期二, 22 七月 2025 14:37:06 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/自定义类.cs | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 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 5098749..f7e69bc 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"
@@ -119,7 +119,7 @@
else
{
logger = LogFactory.CreateLogger(name);
- if (logger != null&& !loggers.Keys.Contains(name))
+ if (logger != null && !loggers.Keys.Contains(name))
{
loggers.Add(name, logger);
}
@@ -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,7 +551,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);
}
}
@@ -560,7 +562,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}寮�鍒涘缓>");
@@ -569,15 +571,16 @@
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,7 +607,7 @@
N_START_LAYER = startLayer,
N_END_LAYER = endLayer,
N_CNTR_COUNT = cntrCount,
- S_INDEX = t,
+ S_INDEX = S_INDEX,
};
ITaskRepository taskserice = new TaskRepository();
taskserice.Insert(wmsTask);
@@ -649,11 +652,11 @@
taskserice.Insert(action);
}
- 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]
}
@@ -676,6 +679,7 @@
public string endBit { get; set; }
public string reqCode { get; set; }
public string cntrCode { get; set; }
+ public string materialCode { get; set; }
internal static ReturnMsg CreatemesTask(CreateTask model)
{
@@ -703,6 +707,7 @@
S_WORK_MODE = "agv",
S_B_STATE = "MES",
S_CNTRS = model.cntrCode,
+ S_INDEX = model.materialCode,//mes浠诲姟涓�S_INDEX鏄�鐗╂枡缂栫爜銆�agv浠诲姟涓槸 agv浠诲姟绫诲瀷
N_START_LAYER = 1,
N_END_LAYER = 1,
N_CNTR_COUNT = 1
@@ -763,11 +768,11 @@
}
}
}
- public static void ResMesTask()
+ public static void ResMesTask(Tag tag)
{
///1.
- AutoThread.InvokeMethod(AutoThread.Instance, "ResolveMesTask");
+ AutoThread.InvokeMethod(AutoThread.Instance, "ResolveMesTask", new object[] { tag });
//var VERX = Settings.deviceInfos?.FindAll(x => x.deviceName.Contains("鎹风灛鎶撹噦"));
//if ()
///2 鐪嬬紦瀛樺尯銆�娌℃弧鐨勩�
--
Gitblit v1.9.1