Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Serve...

Rodney Chen

2024-06-11 cc703da0e47e4da7daeec445ee13e0e46bce781e

Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024

 Tiger.Api/Language.db

Binary files differ

 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)
                    {

 Tiger.Model.Net/Entitys/MES/MES_POSITION.cs

@@ -10,6 +10,7 @@
    /// 实体：岗位
    /// </summary>
    [Description("Primary:ID")]
    [DisplayName("岗位")]
    [Serializable]
    [SugarTable("MES_POSITION")]
    public class MES_POSITION : DbEntityWithAuth
@@ -25,38 +26,47 @@
        /// <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