From 553f7744bedee0685635ed070a4a0e18b796238f Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期四, 24 七月 2025 17:30:36 +0800
Subject: [PATCH] 1111
---
HH.WCS.Mobox3 - 大车间/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 10 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 863c0db..38e0aff 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"
@@ -1,7 +1,7 @@
-锘縰sing HH.WCS.JiaTong.dispatch;
-using HH.WCS.JiaTong.process;
-using HH.WCS.JiaTong.util;
-using HH.WCS.JiaTong.wms;
+锘縰sing HH.WCS.JiaTong_DCJ.dispatch;
+using HH.WCS.JiaTong_DCJ.process;
+using HH.WCS.JiaTong_DCJ.util;
+using HH.WCS.JiaTong_DCJ.wms;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -10,10 +10,10 @@
using System.Net.NetworkInformation;
using System.Security.Policy;
using System.Threading.Tasks;
-using static HH.WCS.JiaTong.api.ApiModel;
-using static HH.WCS.JiaTong.util.Settings;
+using static HH.WCS.JiaTong_DCJ.api.ApiModel;
+using static HH.WCS.JiaTong_DCJ.util.Settings;
-namespace HH.WCS.JiaTong.core
+namespace HH.WCS.JiaTong_DCJ.core
{
internal class WCSCore
{
@@ -81,6 +81,38 @@
string urlstate = Settings.tableUrls.Find(a => a.id == 1).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 == 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
{
@@ -90,10 +122,29 @@
{
WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
}
-
//瀹夊叏璇锋眰绛�- string url = Settings.tableUrls.Find(a => a.id == 2).url;
- string name = "Mes";
+ string url = "";
+ string name = "";
+ if (TN_Task.Z_TYPE == 1)
+ {
+ url = Settings.tableUrls.Find(a => a.id == 6).url;
+ name = "ML";
+ }
+ else if (TN_Task.Z_TYPE == 2)
+ {
+ url = Settings.tableUrls.Find(a => a.id == 7).url;
+ name = "YBK";
+ }
+ else if (TN_Task.Z_TYPE == 5)
+ {
+ url = Settings.tableUrls.Find(a => a.id == 2).url;
+ name = "Mes";
+ }
+ else
+ {
+ LogHelper.Info($"瀹夊叏璇锋眰锛氫换鍔＄被鍨嬮敊璇�褰撳墠浠诲姟绫诲瀷{TN_Task.Z_TYPE}");
+ }
+
if (!string.IsNullOrEmpty(url))
{
TaskProcess.OperateReq(model, url, TN_Task, name);
--
Gitblit v1.9.1