From cd5a8566240658de52502a22f78b4c6652382357 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期五, 25 七月 2025 17:30:52 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 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/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
index 853fae7..841a51f 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
@@ -67,6 +67,12 @@
/// 3 鍏ㄥ紑
/// </summary>
public static readonly int _type = 1;
+ /// <summary>
+ /// 1 modbus
+ /// 2 -24 vxr 25 S7
+ /// 3 MC
+ /// </summary>
+ public static readonly string tys = "1 2 24 25 3";
private static AutoThread _instance;
@@ -2504,18 +2510,28 @@
private void sa2008(Tag tag)
{
+ string tno = "sa2008";// TaskProcess.GenerateTaskNo("鏃ュ織娴佹按鍙�, "LOG");
var rdisTcode = RedisHelper.Get<string>($"Arrive{2008}BarcodeLast", out string msg);
var ntr = tag.ssx杈撻�绾�s2008.R鎵樼洏鐮�
- LogHelper.Info($"2008 鎵樼洏鍙穥ntr} redis Arrive{2008}BarcodeLast鎵樼洏鍙凤細{rdisTcode} 鍖归厤鏍￠獙銆�);
- if (rdisTcode != ntr && tag.ssx杈撻�绾�s2008.wTaskNo > 0)
+ LogHelper.Info($"[{tno}]2008 鎵樼洏鍙穥ntr} redis Arrive{2008}BarcodeLast鎵樼洏鍙凤細{rdisTcode},浠诲姟鐢宠锛歿tag.ssx杈撻�绾�s2008.RtaskState} 鍖归厤鏍￠獙銆�);
+ if (ntr == "123")
+ ntr = "";
+ if (rdisTcode != ntr && (tag.ssx杈撻�绾�s2008.wTaskNo > 0 || !string.IsNullOrEmpty(tag.ssx杈撻�绾�s2008.w鎵樼洏鐮�))
{
- LogHelper.Info($"2008 鎵樼洏鍙穥ntr} 鍒囨崲鎵樼洏鍙凤紙涔熷彲鑳芥竻绌轰簡锛夛紝娓呴櫎浠诲姟鏁版嵁銆倃TaskNo锛寃Ebit=0锛孯鎵樼洏鐮�绌�);
+ LogHelper.Info($"[{tno}]2008 鎵樼洏鍙穥ntr} 鍒囨崲鎵樼洏鍙凤紙涔熷彲鑳芥竻绌轰簡锛夛紝娓呴櫎浠诲姟鏁版嵁銆倃TaskNo锛寃Ebit=0锛寃鎵樼洏鐮�绌�);
tag.ssx杈撻�绾�s2008.wEbit = 0;
- tag.ssx杈撻�绾�s2008.R鎵樼洏鐮�= "";
+ LogHelper.Info($"[{tno}] wEbit 0");
+ tag.ssx杈撻�绾�s2008.w鎵樼洏鐮�= "";
+ LogHelper.Info($"[{tno}] w鎵樼洏鐮�''");
tag.ssx杈撻�绾�s2008.wTaskNo = 0;
- RedisHelper.Add<string>($"Arrive{2008}BarcodeLast", ntr, out msg);
- if (!string.IsNullOrEmpty(ntr) /*&& rdisTcode != ntr*/)
+ LogHelper.Info($"[{tno}] wTaskNo 0");
+ if (string.IsNullOrEmpty(ntr))
+ RedisHelper.Add<string>($"Arrive{2008}BarcodeLast", ntr, out msg);
+ }
+ if (tag.ssx杈撻�绾�s2008.RtaskState == 1)
+ if (!string.IsNullOrEmpty(ntr) && rdisTcode != ntr)
{
+ LogHelper.Info($"[{tno}]2008 鎵樼洏鍙穥ntr} 鐢宠WMS 鍒嗛亾");
var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
{
cntrCode = ntr,
@@ -2524,16 +2540,15 @@
var strr = JsonConvert.DeserializeObject<MES2234>(str);
if (strr.success && strr.data != null)
{
+ tag.ssx杈撻�绾�s2008.w鎵樼洏鐮�= ntr;
var end = (ushort)(strr.data.lineNum == 1 ? 2027
: strr.data.lineNum == 2 ? 2020 : 2013);
tag.ssx杈撻�绾�s2008.wTaskNo = (uint)(20080000 + end);
tag.ssx杈撻�绾�s2008.wEbit = end;
- tag.ssx杈撻�绾�s2008.R鎵樼洏鐮�= ntr;
- LogHelper.Info($"2008 鎵樼洏鍙穥ntr} 鍐欎换鍔★紝wTaskNo={(uint)(20080000 + end)} wEbit={end} R鎵樼洏鐮�{ntr} Arrive{2008}BarcodeLast={ntr} ");
+ LogHelper.Info($"[{tno}]2008 鎵樼洏鍙穥ntr} 鍐欎换鍔★紝wTaskNo={(uint)(20080000 + end)} wEbit={end} w鎵樼洏鐮�{ntr} Arrive{2008}BarcodeLast={ntr} ");
RedisHelper.Add<string>($"Arrive{2008}BarcodeLast", ntr, out msg);
}
}
- }
}
private void sa2030(Tag tag)
@@ -2804,9 +2819,9 @@
if (strr.success && strr.data.materialCode == task.S_INDEX)
{
LogHelper.Info($"2027 璇诲埌鎵樼洏{tag.ssx杈撻�绾�s2027.R鎵樼洏鐮亇 鍖归厤鎴愬姛锛屽啓浠诲姟鍙凤細20272030锛岀粓鐐癸細2030 鍜屾墭鐩樼爜鍚岃");
+ tag.ssx杈撻�绾�s2027.w鎵樼洏鐮�= tag.ssx杈撻�绾�s2027.R鎵樼洏鐮�
tag.ssx杈撻�绾�s2027.wTaskNo = 20272030;
tag.ssx杈撻�绾�s2027.wEbit = 2030;
- tag.ssx杈撻�绾�s2027.w鎵樼洏鐮�= tag.ssx杈撻�绾�s2027.R鎵樼洏鐮�
LogHelper.Info($"2027 > 2030 SSX浠诲姟涓嬪彂瀹屾垚銆�);
continue;
}
@@ -2822,9 +2837,9 @@
if (strr.success && strr.data.materialCode == task.S_INDEX)
{
LogHelper.Info($"2020 璇诲埌鎵樼洏{tag.ssx杈撻�绾�s2020.R鎵樼洏鐮亇 鍖归厤鎴愬姛锛屽啓浠诲姟鍙凤細20202030锛岀粓鐐癸細2030 鍜屾墭鐩樼爜鍚岃");
+ tag.ssx杈撻�绾�s2020.w鎵樼洏鐮�= tag.ssx杈撻�绾�s2020.R鎵樼洏鐮�
tag.ssx杈撻�绾�s2020.wTaskNo = 20202030;
tag.ssx杈撻�绾�s2020.wEbit = 2030;
- tag.ssx杈撻�绾�s2020.w鎵樼洏鐮�= tag.ssx杈撻�绾�s2020.R鎵樼洏鐮�
LogHelper.Info($"2020 > 2030 SSX浠诲姟涓嬪彂瀹屾垚銆�);
continue;
}
@@ -2841,9 +2856,9 @@
if (strr.success && strr.data.materialCode == task.S_INDEX)
{
LogHelper.Info($"2013 璇诲埌鎵樼洏{tag.ssx杈撻�绾�s2013.R鎵樼洏鐮亇 鍖归厤鎴愬姛锛屽啓浠诲姟鍙凤細20132030锛岀粓鐐癸細2030 鍜屾墭鐩樼爜鍚岃");
+ tag.ssx杈撻�绾�s2013.w鎵樼洏鐮�= tag.ssx杈撻�绾�s2013.R鎵樼洏鐮�
tag.ssx杈撻�绾�s2013.wTaskNo = 20132030;
tag.ssx杈撻�绾�s2013.wEbit = 2030;
- tag.ssx杈撻�绾�s2013.w鎵樼洏鐮�= tag.ssx杈撻�绾�s2013.R鎵樼洏鐮�
LogHelper.Info($"2013 > 2030 SSX浠诲姟涓嬪彂瀹屾垚銆�);
continue;
}
--
Gitblit v1.9.1