From 43c6d046302ca075c1f42b0105a5fbad0d889fc5 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期四, 10 七月 2025 17:52:25 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/自定义类.cs | 12 +++---
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 100 ++++++++++++++++++++++++++++++++++++++------------
2 files changed, 82 insertions(+), 30 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 be67867..8b6e9c2 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"
@@ -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;
@@ -2053,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鐢宠");
}
}
@@ -2065,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鐢宠");
}
}
@@ -2079,6 +2124,7 @@
{
SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "鍐橝GV鐢宠");
SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "鍐橝GV鐢宠");
+ SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "鍐橝GV鐢宠");
}
}
@@ -2089,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鐢宠");
}
}
@@ -2101,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鐢宠");
}
}
@@ -2113,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鐢宠");
}
}
@@ -2125,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鐢宠");
}
}
@@ -2137,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鐢宠");
}
}
@@ -2149,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鐢宠");
}
}
@@ -2177,7 +2229,7 @@
public void Thread1030Down(Tag tag)
{
Console.WriteLine($"SA1030 浠诲姟鐘舵�锛� =====>");
- if (tag.SA1030.RtaskState == 4 && tag.SA1030.RtaskState_LAST == 0 && tag.SA2001.R5绌洪棽 == 1)
+ 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
{
@@ -2523,7 +2575,7 @@
case "1022":
{
type = "A008";
- if (tag.SA1022.R5绌洪棽 != 1)
+ if (tag.SA1022.R5绌洪棽 != 5)
{
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣1022 闈炵┖闂诧紝涓嶆帹閫�);
continue;
@@ -2533,7 +2585,7 @@
case "1025":
{
type = "A007";
- if (tag.SA1025.R5绌洪棽 != 1)
+ if (tag.SA1025.R5绌洪棽 != 5)
{
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 1025 闈炵┖闂诧紝涓嶆帹閫�);
continue;
@@ -2543,7 +2595,7 @@
case "2001":
{
type = "A007";
- if (tag.SA2001.R5绌洪棽 != 1)
+ if (tag.SA2001.R5绌洪棽 != 5)
{
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 2001 闈炵┖闂诧紝涓嶆帹閫�);
continue;
@@ -2553,7 +2605,7 @@
case "3001":
{
type = "A010";
- if (tag.ssx杈撻�绾�s3001.R5绌洪棽 != 1)
+ if (tag.ssx杈撻�绾�s3001.R5绌洪棽 != 5)
{
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3001 闈炵┖闂诧紝涓嶆帹閫�);
continue;
@@ -2563,7 +2615,7 @@
case "3006":
{
type = "A010";
- if (tag.ssx杈撻�绾�s3006.R5绌洪棽 != 1)
+ if (tag.ssx杈撻�绾�s3006.R5绌洪棽 != 5)
{
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3006 闈炵┖闂诧紝涓嶆帹閫�);
continue;
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 cfd2055..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"
@@ -571,16 +571,16 @@
var fromLoc = locc.FindEntity(x => x.S_LOC_CODE == from);
var endLoc = locc.FindEntity(x => x.S_LOC_CODE == to);
- string t = "";
+ //string t = "";
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";
- if (s && e) t = "A004";
+ S_INDEX = "F01";
+ if (s && !e) S_INDEX = "A002";
+ if (!s && e) S_INDEX = "A003";
+ if (s && e) S_INDEX = "A004";
}
try
{
@@ -607,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);
--
Gitblit v1.9.1