From 6922ceb192bfcb15f840409bb5f0707d3ee448e9 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 21 六月 2024 18:09:57 +0800
Subject: [PATCH] 菜单权限更新
---
Tiger.Model.Net/Entitys/MES/V_BAS_PROD.cs | 159 +++++++++++++++++++++++++++++++++++++++
Tiger.Model.Net/Tiger.Model.Net.csproj | 1
Tiger.Model.Net/Entitys/SYS/MenuItem.cs | 5 +
Tiger.Business/SYS/Biz.SYS_MENU.cs | 14 +++
Tiger.Model.Net/Entitys/SYS/SYS_MENU.cs | 11 ++
5 files changed, 190 insertions(+), 0 deletions(-)
diff --git a/Tiger.Business/SYS/Biz.SYS_MENU.cs b/Tiger.Business/SYS/Biz.SYS_MENU.cs
index db7a385..6946fa7 100644
--- a/Tiger.Business/SYS/Biz.SYS_MENU.cs
+++ b/Tiger.Business/SYS/Biz.SYS_MENU.cs
@@ -71,6 +71,10 @@
menuItem.meta.icon = item.ICON_URL; // item.ICON_URL;
menuItem.meta.orderNo = item.SEQ_NO;
menuItem.meta.title = item.FUNC_NAME;
+ menuItem.meta.menuId = item.ID;
+ menuItem.meta.menuCode = item.FUNC_CODE;
+ menuItem.btnType = item.BUTTON_TYPE;
+ menuItem.meta.btnType = item.BUTTON_TYPE;
if (!string.IsNullOrEmpty(item.IGNOREKEEPALIVE))
{
menuItem.meta.ignoreKeepAlive = item.IGNOREKEEPALIVE == "0" ? true : false;
@@ -134,6 +138,9 @@
menuItem.meta.icon = item.ICON_URL; // item.ICON_URL;
menuItem.meta.orderNo = item.SEQ_NO;
menuItem.meta.title = item.FUNC_NAME;
+ menuItem.meta.menuId = item.ID;
+ menuItem.meta.menuCode = item.FUNC_CODE;
+ menuItem.meta.btnType = item.BUTTON_TYPE;
if (!string.IsNullOrEmpty(item.IGNOREKEEPALIVE))
{
menuItem.meta.ignoreKeepAlive = item.IGNOREKEEPALIVE == "0" ? true : false;
@@ -158,6 +165,7 @@
menuItem.status = item.IS_USE;
menuItem.icon = menuItem.meta.icon;
menuItem.func_type = item.FUNC_TYPE;
+ menuItem.btnType = item.BUTTON_TYPE;
menuItem.parentMenu = item.PFUNC_CODE;
menuItem.orderNo= item.SEQ_NO;
menuItem.children = new();
@@ -202,6 +210,7 @@
func.ICON_URL = data.icon;
func.SEQ_NO = (int)data.orderNo;
func.FUNC_TYPE = data.func_type;
+ func.BUTTON_TYPE = data.btnType;
func.COMPONENT = string.IsNullOrEmpty(data.component) && data.func_type == "0" ? "LAYOUT" : data.component;
func.IGNOREKEEPALIVE = data.keepalive;
func.SHOW = data.show;
@@ -217,6 +226,7 @@
FUNC_DESC = data.menuName,
FUNC_GROUP = "",
FUNC_TYPE = data.func_type,
+ BUTTON_TYPE = data.btnType,
PFUNC_CODE = data.parentMenu,
FUNC_CLASS = "BS",
PATH = data.path,
@@ -282,6 +292,9 @@
menuItem.meta.icon = item.ICON_URL; //item.ICON_URL;
menuItem.meta.orderNo = item.SEQ_NO;
menuItem.meta.title = item.FUNC_NAME;
+ menuItem.meta.menuId = item.ID;
+ menuItem.meta.menuCode = item.FUNC_CODE;
+ menuItem.meta.btnType = item.BUTTON_TYPE;
if (!string.IsNullOrEmpty(item.IGNOREKEEPALIVE))
{
menuItem.meta.ignoreKeepAlive = item.IGNOREKEEPALIVE == "0" ? true : false;
@@ -305,6 +318,7 @@
menuItem.createTime = item.CREATE_TIME;
menuItem.icon = menuItem.meta.icon;
menuItem.func_type = item.FUNC_TYPE;
+ menuItem.btnType = item.BUTTON_TYPE;
menuItem.parentMenu = item.PFUNC_CODE;
menuItem.orderNo = item.SEQ_NO;
menuItem.status = item.IS_USE;
diff --git a/Tiger.Model.Net/Entitys/MES/V_BAS_PROD.cs b/Tiger.Model.Net/Entitys/MES/V_BAS_PROD.cs
new file mode 100644
index 0000000..9a523f5
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/V_BAS_PROD.cs
@@ -0,0 +1,159 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+using Tiger.Model;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 实体：V_BAS_PROD
+ /// </summary>
+ [Serializable]
+ [SugarTable("V_BAS_PROD")]
+ public class V_BAS_PROD : iViewEntity
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：V_BAS_PROD
+ /// </summary>
+ public V_BAS_PROD() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ ///
+ /// </summary>
+ public string ID { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime CREATE_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ ///
+ /// </summary>
+ public string CREATE_USER { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime UPDATE_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ ///
+ /// </summary>
+ public string UPDATE_USER { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public bool GHOST_ROW { get; set; } = false;
+ /// <summary>
+ ///
+ /// </summary>
+ public string AUTH_ORG { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string AUTH_PROD { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string AUTH_WH { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string ITEM_NAME { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string ITEM_DESC { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string ITEM_TYPE { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string ITEM_VER { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string SPEC { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string SPEC_WH { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string COLOR { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string UNIT { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string IS_PROD { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string IS_ACTIVE { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string CTRL_MODE { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime RELEASE_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime EFFECTIVE_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ ///
+ /// </summary>
+ public decimal VALIDITY_DAYS { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public int DLVY_TYPE { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string ENABLE_FIFO { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string REMARK { get; set; }
+ #endregion
+
+ #region 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+ #endregion
+
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/SYS/MenuItem.cs b/Tiger.Model.Net/Entitys/SYS/MenuItem.cs
index b29dc33..0bce9b8 100644
--- a/Tiger.Model.Net/Entitys/SYS/MenuItem.cs
+++ b/Tiger.Model.Net/Entitys/SYS/MenuItem.cs
@@ -31,6 +31,7 @@
public string redirect { get; set; }
public bool? caseSensitive { get; set; }
public DateTime? createTime { get; set; }
+ public int btnType { get; set; }
}
public class RouteMeta {
@@ -74,6 +75,9 @@
public bool? ignoreRoute { get; set; }
// Hide path for children
public bool? hidePathForChildren { get; set; }
+ public string menuId { get; set; }
+ public string menuCode { get; set; }
+ public int btnType { get; set; }
}
public class SaveMenuParams
@@ -92,5 +96,6 @@
public string show { get; set; }
public string func_type { get; set; }
public string keepalive { get; set; }
+ public int btnType { get; set; }
}
}
diff --git a/Tiger.Model.Net/Entitys/SYS/SYS_MENU.cs b/Tiger.Model.Net/Entitys/SYS/SYS_MENU.cs
index 6ece0bc..d5f6820 100644
--- a/Tiger.Model.Net/Entitys/SYS/SYS_MENU.cs
+++ b/Tiger.Model.Net/Entitys/SYS/SYS_MENU.cs
@@ -98,6 +98,8 @@
///
/// </summary>
public string IGNOREAUTH { get; set; }
+ public int BUTTON_TYPE { get; set; }
+
#endregion
#region 铏氭嫙灞炴��
@@ -135,6 +137,15 @@
Enum1,
}
*/
+ public enum BUTTON_TYPEs
+ {
+ [Description("宸ュ叿鏍忓唴")]
+ ToolBar,
+ [Description("鎿嶄綔")]
+ Action,
+ [Description("琛ㄦ牸鍐�")]
+ Table,
+ }
#endregion
#region 鍏叡鏂规硶
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index e1a443b..bffb64a 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -137,6 +137,7 @@
<Compile Include="Entitys\MES\SMT_PROD_TABLE.cs" />
<Compile Include="Entitys\MES\SMT_SOLDER.cs" />
<Compile Include="Entitys\MES\SMT_SOLDER_HIS.cs" />
+ <Compile Include="Entitys\MES\V_BAS_PROD.cs" />
<Compile Include="Entitys\MES\V_MES_ROUTE_NDS.cs" />
<Compile Include="Entitys\MES\V_MES_ROUTE_NES.cs" />
<Compile Include="Entitys\MES\V_MES_ROUTE_NLV.cs" />
--
Gitblit v1.9.3