From 9cba325e0d7c30644606e63e5df01faba0c42038 Mon Sep 17 00:00:00 2001 From: lss <2538410689@qq.com> Date: 星期三, 06 八月 2025 17:18:41 +0800 Subject: [PATCH] 优化 --- HH.WCS.Mobox3 - 大车间/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs | 84 +++++++++++++++++++++-------------------- 1 files changed, 43 insertions(+), 41 deletions(-) diff --git "a/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs" "b/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs" index 27e2b1e..97938e4 100644 --- "a/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs" +++ "b/HH.WCS.Mobox3 - \345\244\247\350\275\246\351\227\264/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs" @@ -74,42 +74,42 @@ } WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data); - - //TN_Task = WCSHelper.GetTask(TN_Task.S_CODE); - string urlstate = Settings.tableUrls.Find(a => a.id == 1).url; - TaskProcess.MESReportback(TN_Task, model.state, urlstate); - - - //绔嬪簱涓巜ms浠诲姟鍥炴姤 - TableUrl url = null; - switch (TN_Task.Z_TYPE) - { - case 1: - url = Settings.tableUrls.Find(a => a.id == 4); - if (url != null) - { - TaskProcess.Reportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url, "ML"); - } - else - { - LogHelper.Info("鍘熸潗鏂欎换鍔″洖鎶ワ紝鏍规嵁id=1鏈壘鍒板湴鍧�厤缃枃浠讹紝璇锋鏌ラ厤缃枃浠�); - } - break; - case 2: - url = Settings.tableUrls.Find(a => a.id == 5); - if (url != null) - { - TaskProcess.Reportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url, "YBK"); - } - else - { - LogHelper.Info("鍘熸潗鏂欎换鍔″洖鎶ワ紝鏍规嵁id=9鏈壘鍒板湴鍧�厤缃枃浠讹紝璇锋鏌ラ厤缃枃浠�); - } - break; + //TN_Task = WCSHelper.GetTask(TN_Task.S_CODE); + string urlstate = Settings.tableUrls.Find(a => a.id == 1).url; + TaskProcess.MESReportback(TN_Task, model.state, urlstate); - } - + + //绔嬪簱涓巜ms浠诲姟鍥炴姤 + TableUrl url = null; + switch (TN_Task.Z_TYPE) + { + + case 1: + url = Settings.tableUrls.Find(a => a.id == 4); + if (url != null) + { + TaskProcess.Reportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url, "ML"); + } + else + { + LogHelper.Info("鍘熸潗鏂欎换鍔″洖鎶ワ紝鏍规嵁id=1鏈壘鍒板湴鍧�厤缃枃浠讹紝璇锋鏌ラ厤缃枃浠�); + } + break; + case 2: + url = Settings.tableUrls.Find(a => a.id == 5); + if (url != null) + { + TaskProcess.Reportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url, "YBK"); + } + else + { + LogHelper.Info("鍘熸潗鏂欎换鍔″洖鎶ワ紝鏍规嵁id=9鏈壘鍒板湴鍧�厤缃枃浠讹紝璇锋鏌ラ厤缃枃浠�); + } + break; + + } + } else { @@ -219,16 +219,18 @@ { list.ForEach(task => { - - if (TaskProcess.Intercept(task)) - { - //浣跨敤鑷畾涔変换鍔℃帹閫�- TaskProcess.SendTask(task); - } + LogHelper.Info($"浠诲姟鎺ㄩ�鏁版嵁锛歿JsonConvert.SerializeObject(task)}"); + //if (TaskProcess.Intercept(task)) + // { + //浣跨敤鑷畾涔変换鍔℃帹閫�+ TaskProcess.SendTask(task); + // } }); } - else { Console.WriteLine($"鏃犲彲鎺ㄩ�浠诲姟"); } + else { + Console.WriteLine($"鏃犲彲鎺ㄩ�浠诲姟"); + } } /// <summary> -- Gitblit v1.9.1