From b5625f1b0cbebed336918b5b34e83b2b1da16aeb Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期五, 18 四月 2025 16:41:47 +0800
Subject: [PATCH] 1
---
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 76a2a5c..dc8df68 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -1,6 +1,7 @@
锘縰sing AutoMapper;
using HslCommunication;
using Mapster;
+using Microsoft.AspNetCore.DataProtection.XmlEncryption;
using Newtonsoft.Json;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
@@ -144,11 +145,26 @@
// 鍒ゆ柇浠诲姟绫诲瀷鏄惁涓哄叆搴撲换鍔�
else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
{
+
var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
var valueList = value.Split(',').ToList();
// 鍒ゆ柇婧愬湴鍧�鏄惁涓嶇瓑浜�"1359-4"
//if (task.SourceAddress != "1359-4" && task.SourceAddress != "1357-4")
- if (!valueList.Contains(task.SourceAddress))
+ if (task.SourceAddress == "1435" && task.TaskType == (int)TaskInboundTypeEnum.InNG)
+ {
+ List<Dt_Router> routers = _routerService.QueryNextRoutes(item.SourceAddress, item.TargetAddress);
+ if (routers.Count > 0)
+ {
+ // 璁剧疆浠诲姟鐘舵�佷负鍏ュ簱鏂板缓
+ task.TaskState = (int)TaskInStatusEnum.InNew;
+ // 璁剧疆褰撳墠鍦板潃涓烘簮鍦板潃
+ task.CurrentAddress = item.SourceAddress;
+ // 璁剧疆涓嬩竴涓湴鍧�涓虹涓�涓瓙浣嶇疆
+ task.NextAddress = routers.FirstOrDefault().ChildPosi;
+ }
+ task.Remark = "NG";
+ }
+ else if (!valueList.Contains(task.SourceAddress))
{
// 鏌ヨ浠庢簮鍦板潃鍒扮洰鏍囧湴鍧�鐨勮矾鐢�
List<Dt_Router> routers = _routerService.QueryNextRoutes(item.SourceAddress, item.TargetAddress);
--
Gitblit v1.9.3