From 1319cb7072623dff12369a889af766db2d166def Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期一, 28 七月 2025 17:58:47 +0800
Subject: [PATCH] 叠盘机优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs | 239 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 124 insertions(+), 115 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
index 0fe3945..8cc7ebe 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
@@ -1,4 +1,5 @@
-锘縰sing HH.WCS.JiaTong.dispatch;
+锘縰sing HH.WCS.JiaTong.device;
+using HH.WCS.JiaTong.dispatch;
using HH.WCS.JiaTong.process;
using HH.WCS.JiaTong.util;
using HH.WCS.JiaTong.wms;
@@ -9,7 +10,9 @@
using System.Linq;
using System.Net.NetworkInformation;
using System.Security.Policy;
+using System.Threading;
using System.Threading.Tasks;
+using System.Web.Services.Description;
using static HH.WCS.JiaTong.api.ApiModel;
using static HH.WCS.JiaTong.util.Settings;
@@ -74,138 +77,144 @@
}
WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
- //鐗╂枡鍒颁綅閫氱煡
- if ((TN_Task.S_TYPE == "鍑哄钩搴� || TN_Task.S_TYPE == "浣欐枡杩斿洖") && model.state == 6)
- {
- string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
- TaskProcess.MESIteminfoback(TN_Task, urlitem);
- }
- if ((TN_Task.S_NOTE == "鍑哄簱" || TN_Task.S_NOTE == "寮傚父搴撳尯鍏ュ簱") && !string.IsNullOrEmpty(TN_Task.S_MES_NO) && model.state == 6)
- {
- string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
- TaskProcess.MESIteminfoback(TN_Task, urlitem);
- }
- //浠诲姟鍥炴姤 浠诲姟鏉ユ簮 1.閽笣绔嬪簱 2.鑳剁墖搴� 3.棰勫搴�5.mes涓嬪彂
+ //澶嶆潅涓氬姟绾跨▼澶勭悊 涓嶅奖鍝嶅洖鎶�+
+ //鐗╂枡鍒颁綅閫氱煡
+ if ((TN_Task.S_TYPE == "鍑哄钩搴� || TN_Task.S_TYPE == "浣欐枡杩斿洖") && model.state == 6)
+ {
+ string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
+ TaskProcess.MESIteminfoback(TN_Task, urlitem);
+ }
+ if ((TN_Task.S_NOTE == "鍑哄簱" || TN_Task.S_NOTE == "寮傚父搴撳尯鍏ュ簱") && !string.IsNullOrEmpty(TN_Task.S_MES_NO) && model.state == 6)
+ {
+ string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
+ TaskProcess.MESIteminfoback(TN_Task, urlitem);
+ }
+ //浠诲姟鍥炴姤 浠诲姟鏉ユ簮 1.閽笣绔嬪簱 2.鑳剁墖搴� 3.棰勫搴�5.mes涓嬪彂
- //TN_Task = WCSHelper.GetTask(TN_Task.S_CODE);
- string urlstate = Settings.tableUrls.Find(a => a.id == 4).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 == 1);
- 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 3:
- url = Settings.tableUrls.Find(a => a.id == 9);
- 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;
- case 4:
- url = Settings.tableUrls.Find(a => a.id == 11);
- if (url != null)
- {
- Console.WriteLine($"鍘熸潗鏂欎换鍔″洖鎶TN_Task.S_EQ_NO}");
- if (TN_Task.S_TYPE.Contains("鐢垫"))
+ //TN_Task = WCSHelper.GetTask(TN_Task.S_CODE);
+ string urlstate = Settings.tableUrls.Find(a => a.id == 4).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 == 1);
+ if (url != null)
{
- if (TN_Task.S_TYPE == "鐢垫1")
+ TaskProcess.Reportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url, "ML");
+ }
+ else
+ {
+ LogHelper.Info("鍘熸潗鏂欎换鍔″洖鎶ワ紝鏍规嵁id=1鏈壘鍒板湴鍧�厤缃枃浠讹紝璇锋鏌ラ厤缃枃浠�);
+ }
+ break;
+ case 3:
+ url = Settings.tableUrls.Find(a => a.id == 9);
+ 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;
+ case 4:
+ url = Settings.tableUrls.Find(a => a.id == 11);
+ if (url != null)
+ {
+ Console.WriteLine($"鍘熸潗鏂欎换鍔″洖鎶TN_Task.S_EQ_NO}");
+ if (TN_Task.S_TYPE.Contains("鐢垫"))
{
- if (TN_Task.S_CODE == "1" || TN_Task.S_CODE == "3" || TN_Task.S_CODE == "4")
+ if (TN_Task.S_TYPE == "鐢垫1")
{
- TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url);
+ if (TN_Task.S_CODE == "1" || TN_Task.S_CODE == "3" || TN_Task.S_CODE == "4")
+ {
+ TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url);
+ }
+ }
+ else if (TN_Task.S_TYPE == "鐢垫2")
+ {
+ if (TN_Task.S_CODE == "5" || TN_Task.S_CODE == "6" || TN_Task.S_CODE == "2")
+ {
+ TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url);
+ }
}
}
- else if (TN_Task.S_TYPE == "鐢垫2")
+ else
{
- if (TN_Task.S_CODE == "5" || TN_Task.S_CODE == "6" || TN_Task.S_CODE == "2")
- {
- TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url);
- }
+
+ var db = new SqlHelper<object>().GetInstance();
+ var mstbyEqno = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO.Trim() == TN_Task.S_EQ_NO).ToList();
+ TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url);
}
}
else
{
-
- var db = new SqlHelper<object>().GetInstance();
- var mstbyEqno = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO.Trim() == TN_Task.S_EQ_NO).ToList();
- TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url);
+ LogHelper.Info("鍘熸潗鏂欎换鍔″洖鎶ワ紝鏍规嵁id=11鏈壘鍒板湴鍧�厤缃枃浠讹紝璇锋鏌ラ厤缃枃浠�);
}
- }
- else
- {
- LogHelper.Info("鍘熸潗鏂欎换鍔″洖鎶ワ紝鏍规嵁id=11鏈壘鍒板湴鍧�厤缃枃浠讹紝璇锋鏌ラ厤缃枃浠�);
- }
- break;
- case 6:
- url = Settings.tableUrls.Find(a => a.id == 14);
- if (url != null)
- {
- TaskProcess.WmsReportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url);
- }
- else
- {
- LogHelper.Info("鍘熸潗鏂欎换鍔″洖鎶ワ紝鏍规嵁id=14鏈壘鍒板湴鍧�厤缃枃浠讹紝璇锋鏌ラ厤缃枃浠�);
- }
+ break;
+ case 6:
+ url = Settings.tableUrls.Find(a => a.id == 14);
+ if (url != null)
+ {
+ TaskProcess.WmsReportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url);
+ }
+ else
+ {
+ LogHelper.Info("鍘熸潗鏂欎换鍔″洖鎶ワ紝鏍规嵁id=14鏈壘鍒板湴鍧�厤缃枃浠讹紝璇锋鏌ラ厤缃枃浠�);
+ }
- break;
- }
+ break;
+ }
+
+
}
else
{
- var db = new SqlHelper<TaskAction>().GetInstance();
- var taskAction = db.Queryable<TaskAction>().Where(a => a.S_TASK_CODE == model.task_no && a.N_ACTION_CODE == model.state).First();
- if (taskAction == null)
- {
- WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
- }
+
+ var db = new SqlHelper<TaskAction>().GetInstance();
+ var taskAction = db.Queryable<TaskAction>().Where(a => a.S_TASK_CODE == model.task_no && a.N_ACTION_CODE == model.state).First();
+ if (taskAction == null)
+ {
+ WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
+ }
- //瀹夊叏璇锋眰绛�- string url = "";
- string name = "";
- if (TN_Task.Z_TYPE == 1)
- {
- url = Settings.tableUrls.Find(a => a.id == 2).url;
- name = "ML";
- }
- else if (TN_Task.Z_TYPE == 3)
- {
- url = Settings.tableUrls.Find(a => a.id == 10).url;
- name = "YBK";
- }
- else if (TN_Task.Z_TYPE == 4)
- {
- url = Settings.tableUrls.Find(a => a.id == 11).url;
- name = "YCL";
- }
- else
- {
- LogHelper.Info($"瀹夊叏璇锋眰锛氫换鍔＄被鍨嬮敊璇�褰撳墠浠诲姟绫诲瀷{TN_Task.Z_TYPE}");
- }
- if (!string.IsNullOrEmpty(url))
- {
- TaskProcess.OperateReq(model, url, TN_Task, name);
- }
- else
- {
- LogHelper.Info($"瀹夊叏璇锋眰锛氭湭鎵惧埌鍥炴姤鍦板潃锛岃妫�煡閰嶇疆鏂囦欢==>{JsonConvert.SerializeObject(Settings.tableUrls)}");
- }
+ //瀹夊叏璇锋眰绛�+ string url = "";
+ string name = "";
+ if (TN_Task.Z_TYPE == 1)
+ {
+ url = Settings.tableUrls.Find(a => a.id == 2).url;
+ name = "ML";
+ }
+ else if (TN_Task.Z_TYPE == 3)
+ {
+ url = Settings.tableUrls.Find(a => a.id == 10).url;
+ name = "YBK";
+ }
+ else if (TN_Task.Z_TYPE == 4)
+ {
+ url = Settings.tableUrls.Find(a => a.id == 11).url;
+ name = "YCL";
+ }
+ else
+ {
+ LogHelper.Info($"瀹夊叏璇锋眰锛氫换鍔＄被鍨嬮敊璇�褰撳墠浠诲姟绫诲瀷{TN_Task.Z_TYPE}");
+ }
+ if (!string.IsNullOrEmpty(url))
+ {
+ TaskProcess.OperateReq(model, url, TN_Task, name);
+ }
+ else
+ {
+ LogHelper.Info($"瀹夊叏璇锋眰锛氭湭鎵惧埌鍥炴姤鍦板潃锛岃妫�煡閰嶇疆鏂囦欢==>{JsonConvert.SerializeObject(Settings.tableUrls)}");
+ }
+
+
}
}
}
--
Gitblit v1.9.1