From 3865194441f1e1da34c0be9034d86c8d0d68706c Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期五, 04 七月 2025 17:26:23 +0800
Subject: [PATCH] 接口调用中间表开发
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs | 146 ++++++++++++++++++++++++++----------------------
1 files changed, 78 insertions(+), 68 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 0c2de55..4e05af9 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
@@ -6,7 +6,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Security.Policy;
using static HH.WCS.JiaTong.api.ApiModel;
+using static HH.WCS.JiaTong.util.Settings;
namespace HH.WCS.JiaTong.core
{
@@ -35,6 +37,7 @@
break;
#region MyRegion
case 3:
+ WCSHelper.UpdateAgvNo(TN_Task, model.forklift_no);
WCSHelper.UpdateStatus(TN_Task, "寮�鍙栬揣");
break;
case 4:
@@ -66,7 +69,7 @@
break;
}
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)
{
@@ -81,107 +84,114 @@
//浠诲姟鍥炴姤 浠诲姟鏉ユ簮 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
{
- string url = "";
- if (TN_Task.Z_TYPE == 1)
+ //绔嬪簱涓巜ms浠诲姟鍥炴姤
+ TableUrl url = null;
+ switch (TN_Task.Z_TYPE)
{
- url = Settings.tableUrls.Find(a => a.id == 1).url;
- }
- else if (TN_Task.Z_TYPE == 3)
- {
- url = Settings.tableUrls.Find(a => a.id == 9).url;
- }
- else if (TN_Task.Z_TYPE == 4)
- {
- url = Settings.tableUrls.Find(a => a.id == 11).url;
- }
- else if (TN_Task.Z_TYPE == 6)//wms瀹ゅ唴鍒拌揣鍥炴姤
- {
- url = Settings.tableUrls.Find(a => a.id == 14).url;
- }
- else
- {
- LogHelper.Info($"浠诲姟鍥炴姤锛氫换鍔＄被鍨嬮敊璇�);
- }
- 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")
+
+ case 1:
+ url = Settings.tableUrls.Find(a => a.id == 1);
+ if (url != null)
{
- TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, 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);
- }
- }
- }
- //鍘熸潗鏂欐帴鍙ｉ渶瑕佸姞涓妕oken
- else if (TN_Task.Z_TYPE == 4)
- {
- Console.WriteLine($"鍘熸潗鏂欎换鍔″洖鎶TN_Task.S_EQ_NO}");
- var db = new SqlHelper<object>().GetInstance();
-
- var mstbyEqno = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO.Trim() == TN_Task.S_EQ_NO).ToList();
- //鍒嗘。浠诲姟鍥炴姤,浠诲姟1鍙洖鎶� 3 4 浠诲姟2鍙洖鎶�5 6 2
-
- TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
- }
- else
- {
- if (!string.IsNullOrEmpty(url))
- {
- if (TN_Task.S_TYPE == "鐢垫2" && TN_Task.S_CODE == "2")
- {
-
- TaskProcess.WmsReportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
-
+ TaskProcess.Reportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url.url,"ML");
}
else
{
- TaskProcess.Reportback(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
+ 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
+ {
- }
- else
- {
- LogHelper.Info($"浠诲姟鍥炴姤锛氭湭鎵惧埌鍥炴姤鍦板潃锛岃妫�煡閰嶇疆鏂囦欢==>{JsonConvert.SerializeObject(Settings.tableUrls)}");
- }
+ 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)
+ 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
{
@@ -189,7 +199,7 @@
}
if (!string.IsNullOrEmpty(url))
{
- TaskProcess.OperateReq(model, url, TN_Task);
+ TaskProcess.OperateReq(model, url, TN_Task,name);
}
else
{
@@ -207,7 +217,7 @@
{
//鏌ヨ浠诲姟
//鑾峰彇鎵�湁绛夊緟鐨勪换鍔�-
+ Console.WriteLine("寮�浠诲姟鎺ㄩ�");
var list = WCSHelper.GetTaskListByState("绛夊緟");
if (list.Count > 0)
--
Gitblit v1.9.1