From cc703da0e47e4da7daeec445ee13e0e46bce781e Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 11 六月 2024 18:56:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business/MES/Biz.Route.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business/MES/Biz.Route.cs b/Tiger.Business/MES/Biz.Route.cs
index 5af0a87..3cf9ded 100644
--- a/Tiger.Business/MES/Biz.Route.cs
+++ b/Tiger.Business/MES/Biz.Route.cs
@@ -63,12 +63,18 @@
}
//宸ヨ壓璺嚎
var route = await Db.Queryable<MES_ROUTE>()
- .WhereIF(!string.IsNullOrEmpty(routerId), x => x.ID.Equals(routerId))
+ .WhereIF(!string.IsNullOrEmpty(routerId), x => x.ID.Equals(routerId) || x.ROT_CODE == routerId)
.OrderBy(x => x.CREATE_TIME).FirstAsync();
rotData.route = route;
+ if (route == null)
+ {
+ res.IsSuccessed = false;
+ res.LocaleMsg = new($"涓嶈兘鏌ユ壘鍒板伐鑹鸿矾绾匡紒");
+ return res;
+ }
//鑺傜偣
var nodes = await Db.Queryable<MES_ROUTE_NODE>()
- .WhereIF(!string.IsNullOrEmpty(routerId), x => x.ROT_ID.Equals(routerId))
+ .WhereIF(!string.IsNullOrEmpty(route.ID), x => x.ROT_ID.Equals(route.ID))
.ToListAsync();
foreach (var node in nodes)
{
@@ -90,7 +96,7 @@
rotData.nodes = nodes;
var acts = await Db.Queryable<MES_ROUTE_NODE_ACT>()
- .WhereIF(!string.IsNullOrEmpty(routerId), x => x.ROT_ID.Equals(routerId))
+ .WhereIF(!string.IsNullOrEmpty(route.ID), x => x.ROT_ID.Equals(route.ID))
.ToListAsync();
foreach (var act in acts)
{
@@ -113,7 +119,7 @@
//杈�
var edges = await Db.Queryable<MES_ROUTE_EDGE>()
- .WhereIF(!string.IsNullOrEmpty(routerId), x => x.ROT_ID.Equals(routerId))
+ .WhereIF(!string.IsNullOrEmpty(route.ID), x => x.ROT_ID.Equals(route.ID))
.ToListAsync();
foreach (var edge in edges)
{
--
Gitblit v1.9.3