From b520c35d65a71fcbee438670b33dc47eacc95a15 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期五, 11 七月 2025 10:22:32 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 156 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 114 insertions(+), 42 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 d28c119..eb93dbc 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"
@@ -477,7 +477,7 @@
if (VERX != null)
{
if (tag.wxr1.R46)
- LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr1.R46} R44LAST>{tag.wxr1.R46_LAST} R10>{tag.wxr1.R11}");
+ LogHelper.Info($"{VERX.deviceName} R46>{tag.wxr1.R46} R46LAST>{tag.wxr1.R46_LAST} R11>{tag.wxr1.R11}");
if (tag.wxr1.R46 && !tag.wxr1.R46_LAST && tag.wxr1.R11)
{
if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
@@ -642,7 +642,7 @@
if (VERX != null)
{
if (tag.wxr2.R46)
- LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr2.R46} R44LAST>{tag.wxr2.R46_LAST} R10>{tag.wxr2.R11}");
+ LogHelper.Info($"{VERX.deviceName} R46>{tag.wxr2.R46} R46LAST>{tag.wxr2.R46_LAST} R11>{tag.wxr2.R11}");
if (tag.wxr2.R46 && !tag.wxr2.R46_LAST && tag.wxr2.R11)
{
if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
@@ -664,7 +664,7 @@
}
else
{
- TcpServer.TcpServerSend(VERX.deviceNo[2], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E"));
+ TcpServer.TcpServerSend(VERX.deviceNo[1], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E"));
}
}
else
@@ -925,9 +925,22 @@
// var b = RedisHelper.Remove("RGVQueue", out rev);
// }
//}
+ var tklistall = taskservice.FindList(x => x.S_B_STATE != "瀹屾垚" && x.S_B_STATE != "鍙栨秷" && x.S_WORK_MODE == "RGV").OrderBy(x => x.T_CREATE).ToList();
+ var tklist = tklistall.FindAll(x => x.S_B_STATE == "鏈墽琛�);
+ var tkunNormal = tklistall.Except(tklist);
+ if (tkunNormal.Any())
+ foreach (var tk in tkunNormal)
+ {
+ if (tk.S_TASK_NO != task1?.S_TASK_NO && tk.S_TASK_NO != task2?.S_TASK_NO)
+ {
+ tk.S_B_STATE = "鍙栨秷";
+ tk.S_NOTE = "涓嶅湪鎵ц闃熷垪涓�鍙栨秷";
+ taskservice.Update(tk);
+ }
+ }
///1 鏈夎揣 灏� 鍙栥� 1 娌¤揣 灏� 鍗歌揣锛�閮芥湁璐� 灏�鍗歌揣銆�閮芥病璐�灏�鍗�- var tklist = taskservice.FindList(x => x.S_B_STATE == "鏈墽琛� && x.S_WORK_MODE == "RGV").OrderBy(x => x.T_CREATE).ToList();
+ // taskservice.FindList(x => x.S_B_STATE == "鏈墽琛� && x.S_WORK_MODE == "RGV").OrderBy(x => x.T_CREATE).ToList();
if (task1 != null && task1.S_B_STATE != "瀹屾垚") //1鏈変换鍔� {
if (task2 != null && task2.S_B_STATE != "瀹屾垚")// 1 鏈変换鍔� 2 鏈変换鍔°�
@@ -1299,7 +1312,10 @@
continuuuuu = true;
}
else
+ {
SetRedistoPlc("A1019鍙栬揣浜や簰.Ssetreq", "true", "A1019鍙栬揣浜や簰Queue", "鍐橝GV鐢宠");
+ tag.SA1019.StaskMode = 1;
+ }
}
break;
case "1030":
@@ -1310,7 +1326,10 @@
continuuuuu = true;
}
else
+ {
SetRedistoPlc("A1030鍙栬揣浜や簰.Ssetreq", "true", "A1030鍙栬揣浜や簰Queue", "鍐橝GV鐢宠");
+ tag.SA1030.StaskMode = 1;
+ }
}
break;
case "2030":
@@ -1321,7 +1340,10 @@
continuuuuu = true;
}
else
+ {
SetRedistoPlc("A2030鍙栬揣浜や簰.Ssetreq", "true", "A2030鍙栬揣浜や簰Queue", "鍐橝GV鐢宠");
+ tag.SA2030.StaskMode = 1;
+ }
}
break;
case "3005":
@@ -1332,7 +1354,10 @@
continuuuuu = true;
}
else
+ {
SetRedistoPlc("A3005鍙栬揣浜や簰.Ssetreq", "true", "A3005鍙栬揣浜や簰Queue", "鍐橝GV鐢宠");
+ tag.ssx杈撻�绾�s3005.StaskMode = 1;
+ }
}
break;
case "3010":
@@ -1343,7 +1368,10 @@
continuuuuu = true;
}
else
+ {
SetRedistoPlc("A3010鍙栬揣浜や簰.Ssetreq", "true", "A3010鍙栬揣浜や簰Queue", "鍐橝GV鐢宠");
+ tag.ssx杈撻�绾�s3010.StaskMode = 1;
+ }
}
break;
//}
@@ -1357,7 +1385,10 @@
continuuuuu = true;
}
else
+ {
SetRedistoPlc("A1022鏀捐揣浜や簰.Ssetreq", "true", "A1022鏀捐揣浜や簰Queue", "鍐橝GV鐢宠");
+ tag.SA1022.StaskMode = 2;
+ }
}
break;
case "1025":
@@ -1368,7 +1399,10 @@
continuuuuu = true;
}
else
+ {
SetRedistoPlc("A1025鏀捐揣浜や簰.Ssetreq", "true", "A1025鏀捐揣浜や簰Queue", "鍐橝GV鐢宠");
+ tag.SA1025.StaskMode = 2;
+ }
}
break;
case "2001":
@@ -1379,7 +1413,10 @@
continuuuuu = true;
}
else
+ {
SetRedistoPlc("A2001鏀捐揣浜や簰.Ssetreq", "true", "A2001鏀捐揣浜や簰Queue", "鍐橝GV鐢宠");
+ tag.SA2001.StaskMode = 2;
+ }
}
break;
case "3001":
@@ -1390,7 +1427,10 @@
continuuuuu = true;
}
else
+ {
SetRedistoPlc("A3001鏀捐揣浜や簰.Ssetreq", "true", "A3001鏀捐揣浜や簰Queue", "鍐橝GV鐢宠");
+ tag.ssx杈撻�绾�s3001.StaskMode = 2;
+ }
}
break;
case "3006":
@@ -1401,7 +1441,10 @@
continuuuuu = true;
}
else
+ {
SetRedistoPlc("A3006鏀捐揣浜や簰.Ssetreq", "true", "A3006鏀捐揣浜や簰Queue", "鍐橝GV鐢宠");
+ tag.ssx杈撻�绾�s3006.StaskMode = 2;
+ }
}
break;
}
@@ -1449,7 +1492,7 @@
{
var close = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue(dev.deviceName + "." + (V ? "D2220" : "D2225")), typeof(System.UInt16));
- if (close == 1)
+ if (close == 0)
{
LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆�宸茬粡鍏抽棴锛�);
continuuuuu = true;
@@ -1519,18 +1562,22 @@
//涓�嚎鍦板潃锛�0.221.55.181 绔彛锛�000
//if (IsMachineOnline("10.221.55.181"))
{
- //if (tag.DZ1.D2211 == 1 && tag.DZ1.D2220 == 1)
- // tag.DZ1.D2211 = 0;
- //if (tag.DZ1.D2216 == 1 && tag.DZ1.D2225 == 1)
- // tag.DZ1.D2216 = 0;
+ if (tag.DZ1.D2211 == 1 && tag.DZ1.D2220 == 1)
+ //tag.DZ1.D2211 = 0;
+ Conn.榛樿Redis.SetValue("D瀹氬瓙1鍙锋満姊版墜.D2211", "0", "D瀹氬瓙1鍙锋満姊版墜Queue", false);
+ if (tag.DZ1.D2216 == 1 && tag.DZ1.D2225 == 1)
+ //tag.DZ1.D2216 = 0;
+ Conn.榛樿Redis.SetValue("D瀹氬瓙1鍙锋満姊版墜.D2216", "0", "D瀹氬瓙1鍙锋満姊版墜Queue", false);
}
//浜岀嚎鍦板潃锛�0.221.55.179 绔彛锛�000
//if (IsMachineOnline("10.221.55.179"))
{
- //if (tag.DZ2.D2211 == 1 && tag.DZ2.D2220 == 1)
- // tag.DZ2.D2211 = 0;
- //if (tag.DZ2.D2216 == 1 && tag.DZ2.D2225 == 1)
- // tag.DZ2.D2216 = 0;
+ if (tag.DZ2.D2211 == 1 && tag.DZ2.D2220 == 1)
+ //tag.DZ2.D2211 = 0;
+ Conn.榛樿Redis.SetValue("D瀹氬瓙2鍙锋満姊版墜.D2211", "0", "D瀹氬瓙2鍙锋満姊版墜Queue", false);
+ if (tag.DZ2.D2216 == 1 && tag.DZ2.D2225 == 1)
+ //tag.DZ2.D2216 = 0;
+ Conn.榛樿Redis.SetValue("D瀹氬瓙2鍙锋満姊版墜.D2216", "0", "D瀹氬瓙2鍙锋満姊版墜Queue", false);
}
}
LogHelper.Info($"ThreadGrats deviceType5鍏夋爡鍐欏叆浣嶉噸缃畬鎴愩� =================> ");
@@ -2049,8 +2096,9 @@
Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
if (taggg.SOver && taggg.SreadSsxOver)
{
- SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "鍐橝GV鐢宠");
- SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "鍐橝GV鐢宠");
+ SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
}
}
@@ -2061,8 +2109,9 @@
Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
if (taggg.SOver && taggg.SreadSsxOver)
{
- SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "鍐橝GV鐢宠");
- SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "鍐橝GV鐢宠");
+ SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
}
}
@@ -2075,6 +2124,7 @@
{
SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "鍐橝GV鐢宠");
SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "鍐橝GV鐢宠");
+ SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "鍐橝GV鐢宠");
}
}
@@ -2085,8 +2135,9 @@
Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
if (taggg.SOver && taggg.SreadAgvover)
{
- SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "鍐橝GV鐢宠");
- SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "鍐橝GV鐢宠");
+ SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
}
}
@@ -2097,8 +2148,9 @@
Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
if (taggg.SOver && taggg.SreadAgvover)
{
- SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "鍐橝GV鐢宠");
- SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "鍐橝GV鐢宠");
+ SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
}
}
@@ -2109,8 +2161,9 @@
Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
if (taggg.SOver && taggg.SreadAgvover)
{
- SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "鍐橝GV鐢宠");
- SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "鍐橝GV鐢宠");
+ SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
}
}
@@ -2121,8 +2174,9 @@
Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
if (taggg.SOver && taggg.SreadAgvover)
{
- SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "鍐橝GV鐢宠");
- SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "鍐橝GV鐢宠");
+ SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
}
}
@@ -2133,8 +2187,9 @@
Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
if (taggg.SOver && taggg.SreadAgvover)
{
- SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "鍐橝GV鐢宠");
- SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "鍐橝GV鐢宠");
+ SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
}
}
@@ -2145,8 +2200,9 @@
Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
if (taggg.SOver && taggg.SreadAgvover)
{
- SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "鍐橝GV鐢宠");
- SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "鍐橝GV鐢宠");
+ SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+ SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
}
}
@@ -2172,7 +2228,19 @@
}
public void Thread1030Down(Tag tag)
{
- //Console.WriteLine($"SA1030 浠诲姟鐘舵�锛� =====>agv瀹屾垚SOver{tag.SA1030.SOver}");
+ Console.WriteLine($"SA1030 浠诲姟鐘舵�锛� =====>");
+ if (tag.SA1030.RtaskState == 4 && tag.SA1030.RtaskState_LAST == 0 && tag.SA2001.R5绌洪棽 == 5)
+ {
+ var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
+ {
+ requestType = 10,
+ startBit = "1030",
+ endBit = "2001",
+ }));
+ RedisHelper.Add($"S1030Read.RtaskState_LAST", "1", out string msg);
+ }
+ else if (tag.SA1030.RtaskState != 4 && tag.SA1030.RtaskState_LAST == 1)
+ RedisHelper.Add($"S1030Read.RtaskState_LAST", "0", out string msg);
//if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
//{
// SetRedistoPlc("A1022鏀捐揣浜や簰.Ssetreq", "false", "A1022鏀捐揣浜や簰Queue", "娓呯悊");
@@ -2507,9 +2575,9 @@
case "1022":
{
type = "A008";
- if (tag.SA1022.R5绌洪棽 != 1)
+ if (tag.SA1022.R5绌洪棽 != 5)
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣1022 闈炵┖闂诧紝涓嶆帹閫�);
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣1022 >{tag.SA1022.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
continue;
}
}
@@ -2517,9 +2585,9 @@
case "1025":
{
type = "A007";
- if (tag.SA1025.R5绌洪棽 != 1)
+ if (tag.SA1025.R5绌洪棽 != 5)
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 1025 闈炵┖闂诧紝涓嶆帹閫�);
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 1025 >{tag.SA1025.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
continue;
}
}
@@ -2527,9 +2595,9 @@
case "2001":
{
type = "A007";
- if (tag.SA2001.R5绌洪棽 != 1)
+ if (tag.SA2001.R5绌洪棽 != 5)
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 2001 闈炵┖闂诧紝涓嶆帹閫�);
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 2001>{tag.SA2001.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
continue;
}
}
@@ -2537,9 +2605,9 @@
case "3001":
{
type = "A010";
- if (tag.ssx杈撻�绾�s3001.R5绌洪棽 != 1)
+ if (tag.ssx杈撻�绾�s3001.R5绌洪棽 != 5)
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3001 闈炵┖闂诧紝涓嶆帹閫�);
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3001>{tag.ssx杈撻�绾�s3001.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
continue;
}
}
@@ -2547,9 +2615,9 @@
case "3006":
{
type = "A010";
- if (tag.ssx杈撻�绾�s3006.R5绌洪棽 != 1)
+ if (tag.ssx杈撻�绾�s3006.R5绌洪棽 != 5)
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3006 闈炵┖闂诧紝涓嶆帹閫�);
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3006>{tag.ssx杈撻�绾�s3001.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
continue;
}
}
@@ -2703,7 +2771,7 @@
public string procNo()
{
- return TaskProcess.GenerateTaskNo("鏃ュ織娴佹按鍙�);
+ return TaskProcess.GenerateTaskNo("鏃ュ織娴佹按鍙�, "LOG");
}
public bool SetRedistoPlc(string key, string value, string queue, string desc)
{
@@ -3050,6 +3118,7 @@
{
requestType = 7,
startBit = VERX.location[0],
+ endBit = "1025",
unLockStartBitOutbin = true
}));
LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
@@ -3073,6 +3142,7 @@
{
requestType = 7,
startBit = VERX.location[1],
+ endBit = "1025",
unLockStartBitOutbin = true
}));
LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
@@ -3102,13 +3172,14 @@
LogHelper.Info("瀹氬瓙2鍙风嚎 deviceType 5 娌℃湁閰嶇疆銆�);
return;
}
- LogHelper.Info($" {VERX.deviceName} D2221>{tag.DZ1.D2221} D2221_LAST>{tag.DZ1.D2221_LAST} D2226>{tag.DZ1.D2226} D2226_LAST>{tag.DZ1.D2226_LAST}");
+ LogHelper.Info($" {VERX.deviceName} D2221>{tag.DZ2.D2221} D2221_LAST>{tag.DZ2.D2221_LAST} D2226>{tag.DZ2.D2226} D2226_LAST>{tag.DZ2.D2226_LAST}");
if (tag.DZ2.D2221 == 1 && tag.DZ2.D2221_LAST == 0)
{
var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
{
requestType = 7,
startBit = VERX.location[0],
+ endBit = "1025",
unLockStartBitOutbin = true
}));
LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
@@ -3131,6 +3202,7 @@
{
requestType = 7,
startBit = VERX.location[1],
+ endBit = "1025",
unLockStartBitOutbin = true
}));
LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
--
Gitblit v1.9.1