From a54f394767fe561f8ed7e3d5b13bcb42868815cf Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期三, 02 七月 2025 10:09:42 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 690 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 596 insertions(+), 94 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 8e30962..75f3343 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"
@@ -17,6 +17,10 @@
using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox;
using System.Security.Cryptography;
using System.Windows.Markup;
+using static GZ.Projects.AuxAllWCS.EasyPLC;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+using ServiceStack.Configuration;
+using ServiceStack;
namespace GZ.Projects.AuxAllWCS
{
@@ -145,6 +149,7 @@
//tag.Js1.D1212_LAST = 0;
RedisHelper.Add($"Js鎹烽『1.D1202_LAST", "0", out string msg);
}
+
if (tag.Js1.D1213_LAST == 0 && TcpServer.GetBitdata(tag.Js1.D1212, 3) == 1)
{
var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
@@ -511,7 +516,6 @@
}
}
-
public void ThreadTaskRun(Tag tag, Func<TaskEntity, bool> action)
{
Console.WriteLine($"ThreadTaskRun 浠诲姟涓嬪彂 =================> ");
@@ -576,8 +580,7 @@
System.Threading.Thread.Sleep(3000);
return;
}
- LogHelper.Info("浠诲姟涓嬪彂 Rgv 浠诲姟 杩涘叆");
-
+ LogHelper.Info($"浠诲姟涓嬪彂 Rgv 浠诲姟 杩涘叆 Rgv淇℃伅 W1鐘舵�{tag.RGV.w1status} ReadTask1No>{tag.RGV.ReadTask1No} bit1taskOver>{tag.RGV.bit1taskOver} W2鐘舵�{tag.RGV.w2status} ReadTask2No>{tag.RGV.ReadTask2No} bit2taskOver>{tag.RGV.bit2taskOver}");
TaskEntity task1 = null;
TaskEntity task2 = null;
var task1Isrun = false;
@@ -613,6 +616,7 @@
System.Threading.Thread.Sleep(3000);
return;
}
+
var thisOver = 0;
LogHelper.Info($"鏌ョ湅RGV 1宸ヤ綅浠诲姟銆�);
if (tag.RGV.ReadTask1No > 0 && tag.RGV.bit1taskOver == 1)
@@ -631,7 +635,7 @@
if (task1.S_B_STATE == "鍙栬揣瀹屾垚")
{
task1.S_B_STATE = "瀹屾垚";
- //tag.RGV.ReadTask1No = 0;
+ tag.RGV.ReadTask1No = 0;
}
else
{
@@ -673,7 +677,7 @@
if (task2.S_B_STATE == "鍙栬揣瀹屾垚")
{
task2.S_B_STATE = "瀹屾垚";
- //tag.RGV.ReadTask2No = 0;
+ tag.RGV.ReadTask2No = 0;
}
else
{
@@ -718,15 +722,17 @@
tag.RGV.taskmod = 2;
tag.RGV.taskno1 = Convert.ToUInt32(task1.S_TASK_NO.Substring(4));
tag.RGV.task1do = Convert.ToUInt16(task1.S_END_LOC);
- System.Threading.Thread.Sleep(750);
//RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
//tag.RGV.taskend = 125;
//Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue");
- LogHelper.Info($"{task1.S_TASK_NO}> bit1taskOver_LAST 鍐�0");
- RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
+ if (tag.RGV.bit1taskOver == 1)
+ tag.RGV.bit1taskOver = 0;
LogHelper.Info($"{task1.S_TASK_NO}> end 鍐�125");
Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+
+ LogHelper.Info($"{task1.S_TASK_NO}> bit1taskOver_LAST 鍐�0");
+ RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
}
else //1鏈変换鍔� 2 娌′换鍔°�
{
@@ -743,16 +749,19 @@
{
LogHelper.Info($"鏌ョ湅RGV1 鏈変换鍔task1.S_TASK_NO},宸ヤ綅2 娌′换鍔°� 鎵�020 1008 1016鍙栬揣浠诲姟{t2.S_TASK_NO}銆�);
tag.RGV.workMod = 2;
- LogHelper.Info($"{task1.S_TASK_NO}> workMod 2 銆�宸ヤ綅銆�);
+ LogHelper.Info($"{t2.S_TASK_NO}> workMod 2 銆�宸ヤ綅銆�);
tag.RGV.taskmod = 1;
- LogHelper.Info($"{task1.S_TASK_NO}> taskmod 1 銆婂彇璐с�");
+ LogHelper.Info($"{t2.S_TASK_NO}> taskmod 1 銆婂彇璐с�");
tag.RGV.taskno2 = Convert.ToUInt32(t2.S_TASK_NO.Substring(4));
tag.RGV.task2do = Convert.ToUInt16(t2.S_START_LOC);
- creT2 = true;
- LogHelper.Info($"{t2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
- RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
+
+ if (tag.RGV.bit2taskOver == 1)
+ tag.RGV.bit2taskOver = 0;
LogHelper.Info($"{t2.S_TASK_NO}> end 鍐�125");
Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+
+ LogHelper.Info($"{t2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
+ RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
t2.S_B_STATE = "宸叉帹閫�;
taskservice.Update(t2);
}
@@ -810,11 +819,13 @@
LogHelper.Info($"{task1.S_TASK_NO}> taskmod 2 銆婂嵏璐с�");
tag.RGV.taskno1 = Convert.ToUInt32(task1.S_TASK_NO.Substring(4));
tag.RGV.task1do = Convert.ToUInt16(task1.S_END_LOC);
- System.Threading.Thread.Sleep(750);
- LogHelper.Info($"{task1.S_TASK_NO}> bit1taskOver_LAST 鍐�0");
- RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
+
+ if (tag.RGV.bit1taskOver == 1)
+ tag.RGV.bit1taskOver = 0;
LogHelper.Info($"{task1.S_TASK_NO}> taskend 鍐�0");
Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+ LogHelper.Info($"{task1.S_TASK_NO}> bit1taskOver_LAST 鍐�0");
+ RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
}
}
}
@@ -830,12 +841,14 @@
LogHelper.Info($"{task2.S_TASK_NO}> taskmod 2 銆婂嵏璐с�");
tag.RGV.taskno2 = Convert.ToUInt32(task2.S_TASK_NO.Substring(4));
tag.RGV.task2do = Convert.ToUInt16(task2.S_END_LOC);
- System.Threading.Thread.Sleep(750);
- LogHelper.Info($"{task2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
- RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
+
+ if (tag.RGV.bit2taskOver == 1)
+ tag.RGV.bit2taskOver = 0;
//tag.RGV.taskend = 125;
LogHelper.Info($"{task2.S_TASK_NO}> taskend 鍐�25");
Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+ LogHelper.Info($"{task2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
+ RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
}
else if (tklist.Any()) //1mei 浠诲姟 2 娌′换鍔°�
{
@@ -859,12 +872,14 @@
tag.RGV.taskno1 = tno;
LogHelper.Info($"{e1017first.S_TASK_NO}>寮�鍐欏叆 task1do>>{e1017first.S_START_LOC}銆�);
tag.RGV.task1do = Convert.ToUInt16(e1017first.S_START_LOC);
- LogHelper.Info($"{e1017first.S_TASK_NO}> 鏇存柊浠诲姟銆�);
+ //tag.RGV.taskend=125
+ if (tag.RGV.bit1taskOver == 1)
+ tag.RGV.bit1taskOver = 0;
+ LogHelper.Info($"{e1017first.S_TASK_NO}> taskend 鍐�25");
+ Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
LogHelper.Info($"{e1017first.S_TASK_NO}> bit1taskOver_LAST 鍐�");
RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
- LogHelper.Info($"{e1017first.S_TASK_NO}> taskend 鍐�25");
- //tag.RGV.taskend=125
- Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+ LogHelper.Info($"{e1017first.S_TASK_NO}> 鏇存柊浠诲姟銆�);
e1017first.S_B_STATE = "宸叉帹閫�;
taskservice.Update(e1017first);
}
@@ -881,10 +896,12 @@
tag.RGV.taskno2 = Convert.ToUInt32(t2.S_TASK_NO.Substring(4));
LogHelper.Info($"{t2.S_TASK_NO}> taskno2 {Convert.ToUInt32(t2.S_TASK_NO.Substring(4))}銆婁换鍔″彿銆�);
tag.RGV.task2do = Convert.ToUInt16(t2.S_START_LOC);
- LogHelper.Info($"{t2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
- RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
+ if (tag.RGV.bit2taskOver == 1)
+ tag.RGV.bit2taskOver = 0;
LogHelper.Info($"{t2.S_TASK_NO}> end 鍐�125");
Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+ LogHelper.Info($"{t2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
+ RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
t2.S_B_STATE = "宸叉帹閫�;
taskservice.Update(t2);
}
@@ -1285,77 +1302,114 @@
foreach (var ssx in new string[] { "1003", "1005", "1011", "1013" })
{
var RArrive = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.RArrive{ssx}"), typeof(System.UInt16));
- var RArriveLast = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.RArrive{ssx}_LAST"), typeof(System.UInt16));
- LogHelper.Info($" FNK1003051113.RArrive{ssx}>{RArrive} && FNK1003051113.RArrive{ssx}_LAST >{RArriveLast}");
- if (RArrive == 1 && RArriveLast == 0)
+ //var RArriveLast = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.RArrive{ssx}_LAST"), typeof(System.UInt16));
+ var wArriveOver = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.wArrive{ssx}Over"), typeof(System.UInt16));
+ var rReleaseOver = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.rRelease{ssx}Over"), typeof(System.UInt16));
+ var WRelease = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.WRelease{ssx}"), typeof(System.UInt16));
+ var RtrayCode = (System.String)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"SSX1003051113.R{ssx}Barcode"), typeof(System.String));
+ var rdisTcode = RedisHelper.Get<string>($"Arrive{ssx}BarcodeLast", out string msg);
+ // 鍐欎簡绌烘鍒颁綅鐨勬墭鐩樺彿璁板綍锛�濡傛灉涓嬫淇″彿鏉ヤ簡锛屾墭鐩樺彿涓嶄竴鑷村氨鍐欙紝涓�嚧灏变笉鍐欙紝闃叉鍥犵壒娈婂師鍥犺娓呴櫎閲嶆柊瑙﹀彂锛屽鑷村彂閫侀噸澶嶇殑闂銆�+ LogHelper.Info($@" 鎵樼洏鍙凤細{RtrayCode} redis鎵樼洏鍙凤細{rdisTcode} 绌哄埌浣�RArrive{ssx}>{RArrive} 鏈烘鎵嬫敹鍒版帶鍒颁綅.wArrive{ssx}Over>{wArriveOver} 閫佸嚭瀹屾垚.rRelease{ssx}Over>{rReleaseOver} 鏀捐揣瀹屾垚.WRelease{ssx}>{WRelease}");
+ if (RArrive == 1 && WRelease == 0 /*&& RArriveLast == 0*/ && !string.IsNullOrEmpty(RtrayCode) && RtrayCode != rdisTcode)
{
- if (ssx == "1005" && tag.SF涓嬫枡浣�WRelease1005 == 0)
+ switch (ssx)
{
- LogHelper.Info($"ssx == 1005 && tag.SF涓嬫枡浣�WRelease1005:{tag.SF涓嬫枡浣�WRelease1005} 鍐檉1 2215=1锛孯Arrive1005_LAST=1");
- tag.FNK1.D2215 = 1;
- //tag.SF涓嬫枡浣�RArrive1005_LAST = 1;
- RedisHelper.Add($"FNK1003051113.RArrive1005_LAST", "1", out string msg);
-
- //tag.SF涓嬫枡浣�WRelease1005 = 0;
- //tag.SF涓嬫枡浣�WSafe0305 = 0;
+ case "1003":
+ {
+ LogHelper.Info($"ssx == 1003 && tag.SF涓嬫枡浣�WRelease1003:{tag.SF涓嬫枡浣�WRelease1003} 鍐檉1 2210=1锛孉rrive{ssx}BarcodeLast={RtrayCode}");
+ tag.FNK1.D2210 = 1;
+ }
+ break;
+ case "1005":
+ {
+ LogHelper.Info($"ssx == 1005 && tag.SF涓嬫枡浣�WRelease1005:{tag.SF涓嬫枡浣�WRelease1005} 鍐檉1 2215=1锛孉rrive{ssx}BarcodeLast={RtrayCode}");
+ tag.FNK1.D2215 = 1;
+ }
+ break;
+ case "1011":
+ {
+ LogHelper.Info($"ssx == 1011 && tag.SF涓嬫枡浣�WRelease1011:{tag.SF涓嬫枡浣�WRelease1011} 鍐檉2 2210=1锛孉rrive{ssx}BarcodeLast={RtrayCode}");
+ tag.FNK2.D2210 = 1;
+ }
+ break;
+ case "1013":
+ {
+ LogHelper.Info($"ssx == 1013 && tag.SF涓嬫枡浣�WRelease1013:{tag.SF涓嬫枡浣�WRelease1013} 鍐檉2 2215=1锛孉rrive{ssx}BarcodeLast={RtrayCode}");
+ tag.FNK2.D2215 = 1;
+ }
+ break;
}
- else if (ssx == "1003" && tag.SF涓嬫枡浣�WRelease1003 == 0)
- {
- LogHelper.Info($"ssx == 1003 && tag.SF涓嬫枡浣�WRelease1003:{tag.SF涓嬫枡浣�WRelease1003} 鍐檉1 2210=1锛孯Arrive1003_LAST=1");
- tag.FNK1.D2210 = 1;
- //tag.SF涓嬫枡浣�RArrive1003_LAST = 1;
-
- RedisHelper.Add($"FNK1003051113.RArrive1003_LAST", "1", out string msg);
-
- //tag.SF涓嬫枡浣�WRelease1003 = 0;
- //tag.SF涓嬫枡浣�WSafe0305 = 0;
- }
- else if (ssx == "1013" && tag.SF涓嬫枡浣�WRelease1013 == 0)
- {
- LogHelper.Info($"ssx == 1013 && tag.SF涓嬫枡浣�WRelease1013:{tag.SF涓嬫枡浣�WRelease1013} 鍐檉2 2215=1锛孯Arrive1013_LAST=1");
- tag.FNK2.D2215 = 1;
- //tag.SF涓嬫枡浣�RArrive1013_LAST = 1;
- RedisHelper.Add($"FNK1003051113.RArrive1013_LAST", "1", out string msg);
-
- //tag.SF涓嬫枡浣�WRelease1013 = 0;
- //tag.SF涓嬫枡浣�WSafe1113 = 0;
- }
- else if (ssx == "1011" && tag.SF涓嬫枡浣�WRelease1011 == 0)
- {
- LogHelper.Info($"ssx == 1011 && tag.SF涓嬫枡浣�WRelease1011:{tag.SF涓嬫枡浣�WRelease1011} 鍐檉2 2210=1锛孯Arrive1011_LAST=1");
- tag.FNK2.D2210 = 1;
- //tag.SF涓嬫枡浣�RArrive1011_LAST = 1;
- RedisHelper.Add($"FNK1003051113.RArrive1011_LAST", "1", out string msg);
-
- //tag.SF涓嬫枡浣�WRelease1011 = 0;
- //tag.SF涓嬫枡浣�WSafe1113 = 0;
- }
+ RedisHelper.Add($"Arrive{ssx}BarcodeLast", RtrayCode, out msg);
}
- else if (RArrive == 0 && RArriveLast == 1)
+ else if (RArrive == 0)
{
- LogHelper.Info($"閲嶇疆 FNK1003051113.RArrive{ssx}_LAST=0");
- RedisHelper.Add($"FNK1003051113.RArrive{ssx}_LAST", "0", out string msg);
+ //if (RArriveLast == 1)
+ //{
+ // LogHelper.Info($"閲嶇疆 FNK1003051113.RArrive{ssx}_LAST=0");
+ // RedisHelper.Add($"FNK1003051113.RArrive{ssx}_LAST", "0", out string msg);
+ //}
+ if (wArriveOver == 1)
+ {
+ LogHelper.Info($"閲嶇疆 FNK1003051113.wArrive{ssx}Over=0");
+ Conn.榛樿Redis.SetValue($"FNK1003051113.wArrive{ssx}Over", "0", $"FNK1003051113Queue");
+ }
//Conn.榛樿Redis.SetValue($"FNK1003051113.RArrive{ssx}_LAST", "0", $"FNK1003051113Queue");
}
+
+ if (WRelease == 1 && rReleaseOver == 1)
+ {
+ switch (ssx)
+ {
+ case "1003":
+ {
+ LogHelper.Info($"璇粄ssx} WRelease=1&& rReleaseOver=1 璇籉NK1.D2213{tag.FNK1.D2213}=1? 骞跺啓0");
+ tag.FNK1.D2213 = 0;
+ }
+ break;
+ case "1005":
+ {
+ LogHelper.Info($"璇粄ssx} WRelease=1&& rReleaseOver=1 璇籉NK1.D2218{tag.FNK1.D2218}=1? 骞跺啓0");
+ tag.FNK1.D2218 = 0;
+ }
+ break;
+ case "1011":
+ {
+ LogHelper.Info($"璇粄ssx} WRelease=1&& rReleaseOver=1 璇籉NK2.D2213{tag.FNK1.D2213}=1? 骞跺啓0");
+ tag.FNK2.D2213 = 0;
+ }
+ break;
+ case "1013":
+ {
+ LogHelper.Info($"璇粄ssx} WRelease=1&& rReleaseOver=1 璇籉NK2.D2218{tag.FNK2.D2218}=1? 骞跺啓0");
+ tag.FNK2.D2218 = 0;
+ }
+ break;
+ }
+ LogHelper.Info($"璇粄ssx} WRelease=1&& rReleaseOver=1 WRelease 鍐�");
+ Conn.榛樿Redis.SetValue($"FNK1003051113.WRelease{ssx}", "0", $"FNK1003051113Queue");
+ }
+
}
}
public void ThreadFNK1Over(Tag tag)
{
Console.WriteLine($"ThreadFNK1Over =====>");
- LogHelper.Info($" FN1 D2217>{tag.FNK1.D2217} D2217LAST>{tag.FNK1.D2217_LAST} D2215>{tag.FNK1.D2215} D2216>{tag.FNK1.D2216} D2215>{tag.FNK1.D2215}");
+ LogHelper.Info($" FN1 D2217>{tag.FNK1.D2217} D2217LAST>{tag.FNK1.D2217_LAST} D2215>{tag.FNK1.D2215} D2216>{tag.FNK1.D2216} D2218>{tag.FNK1.D2218}");
//LogHelper.Info($" FN1 .D2217=1,2217_LAST=0 鍐�2215=0锛孌2217_LAST=1锛學Release1005=1 RArrive1005_LAST=0");
if (tag.FNK1.D2217 == 1 && tag.FNK1.D2217_LAST == 0)
{
- tag.FNK1.D2215 = 0;
+ //tag.FNK1.D2215 = 0;
+ tag.FNK1.D2218 = 1;
//tag.FNK1.D2212_LAST = 1;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "1", out string msg);
tag.SF涓嬫枡浣�WRelease1005 = 1;
tag.SF涓嬫枡浣�WSafe0305 = 1;
System.Threading.Thread.Sleep(1000);
- RedisHelper.Add($"FNK1003051113.RArrive1005_LAST", "0", out msg);
- LogHelper.Info($" FN1 .D2217=1,2217_LAST=0 鍐�2215=0锛孌2217_LAST=1锛學Release1005=1 RArrive1005_LAST=0");
+ //RedisHelper.Add($"FNK1003051113.RArrive1005_LAST", "0", out msg);
+ RedisHelper.Add($"Arrive1005BarcodeLast", "0", out msg);
+ LogHelper.Info($" FN1 .D2217=1,2217_LAST=0 鍐�2218=1锛孌2217_LAST=1锛學Release1005=1 Arrive1005BarcodeLast=0");
}
else if (tag.FNK1.D2217 == 0 && tag.FNK1.D2217_LAST == 1)
{
@@ -1366,21 +1420,23 @@
if (tag.FNK1.D2216 == 1)
{
tag.FNK1.D2215 = 0;
-
- LogHelper.Info($" p鍙戦偅绉�涓嬬嚎 璇籇2216=1 鍐橠2215 =0");
+ tag.SF涓嬫枡浣�wArrive1005Over = 1;
+ LogHelper.Info($" p鍙戦偅绉�涓嬬嚎 璇籇2216=1 鍐橠2215 =0锛�鍐欐満姊版墜鏀跺埌1005 =1");
}
- LogHelper.Info($" FN1 D2212>{tag.FNK1.D2212} D2212LAST>{tag.FNK1.D2212_LAST} D2210>{tag.FNK1.D2210} D2211>{tag.FNK1.D2211} D2210>{tag.FNK1.D2210}");
+ LogHelper.Info($" FN1 D2212>{tag.FNK1.D2212} D2212LAST>{tag.FNK1.D2212_LAST} D2210>{tag.FNK1.D2210} D2211>{tag.FNK1.D2211} D2213>{tag.FNK1.D2213}");
if (tag.FNK1.D2212 == 1 && tag.FNK1.D2212_LAST == 0)
{
- tag.FNK1.D2210 = 0;
+ tag.FNK1.D2213 = 1;
+ //tag.FNK1.D2210 = 0;
//tag.FNK1.D2217_LAST = 1;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "1", out string msg);
tag.SF涓嬫枡浣�WRelease1003 = 1;
tag.SF涓嬫枡浣�WSafe0305 = 1;
System.Threading.Thread.Sleep(1000);
- RedisHelper.Add($"FNK1003051113.RArrive1003_LAST", "0", out msg);
- LogHelper.Info($" FN1 .D2212=1,2212_LAST=0 鍐�2210=0锛孌2212_LAST=1锛學Release1003=1 RArrive1003_LAST=0");
+ //RedisHelper.Add($"FNK1003051113.RArrive1003_LAST", "0", out msg);
+ RedisHelper.Add($"Arrive1003BarcodeLast", "0", out msg);
+ LogHelper.Info($" FN1 .D2212=1,2212_LAST=0 鍐�D2213=1锛孌2212_LAST=1锛學Release1003=1 Arrive1003BarcodeLast=0");
}
//else if (tag.FNK1.D2211 == 1)
// tag.FNK1.D2210 = 0;
@@ -1394,26 +1450,28 @@
if (tag.FNK1.D2211 == 1)
{
tag.FNK1.D2210 = 0;
-
- LogHelper.Info($" p鍙戦偅绉�涓嬬嚎 璇籇2211=1 鍐橠2210 =0");
+ tag.SF涓嬫枡浣�wArrive1003Over = 1;
+ LogHelper.Info($" p鍙戦偅绉�涓嬬嚎 璇籇2211=1 鍐橠2210 =0 鍐欐満姊版墜鏀跺埌绌哄埌1003=1");
}
}
public void ThreadFNK2Over(Tag tag)
{
Console.WriteLine($"ThreadFNK2Over =====>");
- LogHelper.Info($" FN2 D2217>{tag.FNK2.D2217} D2217LAST>{tag.FNK2.D2217_LAST} D2215>{tag.FNK2.D2215} D2216>{tag.FNK2.D2216} D2215>{tag.FNK2.D2215}");
+ LogHelper.Info($" FN2 D2217>{tag.FNK2.D2217} D2217LAST>{tag.FNK2.D2217_LAST} D2215>{tag.FNK2.D2215} D2216>{tag.FNK2.D2216} D2218>{tag.FNK2.D2218}");
if (tag.FNK2.D2217 == 1 && tag.FNK2.D2217_LAST == 0)
{
- tag.FNK2.D2215 = 0;
+ //tag.FNK2.D2215 = 0;
+ tag.FNK2.D2218 = 1;
//tag.FNK2.D2212_LAST = 1;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "1", out string msg);
tag.SF涓嬫枡浣�WRelease1013 = 1;
tag.SF涓嬫枡浣�WSafe1113 = 1;
System.Threading.Thread.Sleep(1000);
- RedisHelper.Add($"FNK1003051113.RArrive1013_LAST", "0", out msg);
- LogHelper.Info($" FN2 .D2217=1,2217_LAST=0 鍐�2215=0锛孌2217_LAST=1锛學Release1013=1 RArrive1013_LAST=0");
+ //RedisHelper.Add($"FNK1003051113.RArrive1013_LAST", "0", out msg);
+ RedisHelper.Add($"Arrive1013BarcodeLast", "0", out msg);
+ LogHelper.Info($" FN2 .D2217=1,2217_LAST=0 鍐�2218=1锛孌2217_LAST=1锛學Release1013=1 Arrive1013BarcodeLast=0");
}
else if (tag.FNK2.D2217 == 0 && tag.FNK2.D2217_LAST == 1)
{
@@ -1425,22 +1483,24 @@
if (tag.FNK2.D2216 == 1)
{
tag.FNK2.D2215 = 0;
-
- LogHelper.Info($" p鍙戦偅绉�涓嬬嚎 璇籇2216=1 鍐橠2215 =0");
+ tag.SF涓嬫枡浣�wArrive1013Over = 1;
+ LogHelper.Info($" p鍙戦偅绉�涓嬬嚎 璇籇2216=1 鍐橠2215 =0 鍐欐満姊版墜鏀跺埌绌哄埌1013=1");
}
- LogHelper.Info($" FN2 D2212>{tag.FNK2.D2212} D2212LAST>{tag.FNK2.D2212_LAST} D2210>{tag.FNK2.D2210} D2211>{tag.FNK2.D2211} D2210>{tag.FNK2.D2210}");
+ LogHelper.Info($" FN2 D2212>{tag.FNK2.D2212} D2212LAST>{tag.FNK2.D2212_LAST} D2210>{tag.FNK2.D2210} D2211>{tag.FNK2.D2211} D2213>{tag.FNK2.D2213}");
if (tag.FNK2.D2212 == 1 && tag.FNK2.D2212_LAST == 0)
{
- tag.FNK2.D2210 = 0;
+ //tag.FNK2.D2210 = 0;
+ tag.FNK2.D2213 = 1;
//tag.FNK2.D2217_LAST = 1;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "1", out string msg);
tag.SF涓嬫枡浣�WRelease1011 = 1;
tag.SF涓嬫枡浣�WSafe1113 = 1;
System.Threading.Thread.Sleep(1000);
- RedisHelper.Add($"FNK1003051113.RArrive1011_LAST", "0", out msg);
- LogHelper.Info($" FN2 .D2212=1,2212_LAST=0 鍐�2210=0锛孌2212_LAST=1锛學Release1011=1 RArrive1011_LAST=0");
+ //RedisHelper.Add($"FNK1003051113.RArrive1011_LAST", "0", out msg);
+ RedisHelper.Add($"Arrive1011BarcodeLast", "0", out msg);
+ LogHelper.Info($" FN2 .D2212=1,2212_LAST=0 鍐�2213=1锛孌2212_LAST=1锛學Release1011=1 Arrive1011BarcodeLast=0");
}
else if (tag.FNK2.D2212 == 0 && tag.FNK2.D2212_LAST == 1)
{
@@ -1451,10 +1511,10 @@
if (tag.FNK2.D2211 == 1)
{
tag.FNK2.D2210 = 0;
- LogHelper.Info($" p鍙戦偅绉�涓嬬嚎 璇籇2211=1 鍐橠2210 =0");
+ tag.SF涓嬫枡浣�wArrive1011Over = 1;
+ LogHelper.Info($" p鍙戦偅绉�涓嬬嚎 璇籇2211=1 鍐橠2210 =0 鍐欐満姊版墜鏀跺埌绌哄埌1011 wArrive1011Over=1");
}
}
-
public void Thread1019Down(Tag tag)
@@ -1479,10 +1539,452 @@
}
public void Thread2030Down(Tag tag)
{
+
Console.WriteLine($"SA2030 浠诲姟鐘舵�锛� =====>");
Console.WriteLine($"SA2030 浠诲姟鐘舵�锛歿tag.SA2030.RtaskState}- 绌洪棽{tag.SA2030.R5绌洪棽} - barcode:{tag.SA2030.R鎵樼洏鐮亇");
}
+ public void ResolveMesTask()
+ {
+ TaskRepository taskservice = new TaskRepository();
+ var tasks = taskservice.FindList(x => (x.S_B_STATE == "MES" || x.S_B_STATE == "People") && x.N_PRIORITY == -88);
+ var VERXs = Settings.deviceInfos?.FindAll(x => x.deviceType == 2);
+ //if (VERXs.Any())
+ foreach (var task in tasks)
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} ");
+ var sx = VERXs?.Find(x => x.location.Contains(task.S_END_LOC));
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} {(sx == null ? "闈� : "鏄�)}鎬昏鏈哄櫒浜轰换鍔�);
+ if (sx == null)
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鐩存帴鐢熸垚瀵瑰簲浠诲姟");
+ //鐩存帴鐢熸垚瀵瑰簲浠诲姟銆�+ var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_START_LOC, task.S_END_LOC, task.S_TYPE, 6, task.S_CNTRS?.Split(',').ToList() ?? new List<string>());
+
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鐩存帴鐢熸垚瀵瑰簲浠诲姟 缁撴灉锛歿res}");
+ if (res)
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 淇敼鏍囪瘑");
+ //task.N_PRIORITY = 0;
+ taskservice.dbcontext.Set<TaskEntity>().Attach(task);
+ taskservice.dbcontext.Entry(task).Property(x => x.N_PRIORITY).CurrentValue = 0;
+ taskservice.dbcontext.Entry(task).Property(x => x.N_PRIORITY).IsModified = true;
+ taskservice.dbcontext.SaveChanges();
+ }
+ }
+ else
+ {
+ var sindex = sx.location.ToList().IndexOf(task.S_END_LOC);
+ LocRepository locRepository = new LocRepository();
+ //鐢熸垚璺宠穬浠诲姟銆� -- 鎵樼洏璐т綅琛ㄣ�
+ var t1s = taskservice.FindList(x => x.S_SRC_NO == task.S_TASK_NO);
+
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鏌ユ壘鏄惁鏈夊凡鐢熸垚浠诲姟锛歿t1s != null}");
+ if (t1s.Any())
+ {
+ var t1 = t1s.OrderBy(x => x.T_CREATE).LastOrDefault();
+ if (t1.S_END_LOC == task.S_END_LOC)
+ {
+ task.N_PRIORITY = 0;
+ task.S_B_STATE = "MES_瀹屾垚";
+ taskservice.Update(task);
+ continue;
+ }
+ if (t1.S_B_STATE == "瀹屾垚")
+ {
+ //1.缁堢偣鏄惁鏈夋墭鐩樸� 渚濇嵁鏄粓鐐圭殑浠诲姟鏄�浣滀负缁堢偣锛岃繕鏄捣鐐广�
+ //var ec = taskservice.FindList(x => (x.S_START_LOC == task.S_START_LOC || x.S_END_LOC == task.S_END_LOC) /*&& DateTime.Now.Subtract(x.T_CREATE).TotalHours < 5*/).OrderByDescending(x => x.T_CREATE).FirstOrDefault();//($"select top 1 * from TN_TASK WHERE S_START_LOC='{task.S_END_LOC}' OR S_END_LOC='{task.S_END_LOC}' ORDER BY T_CREATE DESC");
+ //var ec = taskservice.FindList(x => x.S_START_LOC == task.S_START_LOC && x.S_END_LOC == task.S_START_LOC, new Common.Data.Pagination
+ // {
+ // page = 1,
+ // sidx = "T_CREATE",
+ // sord = "desc",
+ // rows = 1
+ // }).FirstOrDefault();
+ //TaskEntity ec = null;
+ //var dev = Conn.榛樿Redis.GetValue(sx.deviceName + "." + (sindex == 0 ? "D1224" : "D1225"));
+ //if (dev?.Trim() == "1")
+ // ec = taskservice.FindList(x => x.S_END_LOC == task.S_END_LOC && x.S_B_STATE == "瀹屾垚", new Common.Data.Pagination
+ // {
+ // page = 1,
+ // sidx = "T_CREATE",
+ // sord = "desc",
+ // rows = 1
+ // }).FirstOrDefault();
+ bool canReq = true;
+ var tf = Conn.榛樿Redis.GetValue(sx.deviceName + ".D1202");
+ var V = sx.location.ToList().FindIndex(x => x == task.S_END_LOC) == 0;
+ var tf2 = int.Parse(string.IsNullOrEmpty(tf) ? "0" : tf);
+ canReq = TcpServer.GetBitdata(tf2, (V ? 2 : 3)) == 1;
+ //if (canReq)
+ // ec = taskservice.FindList(x => x.S_END_LOC == task.S_END_LOC && x.S_B_STATE == "瀹屾垚", new Common.Data.Pagination
+ // {
+ // page = 1,
+ // sidx = "T_CREATE",
+ // sord = "desc",
+ // rows = 1
+ // }).FirstOrDefault();
+ if (t1.S_START_LOC == task.S_START_LOC && canReq)//!= task.S_END_LOC)
+ {
+ //绗簩娈点�
+ LocEntity endLoc = null;
+ var di = sx;
+ if (di != null)
+ {
+ //foreach (var ssloc in di.deviceNo)
+ {
+ var ssloc = di.deviceNo[1];
+ var endloc = locRepository.FindEntity(x => x.S_LOC_CODE == ssloc);
+ if (endloc != null && endloc.N_CURRENT_NUM == 0 && endloc.S_LOCK_STATE.Trim() == "鏃�)
+ {
+ endLoc = endloc;
+ //break;
+ }
+ }
+ if (endLoc != null)
+ {
+ var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_END_LOC, endLoc.S_LOC_CODE, task.S_TYPE + "涓嬬┖", 7, "NONE".Split(',').ToList());
+ if (res)
+ {
+ task.N_PRIORITY = 0; taskservice.Update(task);
+ }
+ }
+ }
+ }
+ else
+ {
+ if (t1.S_START_LOC != task.S_START_LOC)
+ {
+ t1 = taskservice.FindEntity(x => x.S_SRC_NO == task.S_TASK_NO && x.S_START_LOC == task.S_START_LOC && x.S_B_STATE == "瀹屾垚");
+ }
+ var res = TaskProcess.CreateTask(task.S_TASK_NO, t1.S_END_LOC, task.S_END_LOC, task.S_TYPE + "琛ユ弧", 6, task.S_CNTRS.Split(',').ToList());
+ if (res)
+ {
+ task.N_PRIORITY = 0; taskservice.Update(task);
+ }
+ }
+ }
+ }
+ else
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 绛涢�鐢熸垚绗竴娈�浠诲姟銆�);
+ //鐢熸垚绗竴娈点�
+ LocEntity endLoc = null;
+ var di = sx;
+ if (di != null)
+ {
+ //foreach (var ssloc in di.deviceNo)
+ {
+ var ssloc = di.deviceNo[0];
+ var endloc = locRepository.FindEntity(x => x.S_LOC_CODE == ssloc);
+ if (endloc != null && endloc.N_CURRENT_NUM == 0 && endloc.S_LOCK_STATE.Trim() == "鏃�)
+ {
+ endLoc = endloc;
+ //break;
+ }
+ }
+ if (endLoc != null)
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鍒涘缓绗竴娈�浠诲姟銆�);
+ var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_START_LOC, endLoc.S_LOC_CODE, task.S_TYPE + "婊¤浆", 8, task.S_CNTRS.Split(',').ToList());
+
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鍒涘缓绗竴娈�浠诲姟銆傜粨鏋滐細{res}");
+ if (res)
+ {
+ task.N_PRIORITY = 0; taskservice.Update(task);
+ }
+ }
+ }
+ }
+
+ }
+ }
+ }
+
+
+ public HkReturnResult OperateHKTaskStatus(HaiKangOrderInfo model)
+ {
+ // 鏌ヨ浠诲姟锛氭牴鎹换鍔″彿
+ //var wcsTask = WCSHelper.GetTask(model.taskCode);
+ ITaskRepository MainMissionService = new TaskRepository();
+ var wcsTask = MainMissionService.FindEntity(x => model.taskCode == x.S_TASK_NO);
+ if (wcsTask != null)
+ {
+ if (!string.IsNullOrWhiteSpace(model.method))
+ {
+ ILocRepository locrep = new LocRepository();
+ var startloc = locrep.FindEntity(x => x.S_LOC_CODE == wcsTask.S_START_LOC);
+ var endLoc = locrep.FindEntity(x => x.S_LOC_CODE == wcsTask.S_END_LOC);
+
+ List<string> cntrs = wcsTask.S_CNTRS.Split(',').ToList();
+ bool bobe = false;
+ //model.method = model.method?.ToLower();
+ switch (model.method)
+ {
+ case "start":
+ LogHelper.Info($"娴峰悍杞︿换鍔＄姸鎬佸彉鏇翠负鎵ц锛屼换鍔″彿涓猴細{model.taskCode}", "agv鏉弶浜や簰鏃ュ織");
+ if (wcsTask.S_B_STATE.Trim() == "宸叉帹閫�)
+ {
+ wcsTask.S_B_STATE = "鎵ц涓�;
+ wcsTask.T_START_TIME = DateTime.Now;
+ MainMissionService.Update(wcsTask);
+ bobe = true;
+ }
+ break;
+ case "outBin":
+ case "outbin":
+ model.method = model.method?.ToLower();
+ LogHelper.Info($"娴峰悍杞︿换鍔＄姸鎬佸彉鏇翠负鍙栬揣瀹屾垚锛屼换鍔″彿涓猴細{model.taskCode}", "agv鏉弶浜や簰鏃ュ織");
+ wcsTask.S_B_STATE = "鍙栬揣瀹屾垚";
+
+ startloc.N_CURRENT_NUM = 0;
+ startloc.S_LOCK_STATE = "鏃�;
+ startloc.T_MODIFY = DateTime.Now;
+ //ILocContainerRepository locContainerRepository = new LocContainerRepository();
+ ////var cnr = locContainerRepository.FindList(x => cntrs.Contains(x.S_CNTR_CODE.Trim()) && x.S_LOC_CODE == wcsTask.S_START_LOC);
+ //locContainerRepository.Delete(x => cntrs.Contains(x.S_CNTR_CODE.Trim()) && x.S_LOC_CODE == wcsTask.S_START_LOC);
+ MainMissionService.Update(wcsTask);
+ locrep.Update(startloc);
+
+ bobe = true;
+ var device = Settings.deviceInfos.Find(x => x.location.Contains(wcsTask.S_START_LOC));
+ if (device != null)
+ {
+ if (device.deviceType == 1)
+ {
+ if (device.deviceName.Contains("缁村笇灏旀姄鑷�))
+ { //鍗歌揣杩涜娓呯┖锛岃Е鍙戞壂鐮�+ var inde = device.location.ToList().FindIndex(x => x == wcsTask.S_START_LOC) == 0;
+ string V = inde ? "R05" : "R06";
+ Conn.榛樿Redis.SetValue(device.deviceName + "." + V, "true", device.deviceName + "Queue", false);
+
+ TcpServer.TrayIps.Remove(device.deviceNo[inde ? 0 : 1]);
+ }
+ }
+ else if (device.deviceType == 2)
+ {
+ //Task.Run(() =>
+ //{
+ // var inde = device.location.ToList().FindIndex(x => x == wcsTask.S_START_LOC) == 0;
+ // string V = inde ? "D1224" : "D1225";
+ // Conn.榛樿Redis.SetValue(device.deviceName + "." + V, "0", device.deviceName + "Queue");
+ //});
+ }
+ }
+ //LocationHelper.UnLockLoc(wcsTask.S_START_LOC);
+ break;
+ case "end":
+ LogHelper.Info($"娴峰悍杞︿换鍔＄姸鎬佸彉鏇翠负瀹屾垚锛屼换鍔″彿涓猴細{model.taskCode}", "agv鏉弶浜や簰鏃ュ織");
+ wcsTask.S_B_STATE = "瀹屾垚";
+ wcsTask.T_END_TIME = DateTime.Now;
+
+ bobe = true;
+ //ILocContainerRepository locContainerRepository2 = new LocContainerRepository();
+ //List<LocContainerEntity> llls = new List<LocContainerEntity>();
+ //foreach (var c in cntrs)
+ //{
+ // var action = new LocContainerEntity()
+ // {
+ // S_ID = Guid.NewGuid().ToString(),
+ // S_STATE = "缂栬緫",
+ // T_CREATE = DateTime.Now,
+ // T_MODIFY = DateTime.Now,
+
+ // S_LOC_CODE = endLoc.S_LOC_CODE,
+ // S_CNTR_CODE = c,
+ // S_TYPE = "",
+ // };
+ // llls.Add(action);
+ //}
+
+ endLoc.S_LOCK_STATE = "鏃�;
+ endLoc.N_CURRENT_NUM = 1;
+ endLoc.T_MODIFY = DateTime.Now;
+ MainMissionService.Update(wcsTask);
+ if (Settings.deviceInfos.Find(x => x.deviceType == 2 && (/*x.location.Contains(wcsTask.S_END_LOC)||*/x.deviceNo.Contains(wcsTask.S_END_LOC))) != null)
+ locrep.Update(endLoc);
+ //locContainerRepository2.Insert(llls);
+
+ var device2 = Settings.deviceInfos.Find(x => x.location.Contains(wcsTask.S_END_LOC));
+ if (device2 != null)
+ {
+ if (device2.deviceType == 1)
+ {
+ if (device2.deviceName.Contains("缁村笇灏旀姄鑷�))
+ {
+ //string V = device2.location.ToList().FindIndex(x => x == wcsTask.S_START_LOC) == 0 ? "R10" : "R11";
+ //Conn.榛樿Redis.SetValue(device2.deviceName + "." + V, "true", device2.deviceName + "Queue");
+ //鍗歌揣鍐嶅啓鎵樼洏鍙栬蛋銆�鐒跺悗瑙﹀彂鎵爜杩涜鏍￠獙銆�
+ var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
+ //string V = inde ? "R05" : "R06";
+ //Conn.榛樿Redis.SetValue(device2.deviceName + "." + V, "true", device2.deviceName + "Queue");
+ string V2 = inde ? "R10_LAST" : "R11_LAST";
+ //Conn.榛樿Redis.SetValue(device2.deviceName + "." + V2, "true", device2.deviceName + "Queue");
+
+ GZ.Modular.Redis.RedisHelper.Add(device2.deviceName + "." + V2, "true", out string msg1);
+ TcpServer.TrayIps.Remove(device2.deviceNo[inde ? 0 : 1]);
+ }
+ }
+ else if (device2.deviceType == 2)
+ {
+ if (device2.deviceName.Contains("Js鎹烽『"))
+ {
+ Task.Run(() =>
+ {
+ var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
+ string V = inde ? "D1224" : "D1225";
+ Conn.榛樿Redis.SetValue(device2.deviceName + "." + V, "1", device2.deviceName + "Queue");
+ });
+
+ var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
+ {
+ sceneType = 3,
+ cntrCode = cntrs.FirstOrDefault()
+ }));
+ //if (device2.deviceName.Contains("1"))
+ //{
+ // if (inde) tag.Js1.D1224 = 1;
+ // else tag.Js1.D1225 = 1;
+ //}else
+ //{
+ // if (inde) tag.Js2.D1224 = 1;
+ // else tag.Js2.D1225 = 1;
+ //}
+ }
+ var ssloc = device2.deviceNo[1];
+ var endloc = locrep.FindEntity(x => x.S_LOC_CODE == ssloc);
+ LogHelper.Info($"鎹烽『鍗歌揣鍚庯紝 鏌ョ湅缂撳瓨浣�{ssloc}-{endloc?.N_CURRENT_NUM}>0? 鍒欑敵璇穖es鎼蛋銆�);
+ if (endloc != null && endloc.N_CURRENT_NUM == 1)
+ {
+ var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
+ {
+ requestType = 3,
+ startBit = ssloc
+ }));
+ LogHelper.Info($"{ssloc}鐢宠mes浠诲姟缁撴灉{str}");
+ }
+ }
+ }
+
+ //LocationMethod.JudgeLocation(wcsTask);
+ break;
+ case "cancel":
+ LogHelper.Info($"娴峰悍杞︿换鍔＄姸鎬佸彉鏇翠负鍙栨秷锛屼换鍔″彿涓猴細{model.taskCode}", "agv鏉弶浜や簰鏃ュ織");
+ wcsTask.S_B_STATE = "鍙栨秷";
+ //startloc.S_LOCK_STATE = "鏃�;
+ //endLoc.S_LOCK_STATE = "鏃�;
+ MainMissionService.Update(wcsTask);
+ TaskActRepository taskActRepository = new TaskActRepository();
+ var tare = taskActRepository.FindList(x => x.S_TASK_NO == wcsTask.S_TASK_NO);
+ if (tare.Any())
+ {
+ if (tare.Find(x => x.S_ACTION_CODE == "outbin") == null)
+ {
+ startloc.S_LOCK_STATE = "鏃�;
+ endLoc.S_LOCK_STATE = "鏃�;
+ locrep.Update(startloc);
+ locrep.Update(endLoc);
+ }
+ else if (tare.Find(x => x.S_ACTION_CODE == "end") == null)
+ {
+ endLoc.S_LOCK_STATE = "鏃�;
+ locrep.Update(endLoc);
+ }
+ }
+
+ //locrep.Update(startloc);
+ //locrep.Update(endLoc);
+ //TaskProcess.OperateStatus(wcsTask, 7);
+ //WCSHelper.Fail(wcsTask);
+ break;
+ case "apply":
+ // 鍒ゆ柇璇ヤ换鍔＄殑鎺ラ┏浣嶆槸鍚︽湁鍏朵粬鍏ュ簱鎴栧嚭搴撲换鍔★紝濡傛灉鏈夛紝鍒欏湪绛変綅绛夊緟锛屽鏋滄病鏈夛紝鍒欏叆
+ //TaskisOk(wcsTask);
+ break;
+ }
+
+ if (!string.IsNullOrEmpty(wcsTask.S_SRC_NO))
+ {
+ var mestask = MainMissionService.FindEntity(x => x.S_TASK_NO == wcsTask.S_SRC_NO);
+ if (mestask != null && bobe)
+ {
+ if (model.method != "end")
+ {
+ if (mestask.S_START_LOC == wcsTask.S_START_LOC && mestask.S_B_STATE == "MES")
+ Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/201", JsonConvert.SerializeObject(new
+ {
+ reqCode = wcsTask.S_SRC_NO,
+ model.method
+ }));
+ }
+ else
+ {
+ if (mestask.S_END_LOC != wcsTask.S_END_LOC)
+ {
+ LogHelper.Info($"{wcsTask.S_SRC_NO}-{wcsTask.S_TASK_NO} 涓�樁娈靛畬鎴愶紝閲嶇疆杩涜浜岄樁娈点�");
+ mestask.N_PRIORITY = -88;
+ MainMissionService.Update(mestask);
+ }
+ else if (mestask.S_B_STATE == "MES")
+ {
+ var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/201", JsonConvert.SerializeObject(new
+ {
+ reqCode = wcsTask.S_SRC_NO,
+ model.method
+ }));
+ }
+ }
+
+ }
+ else if (mestask != null && model.method == "cancel")
+ {
+ if (mestask.S_B_STATE == "MES")
+ Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/201", JsonConvert.SerializeObject(new
+ {
+ reqCode = wcsTask.S_SRC_NO,
+ model.method
+ }));
+ LogHelper.Info($"{wcsTask.S_SRC_NO}-{wcsTask.S_TASK_NO} 涓�樁娈靛彇娑堬紝閲嶇疆鐐癸紝绾跨▼澶勭悊銆�);
+ mestask.N_PRIORITY = -1;
+ mestask.S_B_STATE = "MES_鍙栨秷";
+ MainMissionService.Update(mestask);
+ }
+ }
+ TaskProcess.AddActionRecord(model.taskCode, model.method, model.eqpCode, model.data, wcsTask.S_START_LOC, wcsTask.S_END_LOC);
+ //璋冪敤绗笁鏂规帴鍙ｏ紙濡傛灉鏈夛級TaskProcess.ReportStatus
+ }
+ else
+ {
+ // 鏆傛椂璁惧畾涓�
+ wcsTask.S_B_STATE = "涓婃姤鐘舵�绌�;
+ //瀹夊叏璇锋眰绛�+ //TaskProcess.OperateReq(model.taskCode, wcsTask.N_B_STATE, model.eqpCode, model.data);
+ }
+ }
+ else
+ {
+ LogHelper.Info($"褰撳墠浠诲姟鍙蜂换鍔′笉瀛樺湪{model.taskCode} agv鏉弶浜や簰鏃ュ織");
+ return new HkReturnResult { reqCode = model.reqCode, code = 1, message = "杩欎笉鏄垜浠殑浠诲姟銆� };
+ }
+ return new HkReturnResult { reqCode = model.reqCode, code = 0 };
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
}
--
Gitblit v1.9.1