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 +++-
Tiger.Api/Language.db | 0
Tiger.Model.Net/Entitys/MES/MES_POSITION.cs | 138 ++++++++++++++++++++++++---------------------
3 files changed, 84 insertions(+), 68 deletions(-)
diff --git a/Tiger.Api/Language.db b/Tiger.Api/Language.db
index dcb1c4b..b1fbb6e 100644
--- a/Tiger.Api/Language.db
+++ b/Tiger.Api/Language.db
Binary files differ
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)
{
diff --git a/Tiger.Model.Net/Entitys/MES/MES_POSITION.cs b/Tiger.Model.Net/Entitys/MES/MES_POSITION.cs
index 6f54e89..ca59ccc 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_POSITION.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_POSITION.cs
@@ -6,69 +6,79 @@
namespace Tiger.Model
{
- /// <summary>
- /// 实体：岗位
- /// </summary>
- [Description("Primary:ID")]
- [Serializable]
- [SugarTable("MES_POSITION")]
- public class MES_POSITION : DbEntityWithAuth
- {
- #region 构造函数
- /// <summary>
- /// 实体：岗位
- /// </summary>
- public MES_POSITION() {}
- #endregion
+ /// <summary>
+ /// 实体：岗位
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("岗位")]
+ [Serializable]
+ [SugarTable("MES_POSITION")]
+ public class MES_POSITION : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：岗位
+ /// </summary>
+ public MES_POSITION() { }
+ #endregion
- #region 公共属性
- /// <summary>
- /// 岗位编码
- /// </summary>
- public string POST_CODE { get; set; }
- /// <summary>
- /// 岗位名称
- /// </summary>
- public string POST_NAME { get; set; }
- /// <summary>
- /// 岗位简称
- /// </summary>
- public string SHORT_NAME { get; set; }
- /// <summary>
- /// 岗位类型
- /// </summary>
- public string POST_TYPE { get; set; }
- /// <summary>
- /// 产线编码
- /// </summary>
- public string LINE_CODE { get; set; }
- /// <summary>
- /// 工序编码
- /// </summary>
- public string OPER_CODE { get; set; }
- /// <summary>
- /// 组织编码
- /// </summary>
- public string ORG_CODE { get; set; }
- /// <summary>
- /// 是否启用(Y/N)
- /// </summary>
- public string IS_ACTIVE { get; set; }
- /// <summary>
- /// 备注
- /// </summary>
- public string REMARK { get; set; }
- #endregion
+ #region 公共属性
+ /// <summary>
+ /// 岗位编码
+ /// </summary>
+ [DisplayName("岗位编码")]
+ public string POST_CODE { get; set; }
+ /// <summary>
+ /// 岗位名称
+ /// </summary>
+ [DisplayName("岗位名称")]
+ public string POST_NAME { get; set; }
+ /// <summary>
+ /// 岗位简称
+ /// </summary>
+ [DisplayName("岗位简称")]
+ public string SHORT_NAME { get; set; }
+ /// <summary>
+ /// 岗位类型
+ /// </summary>
+ [DisplayName("岗位类型")]
+ public string POST_TYPE { get; set; }
+ /// <summary>
+ /// 产线编码
+ /// </summary>
+ [DisplayName("产线编码")]
+ public string LINE_CODE { get; set; }
+ /// <summary>
+ /// 工序编码
+ /// </summary>
+ [DisplayName("工序编码")]
+ public string OPER_CODE { get; set; }
+ /// <summary>
+ /// 组织编码
+ /// </summary>
+ [DisplayName("组织编码")]
+ public string ORG_CODE { get; set; }
+ /// <summary>
+ /// 是否启用(Y/N)
+ /// </summary>
+ [DisplayName("是否启用(Y/N)")]
+ public string IS_ACTIVE { get; set; }
+ /// <summary>
+ /// 备注
+ /// </summary>
+ [DisplayName("备注")]
+ public string REMARK { get; set; }
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 虚拟属性
+ /*例子
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 外键属性
- /*例子
+ #region 外键属性
+ /*例子
//一对一外键导航
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_POSITION类里面的外键ID字段
public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
@@ -79,10 +89,10 @@
[Navigate(typeof(MappingClass), nameof(MappingClass.MES_POSITIONId), nameof(MappingClass.ClassAId))]//注意顺序
public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
*/
- #endregion
+ #endregion
- #region 枚举变量
- /*例子
+ #region 枚举变量
+ /*例子
public enum FieldNames
{
[Description("枚举描述0")]
@@ -91,11 +101,11 @@
Enum1,
}
*/
- #endregion
+ #endregion
- #region 公共方法
+ #region 公共方法
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3