From 31beeb3d23e658e5aa2bbb9f251b006095eef15a Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期一, 07 七月 2025 11:05:04 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 109 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 92 insertions(+), 17 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 2627aa9..7f33c68 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"
@@ -387,7 +387,7 @@
}));
var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
if (strr != null && strr.success)
- //if (str.Contains("true"))
+ //if (str.Contains("true"))
{
//Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
//tag.wxr1.R11 = true;
@@ -469,7 +469,7 @@
}));
var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
if (strr != null && strr.success)
- //if (str.Contains("true"))
+ //if (str.Contains("true"))
{
//Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
//tag.wxr2.R10 = true;
@@ -893,7 +893,7 @@
if (tag.RGV.bit1taskOver == 1)
tag.RGV.bit1taskOver = 0;
- LogHelper.Info($"{task1.S_TASK_NO}> taskend 鍐�0");
+ LogHelper.Info($"{task1.S_TASK_NO}> taskend 鍐�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);
@@ -996,7 +996,7 @@
var taskCOdes = new List<string> { "Sarrive", "Srelease", "Earrive", "Erelease" };
TaskActRepository taskActRepository = new TaskActRepository();
TaskRepository taskRepository = new TaskRepository();
- var requires = taskActRepository.FindList(x => taskCOdes.Contains(x.S_ACTION_CODE) && x.N_CREATEMETHOD == 0).OrderBy(x => x.T_CREATE);
+ var requires = taskActRepository.FindList(x => DateTime.Now.Subtract(x.T_CREATE).TotalHours < 1 && taskCOdes.Contains(x.S_ACTION_CODE) && x.N_CREATEMETHOD == 0).OrderBy(x => x.T_CREATE);
foreach (var item in requires)
{
LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE}鍏夋爡澶勭悊 =================> ");
@@ -1618,7 +1618,7 @@
}
- public void ResolveMesTask()
+ public void ResolveMesTask(Tag tag)
{
TaskRepository taskservice = new TaskRepository();
var tasks = taskservice.FindList(x => (x.S_B_STATE == "MES" || x.S_B_STATE == "People") && x.N_PRIORITY == -88);
@@ -1635,19 +1635,82 @@
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)
+ if (string.IsNullOrEmpty(task.S_CNTRS) && !string.IsNullOrEmpty(task.S_INDEX))
{
- 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();
+ // 鍙枡浠诲姟銆�鎸囧畾鐗╂枡涓嶆寚瀹氭墭鐩橈紝闇�鍑哄簱
+ switch (task.S_START_LOC)
+ {
+ case "2030":
+ if (!string.IsNullOrEmpty(tag.SA2030.R鎵樼洏鐮�)
+ {
+ var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+ {
+ cntrCode = tag.SA2030.R鎵樼洏鐮�
+ type = 1
+ }));
+ var strr = JsonConvert.DeserializeObject<MES2234>(str);
+ if (strr.success && strr.data.materialCode == task.S_INDEX)
+ {
+ task.S_CNTRS = tag.SA2030.R鎵樼洏鐮�
+ taskservice.Update(task);
+ }
+ else
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 2030 鍑哄彛鐨勬墭鐩樼墿鏂欎笉绗﹀悎");
+ }
+ }
+ else
+ {
+ //TODO------------------2027 2220 2013.. 璇嗗埆涓�笅锛屽紑濮嬪簱
+ }
+ break;
+ case "1019":
+ if (!string.IsNullOrEmpty(tag.SA1019.R鎵樼洏鐮�)
+ {
+ var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+ {
+ cntrCode = tag.SA1019.R鎵樼洏鐮�
+ type = 2
+ }));
+ var strr = JsonConvert.DeserializeObject<MES2234>(str);
+ if (strr.success && strr.data.materialCode == task.S_INDEX)
+ {
+ task.S_CNTRS = tag.SA2030.R鎵樼洏鐮�
+ taskservice.Update(task);
+ }
+ else
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 1019 鍑哄彛鐨勬墭鐩樼墿鏂欎笉绗﹀悎");
+ }
+ }
+ break;
+ }
+ }
+ else
+ {
+ if (new List<string> { "2001", "1022", "1025", "3001", "3006" }.Contains(task.S_END_LOC))
+ {
+ //------------------
+ }
+ else if (new List<string> { "1019"/*, "1030"*/, "2030", "3005", "3010" }.Contains(task.S_START_LOC)) //1030 鏄富鍔ㄧ敵璇凤紝 涓嶇敤鍒ゆ柇銆�+ {
+
+ }
+
+ 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
@@ -2464,6 +2527,18 @@
public object extra { get; set; }
}
+ class MES2234
+ {
+ public bool success { get; set; }
+ public ML data { get; set; }
+ }
+
+ public class ML
+ {
+ public string materialCode { get; set; }
+ public int lineNum { get; set; }
+ }
+
public class Ddata
{
public string reqCode { get; set; }
--
Gitblit v1.9.1