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 | 62 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 18 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 ada40af..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"
@@ -28,8 +28,6 @@
using GZ.DB.Repository.OIDATABASE;
using GZ.DB.IRepository.OIDATABASE;
using GZ.DB.Entity.OIDATABASE;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-using NLog.Fluent;
namespace GZ.Projects.AuxAllWCS
{
public class Settings
@@ -121,7 +119,7 @@
else
{
logger = LogFactory.CreateLogger(name);
- if (logger != null)
+ if (logger != null && !loggers.Keys.Contains(name))
{
loggers.Add(name, logger);
}
@@ -145,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)
@@ -432,7 +430,10 @@
/// <summary>
/// 1 缁村笇灏旀満姊拌噦
/// 2 鎹风灛鏈烘鑷傝噦
- /// 3 鎹风灛杈撻�绾�+ /// 3 楂樺啿鏈烘鎵�+ /// 4 SSXaAGV 浜や簰鐨勮緭閫佺嚎 绾や綋缂栧彿
+ /// 5 瀹氬瓙涓婃枡鏈烘鎵�+ /// 6 杞瓙涓婃枡鏈烘鎵� /// </summary>
public int deviceType { get; set; }
public int enable { get; set; }
@@ -521,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)
{
@@ -551,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);
}
}
@@ -562,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}寮�鍒涘缓>");
@@ -571,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";
@@ -651,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]
@@ -678,6 +678,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)
{
@@ -705,6 +706,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
@@ -765,16 +767,40 @@
}
}
}
- public static void ResMesTask()
+ public static void ResMesTask(Tag tag)
{
- AutoThread.InvokeMethod(AutoThread.Instance, "ResolveMesTask");
///1.
+
+ AutoThread.InvokeMethod(AutoThread.Instance, "ResolveMesTask", new object[] { tag });
//var VERX = Settings.deviceInfos?.FindAll(x => x.deviceName.Contains("鎹风灛鎶撹噦"));
//if ()
///2 鐪嬬紦瀛樺尯銆�娌℃弧鐨勩�
+
+
}
#endregion [鑷畾涔夌被][20250531152402452][ToWMSMES]
}
+ public class ConsoleInterceptor : TextWriter
+ {
+ #region [鑷畾涔夌被][20250702112833751][ConsoleInterceptor]
+ private readonly TextWriter _originalOut;
+
+ public ConsoleInterceptor()
+ {
+ _originalOut = Console.Out;
+ }
+
+ public override Encoding Encoding => Encoding.UTF8;
+
+ public override void WriteLine(string value = "")
+ {
+ string values = (string)AutoThread.InvokeMethod(AutoThread.Instance, "WriteLine", new object[] { value });
+ //// 鍙互閫夋嫨缁х画杈撳嚭鍒板師鎺у埗鍙�+ if (!string.IsNullOrEmpty(values))
+ _originalOut.WriteLine(values);
+ }
+ #endregion [鑷畾涔夌被][20250702112833751][ConsoleInterceptor]
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1