From 79db8fda0f71b65dfe1e1c72f307b29efc565126 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期一, 04 八月 2025 17:31:22 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs | 173 +++++++++++++++++++++++++++++----------------------------
1 files changed, 87 insertions(+), 86 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 63dde4f..521597f 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,6 +77,85 @@
}
WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
+ //浠诲姟鍥炴姤 浠诲姟鏉ユ簮 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("鐢垫"))
+ {
+ if (TN_Task.S_TYPE == "鐢垫1")
+ {
+ 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
+ {
+
+ 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
+ {
+ 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;
+ }
+
//鐗╂枡鍒颁綅閫氱煡
if ((TN_Task.S_TYPE == "鍑哄钩搴� || TN_Task.S_TYPE == "浣欐枡杩斿洖") && model.state == 6)
{
@@ -85,94 +167,11 @@
string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
TaskProcess.MESIteminfoback(TN_Task, urlitem);
}
- //浠诲姟鍥炴姤 浠诲姟鏉ユ簮 1.閽笣绔嬪簱 2.鑳剁墖搴� 3.棰勫搴�5.mes涓嬪彂
- if (TN_Task.Z_TYPE == 5)
- {
- //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);
- }
- else
- {
- //绔嬪簱涓巜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("鐢垫"))
- {
- if (TN_Task.S_TYPE == "鐢垫1")
- {
- 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
- {
-
- 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
- {
- 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;
- }
- }
}
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)
@@ -210,6 +209,8 @@
{
LogHelper.Info($"瀹夊叏璇锋眰锛氭湭鎵惧埌鍥炴姤鍦板潃锛岃妫�煡閰嶇疆鏂囦欢==>{JsonConvert.SerializeObject(Settings.tableUrls)}");
}
+
+
}
}
}
@@ -237,7 +238,7 @@
{
var AreaCodes = AreasByGroup.Select(a => a.S_CODE).ToList();
LogHelper.Info($"浠诲姟{mst.S_CODE},鏍规嵁缁堢偣鍖哄煙鑾峰彇搴撳尯缂栫爜锛歿JsonConvert.SerializeObject(AreaCodes)}");
- var updateMst = db.Queryable<WCSTask>().Where(a => AreaCodes.Contains(a.S_END_AREA.Trim()) && a.S_B_STATE == "绛夊緟鎺ㄩ�").OrderBy(a=>a.T_CREATE).First();
+ var updateMst = db.Queryable<WCSTask>().Where(a => AreaCodes.Contains(a.S_END_AREA.Trim()) && a.S_B_STATE == "绛夊緟鎺ㄩ�").OrderBy(a => a.T_CREATE).First();
updateMst.S_B_STATE = "绛夊緟";
db.Updateable(updateMst).UpdateColumns(it => new { it.S_B_STATE }).ExecuteCommand();
}
--
Gitblit v1.9.1