lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-08-23 22:11:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

同步openauth.Core：

Browse Source 
采用代码生成器的表结构控制前端显示，删除以前按照dbset获取数据库结构
优化注释
升级EF及所有三方的版本
This commit is contained in:
yubaolee 2021-10-18 00:42:29 +08:00
parent 3a70bf8e43
commit 9fd0405721
60 changed files with 371 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Infrastructure/Cache/EnyimMemcachedContext.cs
View File

@ -27,6 +27,12 @@ namespace Infrastructure.Cache
_memcachedClient = client;
}
/// <summary>
///
/// </summary>
/// <param name="key"></param>
/// <typeparam name="T"></typeparam>
/// <returns></returns>
public override T Get<T>(string key)
{
return _memcachedClient.Get<T>(key);

1
Infrastructure/Cache/RedisCacheContext.cs
View File

@ -14,7 +14,6 @@ namespace Infrastructure.Cache
private ConnectionMultiplexer _conn { get; set; }
private IDatabase iDatabase { get; set; }
private AppSetting _appSettings;
public RedisCacheContext(IOptions<AppSetting> options)
{
_conn = ConnectionMultiplexer.Connect(options.Value.RedisConf);

2
Infrastructure/Extensions/AutofacManager/AutofacContainerModule.cs
View File

@ -4,7 +4,7 @@ namespace Infrastructure.Extensions.AutofacManager
{
/// <summary>
/// 提供全局静态获取服务的能力。
/// <para>例：AutofacContainerModule.GetService<IPathProvider>()</para>
/// <para>例：AutofacContainerModule.GetService&lt;IPathProvider&gt;()</para>
/// </summary>
public class AutofacContainerModule
{

2
Infrastructure/Extensions/ConvertJsonExtension.cs
View File

@ -91,7 +91,7 @@ namespace Infrastructure.Extensions
/// <summary>
/// list转换为json
/// </summary>
/// <typeparam name="T1"></typeparam>
/// <typeparam name="T"></typeparam>
/// <param name="list"></param>
/// <param name="p"></param>
/// <returns></returns>

22
Infrastructure/Extensions/EntityProperties.cs
View File

@ -26,7 +26,7 @@ namespace Infrastructure.Extensions
/// 获取对象里指定成员名称
/// </summary>
/// <typeparam name="TEntity"></typeparam>
/// <param name="properties"> 格式 Expression<Func<entityt, object>> exp = x => new { x.字段1, x.字段2 };或x=>x.Name</param>
/// <param name="properties"> <![CDATA[格式 Expression<Func<entityt, object>> exp = x => new { x.字段1, x.字段2 };或x=>x.Name]]></param>
/// <returns></returns>
public static string[] GetExpressionProperty<TEntity>(this Expression<Func<TEntity, object>> properties)
{
@ -132,7 +132,7 @@ namespace Infrastructure.Extensions
colType += "(" + (asType ? ((DisplayFormatAttribute) objAtrr).DataFormatString : "18,5") + ")";
}
///如果是string,根据 varchar或nvarchar判断最大长度
//如果是string,根据 varchar或nvarchar判断最大长度
if (property.PropertyType.ToString() == "System.String")
{
colType = colType.Split("(")[0];
@ -198,7 +198,6 @@ namespace Infrastructure.Extensions
/// </summary>
/// <param name="array"></param>
/// <param name="fieldType">指定生成的数组值的类型</param>
/// <param name="sql"></param>
/// <returns></returns>
public static string GetArraySql(this object[] array, FieldType fieldType, string sql)
{
@ -220,7 +219,6 @@ namespace Infrastructure.Extensions
/// <summary>
/// 根据实体获取key的类型，用于update或del操作
/// </summary>
/// <typeparam name="T"></typeparam>
/// <returns></returns>
public static FieldType GetFieldType(this Type typeEntity)
{
@ -607,13 +605,9 @@ namespace Infrastructure.Extensions
/// <summary>
/// 判断是否包含某个属性：
/// 如 [Editable(true)]
// public string MO { get; set; }包含Editable
/// 判断是否包含某个属性
/// <para>public string MO {get; set; }包含Editable</para>
/// </summary>
/// <param name="propertyInfo"></param>
/// <param name="type"></param>
/// <returns></returns>
public static bool ContainsCustomAttributes(this PropertyInfo propertyInfo, Type type)
{
propertyInfo.GetTypeCustomAttributes(type, out bool contains);
@ -795,7 +789,7 @@ namespace Infrastructure.Extensions
/// 如果是小数float或Decimal必须对propertyInfo字段加DisplayFormatAttribute属性
/// </param>
/// <param name="value"></param>
/// <returns>IEnumerable<(bool, string, object)> bool成否校验成功,string校验失败信息,object,当前校验的值</returns>
/// <returns>IEnumerable&lt;(bool, string, object)&gt; bool成否校验成功,string校验失败信息,object,当前校验的值</returns>
public static IEnumerable<(bool, string, object)> ValidationValueForDbType(this PropertyInfo propertyInfo,
params object[] values)
{
@ -1036,7 +1030,7 @@ namespace Infrastructure.Extensions
/// </summary>
/// <param name="member">当前类</param>
/// <param name="type">指定的类</param>
/// <param name="expression">指定属性的值 格式 Expression<Func<entityt, object>> exp = x => new { x.字段1, x.字段2 };</param>
/// <param name="expression">指定属性的值 格式 Expression&lt;Func&lt;entityt, object&gt;&gt; exp = x =&gt; new { x.字段1, x.字段2 };</param>
/// <returns>返回的是字段+value</returns>
public static Dictionary<string, string> GetTypeCustomValues<TEntity>(this MemberInfo member,
Expression<Func<TEntity, object>> expression)
@ -1066,7 +1060,7 @@ namespace Infrastructure.Extensions
/// </summary>
/// <param name="member">当前类</param>
/// <param name="type">指定的类</param>
/// <param name="expression">指定属性的值 格式 Expression<Func<entityt, object>> exp = x => new { x.字段1, x.字段2 };</param>
/// <param name="expression">指定属性的值 格式 Expression&lt;Func&lt;entityt, object&gt;&gt; exp = x =&gt; new { x.字段1, x.字段2 };</param>
/// <returns></returns>
public static string GetTypeCustomValue<TEntity>(this MemberInfo member,
Expression<Func<TEntity, object>> expression)
@ -1259,7 +1253,7 @@ namespace Infrastructure.Extensions
}
/// <summary>
/// 将数据源映射到新的数据中,目前只支持List<TSource>映射到List<TResult>或TSource映射到TResult
/// 将数据源映射到新的数据中,目前只支持List&lt;TSource&gt;映射到List&lt;TResult&gt;或TSource映射到TResult
/// 目前只支持Dictionary或实体类型
/// </summary>
/// <typeparam name="TSource"></typeparam>

4
Infrastructure/Helpers/XmlHelper.cs
View File

@ -1,7 +1,5 @@
using System.Xml;
/// 这个是用VS2010写的，如果用VS2005，请去掉System.Linq和System.Xml.Linq的引用
/// 可以将此文件直接编译成dll，今后程序只需要引用该dll后开头添加using XmlLibrary;即可。
namespace Infrastructure.Helpers
{
/// <summary>
@ -371,7 +369,7 @@ namespace Infrastructure.Helpers
else
{
XmlNode xn = GetNode(xns, nodeName);
if (xn != null) return xn; /// V1.0.0.3添加节点判断
if (xn != null) return xn;
}
}
return null;

7
Infrastructure/Infrastructure.csproj
View File

@ -6,15 +6,16 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>bin\Debug\net5.0\Infrastructure.xml</DocumentationFile>
<NoWarn>1701;1702;1591;1573;1572;1570</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="9.0.0" />
<PackageReference Include="EnyimMemcachedCore" Version="2.1.5" />
<PackageReference Include="EnyimMemcachedCore" Version="2.5.3" />
<PackageReference Include="log4net" Version="2.0.12" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />

96
Infrastructure/Snowflake/Core/SnowWorkerM1.cs
View File

@ -126,18 +126,18 @@ namespace Yitter.IdGenerator
{
return;
if (GenAction == null)
{
return;
}
DoGenIdAction(new OverCostActionArg(
WorkerId,
useTimeTick,
1,
_OverCostCountInOneTerm,
_GenCountInOneTerm,
_TermIndex));
// if (GenAction == null)
// {
// return;
// }
//
// DoGenIdAction(new OverCostActionArg(
// WorkerId,
// useTimeTick,
// 1,
// _OverCostCountInOneTerm,
// _GenCountInOneTerm,
// _TermIndex));
}
private void EndOverCostAction(in long useTimeTick)
@ -148,54 +148,54 @@ namespace Yitter.IdGenerator
}
return;
if (GenAction == null)
{
return;
}
DoGenIdAction(new OverCostActionArg(
WorkerId,
useTimeTick,
2,
_OverCostCountInOneTerm,
_GenCountInOneTerm,
_TermIndex));
// if (GenAction == null)
// {
// return;
// }
//
// DoGenIdAction(new OverCostActionArg(
// WorkerId,
// useTimeTick,
// 2,
// _OverCostCountInOneTerm,
// _GenCountInOneTerm,
// _TermIndex));
}
private void BeginTurnBackAction(in long useTimeTick)
{
return;
if (GenAction == null)
{
return;
}
DoGenIdAction(new OverCostActionArg(
WorkerId,
useTimeTick,
8,
0,
0,
_TurnBackIndex));
// if (GenAction == null)
// {
// return;
// }
//
// DoGenIdAction(new OverCostActionArg(
// WorkerId,
// useTimeTick,
// 8,
// 0,
// 0,
// _TurnBackIndex));
}
private void EndTurnBackAction(in long useTimeTick)
{
return;
if (GenAction == null)
{
return;
}
DoGenIdAction(new OverCostActionArg(
WorkerId,
useTimeTick,
9,
0,
0,
_TurnBackIndex));
// if (GenAction == null)
// {
// return;
// }
//
// DoGenIdAction(new OverCostActionArg(
// WorkerId,
// useTimeTick,
// 9,
// 0,
// 0,
// _TurnBackIndex));
}
private long NextOverCostId()

12
Infrastructure/Utilities/UriUtil.cs
View File

@ -58,17 +58,5 @@ namespace Infrastructure.Utilities
String result = url.ToLower().Replace("&" + fragmentToRemove, string.Empty).Replace("?" + fragmentToRemove, string.Empty);
return result;
}
/// <summary>
/// 根据URL的相对地址获取决定路径
/// <para>eg: /Home/About ==>http://192.168.0.1/Home/About</para>
/// </summary>
/// <returns>System.String.</returns>
//public static string GetAbsolutePathForRelativePath(string relativePath)
//{
// HttpRequest Request = HttpContext.Current.Request;
// string returnUrl = string.Format("{0}{1}",Request.Url.AbsoluteUri.Replace(Request.Url.PathAndQuery, string.Empty) , VirtualPathUtility.ToAbsolute(relativePath));
// return returnUrl;
//}
}
}

3
OpenAuth.App/AppManager/AppManager.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.Repository;
@ -39,7 +40,7 @@ namespace OpenAuth.App
{
var applications = UnitWork.Find<Application>(null);
return applications.ToList();
return await applications.ToListAsync();
}

10
OpenAuth.App/AuthStrategies/AuthStrategyContext.cs
View File

@ -63,16 +63,6 @@ namespace OpenAuth.App
{
get { return _strategy.Orgs; }
}
/// <summary>
/// 获取角色可以访问的字段信息,只是单纯的获取数据库
/// </summary>
/// <param name="moduleCode"></param>
/// <returns></returns>
[Obsolete("请使用GetTableColumns代替")]
public List<KeyDescription> GetProperties(string moduleCode)
{
return _strategy.GetProperties(moduleCode);
}
/// <summary>
/// 获取角色可以访问的字段信息

22
OpenAuth.App/AuthStrategies/NormalAuthStrategy.cs
View File

@ -118,28 +118,6 @@ namespace OpenAuth.App
}
}
/// <summary>
/// 获取用户可访问的字段列表
/// </summary>
/// <param name="moduleCode">模块的code</param>
/// <returns></returns>
public List<KeyDescription> GetProperties(string moduleCode)
{
var allprops = _dbExtension.GetProperties(moduleCode);
//如果是系统模块，直接返回所有字段。防止开发者把模块配置成系统模块，还在外层调用loginContext.GetProperties("xxxx");
bool? isSysModule = UnitWork.FirstOrDefault<Module>(u => u.Code == moduleCode)?.IsSys;
if (isSysModule!= null && isSysModule.Value)
{
return allprops;
}
var props =UnitWork.Find<Relevance>(u =>
u.Key == Define.ROLEDATAPROPERTY && _userRoleIds.Contains(u.FirstId) && u.SecondId == moduleCode)
.Select(u => u.ThirdId);
return allprops.Where(u => props.Contains(u.Key)).ToList();
}
public List<BuilderTableColumn> GetTableColumns(string moduleCode)
{

4
OpenAuth.App/AuthStrategies/SystemAuthStrategy.cs
View File

@ -92,10 +92,6 @@ namespace OpenAuth.App
}
}
public List<KeyDescription> GetProperties(string moduleCode)
{
return _dbExtension.GetProperties(moduleCode);
}
public List<BuilderTableColumn> GetTableColumns(string moduleCode)
{

2
OpenAuth.App/Base/BaseApp.cs
View File

@ -34,7 +34,7 @@ namespace OpenAuth.App
/// <summary>
/// 获取当前登录用户的数据访问权限
/// </summary>
/// <param name=""parameterName>linq表达式参数的名称，如u=>u.name中的"u"</param>
/// <param name="parametername">linq表达式参数的名称，如u=>u.name中的"u"</param>
/// <returns></returns>
protected IQueryable<T> GetDataPrivilege(string parametername)
{

1
OpenAuth.App/Base/BaseIntAutoGenApp.cs
View File

@ -15,6 +15,7 @@ namespace OpenAuth.App
/// 业务层基类，UnitWork用于事务操作，Repository用于普通的数据库操作
/// </summary>
/// <typeparam name="T"></typeparam>
/// <typeparam name="TDbContext"></typeparam>
public class BaseIntAutoGenApp<T, TDbContext> :BaseApp<T,TDbContext> where T : IntAutoGenEntity where TDbContext: DbContext
{
public BaseIntAutoGenApp(IUnitWork<TDbContext> unitWork, IRepository<T,TDbContext> repository, IAuth auth) : base(unitWork, repository, auth)

1
OpenAuth.App/Base/BaseLongApp.cs
View File

@ -14,6 +14,7 @@ namespace OpenAuth.App
/// 业务层基类，UnitWork用于事务操作，Repository用于普通的数据库操作
/// </summary>
/// <typeparam name="T"></typeparam>
/// <typeparam name="TDbContext"></typeparam>
public class BaseLongApp<T, TDbContext> :BaseApp<T,TDbContext> where T : LongEntity where TDbContext: DbContext
{

3
OpenAuth.App/Base/BaseStringApp.cs
View File

@ -11,9 +11,10 @@ namespace OpenAuth.App
{
/// <summary>
/// 业务层基类，UnitWork用于事务操作，Repository用于普通的数据库操作
/// <para>如用户管理：Class UserManagerApp:BaseApp<User></para>
/// <para>如用户管理：Class UserManagerApp:BaseApp&lt;User&gt;</para>
/// </summary>
/// <typeparam name="T"></typeparam>
/// <typeparam name="TDbContext"></typeparam>
public class BaseStringApp<T, TDbContext> :BaseApp<T,TDbContext> where T : StringEntity where TDbContext: DbContext
{

1
OpenAuth.App/Base/BaseTreeApp.cs
View File

@ -10,6 +10,7 @@ namespace OpenAuth.App
/// 树状结构处理
/// </summary>
/// <typeparam name="T"></typeparam>
/// /// <typeparam name="TDbContext"></typeparam>
public class BaseTreeApp<T,TDbContext> :BaseStringApp<T,TDbContext> where T : TreeEntity where TDbContext :DbContext
{

18
OpenAuth.App/BuilderTable/BuilderTableApp.cs
View File

@ -11,6 +11,7 @@ using Infrastructure;
using Infrastructure.Extensions;
using Infrastructure.Helpers;
using Infrastructure.Utilities;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyModel;
using Microsoft.Extensions.Options;
using OpenAuth.App.Interface;
@ -29,8 +30,7 @@ namespace OpenAuth.App
private BuilderTableColumnApp _builderTableColumnApp;
private CategoryApp _categoryApp;
private DbExtension _dbExtension;
private string _webProject = null;
private string _apiNameSpace = null;
private string _webProject = string.Empty;
private string _startName = "";
private IOptions<AppSetting> _appConfiguration;
@ -61,12 +61,12 @@ namespace OpenAuth.App
{
get
{
if (_webProject != null)
if (string.IsNullOrEmpty(_webProject))
return _webProject;
_webProject = ProjectPath.GetLastIndexOfDirectoryName(".WebApi") ??
ProjectPath.GetLastIndexOfDirectoryName("Api") ??
ProjectPath.GetLastIndexOfDirectoryName(".Mvc");
if (_webProject == null)
if (string.IsNullOrEmpty(_webProject))
{
throw new Exception("未获取到以.WebApi结尾的项目名称,无法创建页面");
}
@ -93,10 +93,10 @@ namespace OpenAuth.App
objs = objs.Where(u => u.Id.Contains(request.key));
}
result.data = objs.OrderBy(u => u.Id)
result.data =await objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToList();
result.count = objs.Count();
.Take(request.limit).ToListAsync();
result.count =await objs.CountAsync();
return result;
}
@ -764,8 +764,8 @@ namespace OpenAuth.App
Name = u.TableName
});
result.data = objs.OrderBy(u => u.Id).ToList();
result.count = objs.Count();
result.data =await objs.OrderBy(u => u.Id).ToListAsync();
result.count =await objs.CountAsync();
return result;
}
}

7
OpenAuth.App/BuilderTable/BuilderTableColumnApp.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
@ -36,10 +37,10 @@ namespace OpenAuth.App
objs = objs.Where(u => u.ColumnName.Contains(request.key));
}
result.data = objs.OrderBy(u => u.ColumnName)
result.data =await objs.OrderBy(u => u.ColumnName)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToList();
result.count = objs.Count();
.Take(request.limit).ToListAsync();
result.count =await objs.CountAsync();
return result;
}

14
OpenAuth.App/Category/CategoryApp.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
@ -26,11 +27,10 @@ namespace OpenAuth.App
throw new CommonException("登录已过期", Define.INVALID_TOKEN);
}
var properties = loginContext.GetProperties("Category");
if (properties == null || properties.Count == 0)
var columnFields = loginContext.GetTableColumns("Category");
if (columnFields == null || columnFields.Count == 0)
{
throw new Exception("当前登录用户没有访问该模块字段的权限，请联系管理员配置");
throw new Exception("请在代码生成界面配置Category表的字段属性");
}
var result = new TableData();
@ -45,12 +45,12 @@ namespace OpenAuth.App
objs = objs.Where(u => u.Id.Contains(request.key) || u.Name.Contains(request.key));
}
var propertyStr = string.Join(',', properties.Select(u =>u.Key));
result.columnHeaders = properties;
var propertyStr = string.Join(',', columnFields.Select(u =>u.ColumnName));
result.columnFields = columnFields;
result.data = objs.OrderBy(u => u.DtCode)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"new ({propertyStr})");
result.count = objs.Count();
result.count = await objs.CountAsync();
return result;
}

7
OpenAuth.App/Category/CategoryTypeApp.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
@ -29,10 +30,10 @@ namespace OpenAuth.App
objs = objs.Where(u => u.Id.Contains(request.key) || u.Name.Contains(request.key));
}
result.data = objs.OrderBy(u => u.Name)
result.data =await objs.OrderBy(u => u.Name)
.Skip((request.page - 1) * request.limit)
.Take(request.limit);
result.count = objs.Count();
.Take(request.limit).ToListAsync();
result.count =await objs.CountAsync();
return result;
}

16
OpenAuth.App/DataPrivilege/DataPrivilegeRuleApp.cs
View File

@ -2,6 +2,7 @@ using System;
using System.Linq;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
@ -26,14 +27,12 @@ namespace OpenAuth.App
throw new CommonException("登录已过期", Define.INVALID_TOKEN);
}
var properties = loginContext.GetProperties("DataPrivilegeRule");
if (properties == null || properties.Count == 0)
var columnFields = loginContext.GetTableColumns("DataPrivilegeRule");
if (columnFields == null || columnFields.Count == 0)
{
throw new Exception("当前登录用户没有访问该模块字段的权限，请联系管理员配置");
throw new Exception("请在代码生成界面配置DataPrivilegeRule表的字段属性");
}
var result = new TableData();
var objs = UnitWork.Find<DataPrivilegeRule>(null);
if (!string.IsNullOrEmpty(request.key))
@ -41,13 +40,12 @@ namespace OpenAuth.App
objs = objs.Where(u => u.Id.Contains(request.key) || u.SourceCode.Contains(request.key) || u.Description.Contains(request.key));
}
var propertyStr = string.Join(',', properties.Select(u => u.Key));
result.columnHeaders = properties;
var propertyStr = string.Join(',', columnFields.Select(u => u.ColumnName));
result.columnFields = columnFields;
result.data = objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"new ({propertyStr})");
result.count = objs.Count();
result.count = await objs.CountAsync();
return result;
}

6
OpenAuth.App/DbExtension.cs
View File

@ -173,7 +173,7 @@ select utc.column_name as COLUMNNAME,
foreach (var context in _contexts)
{
var columns = context.Query<SysTableColumn>().FromSqlRaw(sql);
var columns = context.Set<SysTableColumn>().FromSqlRaw(sql);
var columnList = columns?.ToList();
if (columnList != null && columnList.Any())
{
@ -238,7 +238,7 @@ select utc.column_name as COLUMNNAME,
foreach (var context in _contexts)
{
var columns = context.Query<SysTableColumn>().FromSqlRaw(sql);
var columns = context.Set<SysTableColumn>().FromSqlRaw(sql);
var columnList = columns?.ToList();
if (columnList != null && columnList.Any())
{
@ -344,7 +344,7 @@ select utc.column_name as COLUMNNAME,
foreach (var context in _contexts)
{
var columns = context.Query<SysTableColumn>().FromSqlRaw(sql);
var columns = context.Set<SysTableColumn>().FromSqlRaw(sql);
var columnList = columns?.ToList();
if (columnList != null && columnList.Any())
{

7
OpenAuth.App/Files/FileApp.cs
View File

@ -7,6 +7,7 @@ using Infrastructure;
using Infrastructure.Extensions;
using Infrastructure.Helpers;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using OpenAuth.App.Interface;
@ -52,10 +53,10 @@ namespace OpenAuth.App
objs = objs.Where(u => u.FileName.Contains(request.key) || u.FilePath.Contains(request.key));
}
result.data = objs.OrderByDescending(u => u.CreateTime)
result.data =await objs.OrderByDescending(u => u.CreateTime)
.Skip((request.page - 1) * request.limit)
.Take(request.limit);
result.count = objs.Count();
.Take(request.limit).ToListAsync();
result.count =await objs.CountAsync();
return result;
}

17
OpenAuth.App/FlowInstance/FlowInstanceApp.cs
View File

@ -27,6 +27,7 @@ using System.Net.Http;
using System.Threading.Tasks;
using Infrastructure.Const;
using Infrastructure.Helpers;
using Microsoft.EntityFrameworkCore;
using OpenAuth.Repository;
namespace OpenAuth.App
@ -632,9 +633,9 @@ namespace OpenAuth.App
waitExp = waitExp.And(t => t.CustomName.Contains(request.key));
}
result.count = UnitWork.Find(waitExp).Count();
result.count = await UnitWork.Find(waitExp).CountAsync();
result.data = UnitWork.Find(request.page, request.limit, "CreateDate descending", waitExp).ToList();
result.data =await UnitWork.Find(request.page, request.limit, "CreateDate descending", waitExp).ToListAsync();
}
else if (request.type == "disposed") //已办事项（即我参与过的流程）
{
@ -650,10 +651,10 @@ namespace OpenAuth.App
query = query.Where(t => t.CustomName.Contains(request.key));
}
result.data = query.OrderByDescending(u => u.CreateDate)
result.data = await query.OrderByDescending(u => u.CreateDate)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToList();
result.count = instances.Count();
.Take(request.limit).ToListAsync();
result.count =await instances.CountAsync();
}
else //我的流程
{
@ -665,9 +666,9 @@ namespace OpenAuth.App
myFlowExp = myFlowExp.And(t => t.CustomName.Contains(request.key));
}
result.count = UnitWork.Find(myFlowExp).Count();
result.data = UnitWork.Find(request.page, request.limit,
"CreateDate descending", myFlowExp).ToList();
result.count =await UnitWork.Find(myFlowExp).CountAsync();
result.data = await UnitWork.Find(request.page, request.limit,
"CreateDate descending", myFlowExp).ToListAsync();
}
return result;

7
OpenAuth.App/FlowScheme/FlowSchemeApp.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
@ -59,10 +60,10 @@ namespace OpenAuth.App
objs = objs.Where(u => u.SchemeName.Contains(request.key) || u.Id.Contains(request.key));
}
result.data = objs.OrderByDescending(u => u.CreateDate)
result.data = await objs.OrderByDescending(u => u.CreateDate)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToList();
result.count = objs.Count();
.Take(request.limit).ToListAsync();
result.count = await objs.CountAsync();
return result;
}

4
OpenAuth.App/Form/FormApp.cs
View File

@ -4,6 +4,7 @@ using System.Threading.Tasks;
using Infrastructure;
using Infrastructure.Utilities;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
@ -17,7 +18,6 @@ namespace OpenAuth.App
{
public class FormApp : BaseStringApp<Form,OpenAuthDBContext>
{
private IAuth _auth;
private IOptions<AppSetting> _appConfiguration;
private IHttpContextAccessor _httpContextAccessor;
/// <summary>
@ -35,7 +35,7 @@ namespace OpenAuth.App
result.data = forms.OrderByDescending(u => u.CreateDate)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToList();
result.count = forms.Count();
result.count = await forms.CountAsync();
return result;
}

5
OpenAuth.App/FrmLeave/FrmLeaveReqApp.cs
View File

@ -1,5 +1,6 @@
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
@ -21,8 +22,8 @@ namespace OpenAuth.App
{
return new TableData
{
count = Repository.Count(null),
data = Repository.Find(request.page, request.limit, "Id desc")
count = await Repository.CountAsync(null),
data = await Repository.Find(request.page, request.limit, "Id desc").ToListAsync()
};
}

8
OpenAuth.App/Interface/IAuthStrategy.cs
View File

@ -40,14 +40,6 @@ namespace OpenAuth.App
get;set;
}
/// <summary>
/// 根据模块id获取可访问的模块字段
/// </summary>
/// <param name="moduleCode"></param>
/// <returns></returns>
[Obsolete("请使用GetTableColumns代替")]
List<KeyDescription> GetProperties(string moduleCode);
/// <summary>
/// 获取角色可以访问的字段信息
/// </summary>

10
OpenAuth.App/Jobs/OpenJobApp.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using Infrastructure;
using Infrastructure.Const;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using OpenAuth.App.Extensions;
using OpenAuth.App.Interface;
@ -39,10 +40,10 @@ namespace OpenAuth.App
objs = objs.Where(u => u.Id.Contains(request.key));
}
result.data = objs.OrderBy(u => u.Id)
result.data =await objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit);
result.count = objs.Count();
.Take(request.limit).ToListAsync();
result.count =await objs.CountAsync();
return result;
}
@ -53,13 +54,12 @@ namespace OpenAuth.App
/// <returns></returns>
public async Task StartAll()
{
var jobs = Repository.Find(u => u.Status == (int) JobStatus.Running);
var jobs = await Repository.Find(u => u.Status == (int) JobStatus.Running).ToListAsync();
foreach (var job in jobs)
{
job.Start(_scheduler);
}
_logger.LogInformation("所有状态为正在运行的任务已启动");
}
public void Add(AddOrUpdateOpenJobReq req)

9
OpenAuth.App/OpenAuth.App.csproj
View File

@ -6,6 +6,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>bin\Debug\net5.0\OpenAuth.App.xml</DocumentationFile>
<NoWarn>1701;1702;1591;1573;1572;1570</NoWarn>
</PropertyGroup>
<ItemGroup>
@ -15,15 +16,15 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="5.1.2" />
<PackageReference Include="Autofac" Version="5.2.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Autofac.Extras.Quartz" Version="5.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.4" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="NUnit" Version="3.13.1" />

3
OpenAuth.App/Resources/ResourceApp.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
@ -90,7 +91,7 @@ namespace OpenAuth.App
result.data = resources.OrderBy(u => u.TypeId)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"new ({propertyStr})");
result.count = resources.Count();
result.count = await resources.CountAsync();
return result;
}

22
OpenAuth.App/RoleManager/RoleApp.cs
View File

@ -7,6 +7,7 @@ using OpenAuth.Repository.Interface;
using System.Linq;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Request;
using OpenAuth.Repository;
@ -44,10 +45,10 @@ namespace OpenAuth.App
objs = objs.Where(u => u.Name.Contains(request.key));
}
result.data = objs.OrderBy(u => u.Name)
result.data = await objs.OrderBy(u => u.Name)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToList();
result.count = objs.Count();
.Take(request.limit).ToListAsync();
result.count = await objs.CountAsync();
return result;
}
@ -79,6 +80,21 @@ namespace OpenAuth.App
});
}
/// <summary>
/// 删除角色时，需要删除角色对应的权限
/// </summary>
/// <param name="ids"></param>
public override void Delete(string[] ids)
{
UnitWork.ExecuteWithTransaction(() =>
{
UnitWork.Delete<Relevance>(u=>(u.Key == Define.ROLEMODULE || u.Key == Define.ROLEELEMENT) && ids.Contains(u.FirstId));
UnitWork.Delete<Relevance>(u=>u.Key == Define.USERROLE && ids.Contains(u.SecondId));
UnitWork.Delete<Role>(u =>ids.Contains(u.Id));
UnitWork.Save();
});
}
/// <summary>
/// 更新角色属性
/// </summary>

7
OpenAuth.App/SysLogs/SysLogApp.cs
View File

@ -1,6 +1,7 @@
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
using OpenAuth.Repository;
@ -25,10 +26,10 @@ namespace OpenAuth.App
objs = objs.Where(u => u.Content.Contains(request.key) || u.Id.Contains(request.key));
}
result.data = objs.OrderByDescending(u => u.CreateTime)
result.data = await objs.OrderByDescending(u => u.CreateTime)
.Skip((request.page - 1) * request.limit)
.Take(request.limit);
result.count = objs.Count();
.Take(request.limit).ToListAsync();
result.count = await objs.CountAsync();
return result;
}

7
OpenAuth.App/SysMessage/SysMessageApp.cs
View File

@ -2,6 +2,7 @@
using System.Linq;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
@ -43,10 +44,10 @@ namespace OpenAuth.App
objs = objs.Where(u => u.ToStatus == request.Status);
}
result.data = objs.OrderByDescending(u => u.CreateTime)
result.data =await objs.OrderByDescending(u => u.CreateTime)
.Skip((request.page - 1) * request.limit)
.Take(request.limit);
result.count = objs.Count();
.Take(request.limit).ToListAsync();
result.count = await objs.CountAsync();
return result;
}

13
OpenAuth.App/UserManager/UserManagerApp.cs
View File

@ -5,6 +5,7 @@ using System.Threading.Tasks;
using Castle.Core.Internal;
using Infrastructure;
using Infrastructure.Extensions;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
@ -108,8 +109,8 @@ namespace OpenAuth.App
return new TableData
{
count = userViews.Count(),
data = userViews.OrderBy(u => u.Name)
count =userViews.Count(),
data =userViews.OrderBy(u => u.Name)
.Skip((request.page - 1) * request.limit)
.Take(request.limit),
};
@ -282,8 +283,8 @@ namespace OpenAuth.App
return new TableData
{
count = users.Count(),
data = users.Skip((request.page - 1) * request.limit).Take(request.limit)
count =await users.CountAsync(),
data =await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
};
}
@ -302,8 +303,8 @@ namespace OpenAuth.App
return new TableData
{
count = users.Count(),
data = users.Skip((request.page - 1) * request.limit).Take(request.limit)
count =await users.CountAsync(),
data =await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
};
}

3
OpenAuth.App/WmsInbound/WmsInboundOrderDtblApp.cs
View File

@ -2,6 +2,7 @@
using System.Linq;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
@ -51,7 +52,7 @@ namespace OpenAuth.App
result.data = objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"new ({propertyStr})");
result.count = objs.Count();
result.count = await objs.CountAsync();
return result;
}

3
OpenAuth.App/WmsInbound/WmsInboundOrderTblApp.cs
View File

@ -2,6 +2,7 @@
using System.Linq;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
@ -48,7 +49,7 @@ namespace OpenAuth.App
result.data = objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"new ({propertyStr})");
result.count = objs.Count();
result.count = await objs.CountAsync();
return result;
}

4
OpenAuth.Identity/OpenAuth.IdentityServer.csproj
View File

@ -4,6 +4,10 @@
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;1591;1573;1572;1570</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="IdentityServer4" Version="3.0.1" />
<PackageReference Include="Serilog.AspNetCore" Version="3.1.0" />

4
OpenAuth.Identity/Quickstart/SecurityHeadersAttribute.cs
View File

@ -27,7 +27,7 @@ namespace OpenAuth.IdentityServer.Quickstart
// }
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
var csp = "default-src 'self'; object-src 'none'; frame-ancestors 'none'; sandbox allow-forms allow-same-origin allow-scripts; base-uri 'self';";
// var csp = "default-src 'self'; object-src 'none'; frame-ancestors 'none'; sandbox allow-forms allow-same-origin allow-scripts; base-uri 'self';";
// also consider adding upgrade-insecure-requests once you have HTTPS in place for production
//csp += "upgrade-insecure-requests;";
// also an example if you need client images to be displayed from twitter
@ -45,7 +45,7 @@ namespace OpenAuth.IdentityServer.Quickstart
// }
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy
var referrer_policy = "no-referrer";
// var referrer_policy = "no-referrer";
// if (!context.HttpContext.Response.Headers.ContainsKey("Referrer-Policy"))
// {
// context.HttpContext.Response.Headers.Add("Referrer-Policy", referrer_policy);

3
OpenAuth.Identity/Startup.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
using System;
using System.Linq;
using Autofac;
using Infrastructure;
@ -83,7 +84,7 @@ namespace OpenAuth.IdentityServer
else if(dbType == Define.DBTYPE_MYSQL) //mysql
{
services.AddDbContext<OpenAuthDBContext>(options =>
options.UseMySql(Configuration.GetConnectionString("OpenAuthDBContext")));
options.UseMySql(Configuration.GetConnectionString("OpenAuthDBContext"),new MySqlServerVersion(new Version(8, 0, 11))));
}
else //oracle
{

3
OpenAuth.Mvc/Controllers/UserSessionController.cs
View File

@ -20,6 +20,7 @@ using System.Collections.Generic;
using System.Linq;
using Infrastructure;
using Infrastructure.Helpers;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using OpenAuth.App;
using OpenAuth.App.Interface;
using OpenAuth.App.Response;
@ -139,7 +140,7 @@ namespace OpenAuth.Mvc.Controllers
{
try
{
var list = _authStrategyContext.GetProperties(moduleCode);
var list = _authStrategyContext.GetTableColumns(moduleCode);
return JsonHelper.Instance.Serialize(new TableData
{
data = list,

6
OpenAuth.Mvc/OpenAuth.Mvc.csproj
View File

@ -5,6 +5,10 @@
<UseRazorBuildServer>false</UseRazorBuildServer>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;1591;1573;1572;1570</NoWarn>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Views\Base\**" />
<Content Remove="Views\Base\**" />
@ -16,7 +20,7 @@
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="3.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />
</ItemGroup>
<ItemGroup>

6
OpenAuth.Mvc/Views/ModuleManager/Assign.cshtml
View File

@ -31,8 +31,8 @@
<thead>
<tr>
<th lay-data="{checkbox:true, fixed: true}"></th>
<th lay-data="{field:'Description', width:150}">字段描述</th>
<th lay-data="{field:'Key', width:150}">字段代码</th>
<th lay-data="{field:'Comment', width:150}">字段描述</th>
<th lay-data="{field:'ColumnName', width:150}">字段代码</th>
</tr>
</thead>
</table>
@ -41,4 +41,4 @@
</div>
<script type="text/javascript" src="/layui/layui.js"></script>
<script type="text/javascript" src="/userJs/assignModule.js?v=2.1"></script>
<script type="text/javascript" src="/userJs/assignModule.js?v=3.3"></script>

2
OpenAuth.Mvc/wwwroot/userJs/assignModule.js
View File

@ -100,7 +100,7 @@ layui.config({
//循环所有数据，找出对应关系，设置checkbox选中状态
for (var i = 0; i < res.data.length; i++) {
for (var j = 0; j < props.Result.length; j++) {
if (res.data[i].Key != props.Result[j]) continue;
if (res.data[i].ColumnName != props.Result[j]) continue;
//这里才是真正的有效勾选
res.data[i]["LAY_CHECKED"] = true;

6
OpenAuth.Mvc/wwwroot/userJs/categories.js
View File

@ -13,10 +13,10 @@ layui.config({
$.getJSON('/Categories/All',
{ page: 1, limit: 1 },
function(data) {
var columns = data.columnHeaders.filter(u =>u.Browsable ===true).map(function(e) {
var columns = data.columnFields.filter(u => u.IsList ===true).map(function (e) {
return {
field: e.Key,
title: e.Description
field: e.ColumnName,
title: e.Comment
};
});
columns.unshift({

6
OpenAuth.Mvc/wwwroot/userJs/dataprivilegerules.js
View File

@ -15,10 +15,10 @@
$.getJSON('/DataPrivilegeRules/Load',
{ page: 1, limit: 1 },
function (data) {
var columns = data.columnHeaders.filter(u =>u.Browsable ===true).map(function (e) {
var columns = data.columnFields.filter(u => u.IsList ===true).map(function (e) {
return {
field: e.Key,
title: e.Description
field: e.ColumnName,
title: e.Comment
};
});
columns.unshift({

5
OpenAuth.Repository/BaseRepository.cs
View File

@ -177,7 +177,6 @@ namespace OpenAuth.Repository
/// <summary>
/// 使用SQL脚本查询
/// </summary>
/// <typeparam name="T"> T为数据库实体</typeparam>
/// <returns></returns>
public IQueryable<T> FromSql(string sql, params object[] parameters)
{
@ -187,11 +186,11 @@ namespace OpenAuth.Repository
/// <summary>
/// 使用SQL脚本查询
/// </summary>
/// <typeparam name="T"> T为非数据库实体，需要在DbContext中增加对应的DbQuery</typeparam>
/// <returns></returns>
[Obsolete("最新版同FromSql，需要在DbContext中设置modelBuilder.Entity<XX>().HasNoKey();")]
public IQueryable<T> Query(string sql, params object[] parameters)
{
return _context.Query<T>().FromSqlRaw(sql, parameters);
return _context.Set<T>().FromSqlRaw(sql, parameters);
}
#region 异步实现

3
OpenAuth.Repository/Interface/IRepository.cs
View File

@ -63,15 +63,14 @@ namespace OpenAuth.Repository.Interface
/// <summary>
/// 使用SQL脚本查询
/// </summary>
/// <typeparam name="T"> T为数据库实体</typeparam>
/// <returns></returns>
IQueryable<T> FromSql(string sql, params object[] parameters);
/// <summary>
/// 使用SQL脚本查询
/// </summary>
/// <typeparam name="T"> T为非数据库实体，需要在DbContext中增加对应的DbQuery</typeparam>
/// <returns></returns>
[Obsolete("最新版同FromSql，需要在DbContext中设置modelBuilder.Entity<XX>().HasNoKey();")]
IQueryable<T> Query(string sql, params object[] parameters);

16
OpenAuth.Repository/OpenAuth.Repository.csproj
View File

@ -6,24 +6,24 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>bin\Debug\net5.0\OpenAuth.Repository.xml</DocumentationFile>
<NoWarn>1701;1702;1591;1573;1572;1570</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="5.1.2" />
<PackageReference Include="Autofac" Version="5.2.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="MySql.Data" Version="8.0.13" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="3.19.110" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.110" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.4" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="3.0.40" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="5.21.1" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.1" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.1" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="5.2.13" />
</ItemGroup>
<ItemGroup>

5
OpenAuth.Repository/OpenAuthDBContext.cs
View File

@ -63,7 +63,7 @@ namespace OpenAuth.Repository
}
else if(dbType == Define.DBTYPE_MYSQL) //mysql
{
optionsBuilder.UseMySql(connect);
optionsBuilder.UseMySql(connect, new MySqlServerVersion(new Version(8, 0, 11)));
}
else
{
@ -76,6 +76,7 @@ namespace OpenAuth.Repository
{
modelBuilder.Entity<DataPrivilegeRule>()
.HasKey(c => new { c.Id });
modelBuilder.Entity<SysTableColumn>().HasNoKey();
}
public virtual DbSet<Application> Applications { get; set; }
@ -109,7 +110,7 @@ namespace OpenAuth.Repository
public virtual DbSet<BuilderTable> BuilderTables { get; set; }
public virtual DbSet<BuilderTableColumn> BuilderTableColumns { get; set; }
//非数据库表格
public virtual DbQuery<SysTableColumn> SysTableColumns { get; set; }
public virtual DbSet<SysTableColumn> SysTableColumns { get; set; }
}
}

14
OpenAuth.Repository/QueryObj/SysTableColumn.cs
View File

@ -7,31 +7,31 @@
{
/// <summary>
/// 列名
/// <summary>
/// </summary>
public string ColumnName { get; set; }
/// <summary>
/// 列注释
/// <summary>
/// </summary>
public string Comment { get; set; }
/// <summary>
/// 类型，已转为.net类型
/// <summary>
/// </summary>
public string ColumnType { get; set; }
/// <summary>
/// 最大长度
/// <summary>
/// </summary>
public int? MaxLength { get; set; }
/// <summary>
/// 是否可空
/// <summary>
/// </summary>
public int? IsNull { get; set; }
/// <summary>
/// 是否显示
/// <summary>
/// </summary>
public int? IsDisplay { get; set; }
/// <summary>
/// 是否主键
/// <summary>
/// </summary>
public int? IsKey { get; set; }
public string EntityType { get; set; }
}

3
OpenAuth.Repository/UnitWork.cs
View File

@ -212,9 +212,10 @@ namespace OpenAuth.Repository
return _context.Set<T>().FromSqlRaw(sql, parameters);
}
[Obsolete("最新版同FromSql，需要在DbContext中设置modelBuilder.Entity<XX>().HasNoKey();")]
public IQueryable<T> Query<T>(string sql, params object[] parameters) where T : class
{
return _context.Query<T>().FromSqlRaw(sql, parameters);
return _context.Set<T>().FromSqlRaw(sql, parameters);
}
/// <summary>

6
OpenAuth.WebApi/Controllers/CheckController.cs
View File

@ -127,12 +127,12 @@ namespace OpenAuth.WebApi.Controllers
/// <param name="moduleCode">模块的Code，如Category</param>
/// <returns></returns>
[HttpGet]
public Response<List<KeyDescription>> GetProperties(string moduleCode)
public Response<List<BuilderTableColumn>> GetProperties(string moduleCode)
{
var result = new Response<List<KeyDescription>>();
var result = new Response<List<BuilderTableColumn>>();
try
{
result.Result = _authStrategyContext.GetProperties(moduleCode);
result.Result = _authStrategyContext.GetTableColumns(moduleCode);
}
catch (Exception ex)
{

3
OpenAuth.WebApi/OpenAuth.WebApi.csproj
View File

@ -6,6 +6,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>bin\Debug\OpenAuth.WebApi.xml</DocumentationFile>
<NoWarn>1701;1702;1591;1573;1572;1570</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@ -30,7 +31,7 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="3.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />
<PackageReference Include="MiniProfiler.AspNetCore" Version="4.2.22" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" />

2
OpenAuth.WebApi/Template/SingleTable/BuildApp.html
View File

@ -40,7 +40,7 @@ namespace OpenAuth.App
result.data = objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit);
result.count = objs.Count();
result.count =await objs.CountAsync();
return result;
}

2
OpenAuth.WebApi/Template/SingleTable/BuildAppWithDynamicHeader.html
View File

@ -47,7 +47,7 @@ namespace OpenAuth.App
result.data = objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"new ({propertyStr})");
result.count = objs.Count();
result.count =await objs.CountAsync();
return result;
}

34
mysql初始化脚本/mysql脚本.sql
View File

@ -62,9 +62,11 @@ CREATE TABLE `buildertable` (
-- Records of buildertable
-- ----------------------------
INSERT INTO `buildertable` VALUES ('03761b53-e229-4e0e-b7b1-2831bdc84384', 'Stock', '请在自己的电脑测试，服务器是看不出效果的', '', '', 'Stock', 'OpenAuth.Repository.Domain', 'StockApp', '仓储', 'D:/OpenAuth.Pro/Client', '', '', '', '2020-09-29 00:52:58', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:32:09', '00000000-0000-0000-0000-000000000000', '超级管理员', '超级管理员', '', 1, NULL);
INSERT INTO `buildertable` VALUES ('7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', '入库订单头表', 'wmsinboundorderdtbl', '', 'wmsinboundordertbl', 'OpenAuth.Repository.Domain', 'WmsInApp', '入库模块', 'D:/OpenAuth.Pro/Client', '', '', '', '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:17:34', '00000000-0000-0000-0000-000000000000', '超级管理员', '超级管理员', '', 0, NULL);
INSERT INTO `buildertable` VALUES ('1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', '', '', '', 'Category', 'OpenAuth.Repository.Domain', 'CategoryApp', '分类管理', 'D:/OpenAuth.Pro/Client', '', '', '', '2021-09-27 00:26:54', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:45:56', '00000000-0000-0000-0000-000000000000', '超级管理员', '超级管理员', '', 1, NULL);
INSERT INTO `buildertable` VALUES ('7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', '入库订单头表', '', '', 'wmsinboundordertbl', 'OpenAuth.Repository.Domain', 'WmsInApp', '入库模块', 'D:/OpenAuth.Pro/Client', '', '', '', '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:48:54', '00000000-0000-0000-0000-000000000000', '超级管理员', '超级管理员', '', 1, NULL);
INSERT INTO `buildertable` VALUES ('de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', '', '', '', 'Resource', 'OpenAuth.Repository.Domain', 'ResourceApp', '资源管理', 'D:/OpenAuth.Pro/Client', '', '', '', '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:50:17', '00000000-0000-0000-0000-000000000000', '超级管理员', '超级管理员', '', 1, NULL);
INSERT INTO `buildertable` VALUES ('f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', '', '', '', 'wmsinboundorderdtbl', 'OpenAuth.Repository.Domain', 'wmsinboundorderdtbl', '入库订单模块子表', 'D:/OpenAuth.Pro/Client', '', '', '', '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:09:27', '00000000-0000-0000-0000-000000000000', '超级管理员', '超级管理员', 'OrderId', 1, '7f0ca2fd-7fa0-4316-a466-22733d466dd2');
INSERT INTO `buildertable` VALUES ('fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', '', '', '', 'DataPrivilegeRule', 'OpenAuth.Repository.Domain', 'DataPrivilegeRuleApp', '数据权限', 'D:/OpenAuth.Pro/Client', '', '', '', '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-26 00:28:20', '00000000-0000-0000-0000-000000000000', '超级管理员', '超级管理员', '', 1, NULL);
-- ----------------------------
-- Table structure for buildertablecolumn
@ -103,6 +105,7 @@ CREATE TABLE `buildertablecolumn` (
PRIMARY KEY (`Id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '代码生成器的字段信息' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of buildertablecolumn
-- ----------------------------
@ -112,42 +115,60 @@ INSERT INTO `buildertablecolumn` VALUES ('08e80261-e4ae-4a6f-adf5-09ad5267a975',
INSERT INTO `buildertablecolumn` VALUES ('0ff3a09e-5a37-459f-be55-49ad2b90d934', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'Id', '入库通知单号', 'varchar', 'string', 'Id', 1, 0, 1, 1, 1, 1, 0, '', '', NULL, 'text', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:45:59', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('10462120-3731-4b3d-a44e-f8ee039b3b26', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'Disable', '是否禁用', 'tinyint', 'bool', 'Disable', 0, 0, 1, 1, 1, 1, 0, '', '', '', 'switch', 93, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-29 11:39:46', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('11997d76-06da-480f-9505-d7b6ed824d30', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'OrgId', '所属部门', 'varchar', 'string', 'OrgId', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:50:35', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('15797df5-1392-4eff-8c2f-e142eed7a9f9', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'CreateTime', '创建时间', 'datetime', 'DateTime', 'CreateTime', 0, 0, 1, 1, 0, 1, 0, '', '', NULL, '', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-23 22:39:53', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('165bb5dd-634d-470a-850c-8483bf967d0b', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'UpdateTime', '最后更新时间', 'datetime', 'DateTime', 'UpdateTime', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:40:31', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('17cf3076-9b38-4ac8-a05a-07b1f5b4a309', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'Remark', '备注', 'varchar', 'string', 'Remark', 0, 0, 0, 1, 1, 1, 0, '', '', NULL, 'textarea', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:49:42', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 128);
INSERT INTO `buildertablecolumn` VALUES ('18f07476-eaa9-4f5e-a4fd-14a8e1bd4c87', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'CreateUserName', '创建人', 'varchar', 'string', 'CreateUserName', 0, 0, 1, 1, 0, 1, 0, '', '', NULL, '', 80, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-29 00:59:35', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 200);
INSERT INTO `buildertablecolumn` VALUES ('2105d04e-8c65-4a21-9701-76f64ac119d3', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'OrderId', '入库单号', 'varchar', 'string', 'OrderId', 1, 0, 1, 1, 1, 1, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 03:06:40', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('24d51a8f-7102-41f1-8d39-c8e9e6d72a53', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'SortNo', '排序号', 'int', 'int', 'SortNo', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, 'number', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-23 22:39:19', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('27178bae-387a-4e16-84c4-3fb9d5927afb', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'CreateTime', '创建时间', 'datetime', 'DateTime', 'CreateTime', 0, 0, 1, 1, 0, 1, 0, '', '', NULL, '', 0, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:42:27', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('28bd8b85-b62a-4fa3-a50d-a78b015897be', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'OwnerId', '货主编号', 'varchar', 'string', 'OwnerId', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-11 22:54:21', '', NULL, NULL, '', '超级管理员', 32);
INSERT INTO `buildertablecolumn` VALUES ('2bc4953d-a863-492e-845f-36bff59bc107', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'UpdateUserId', '更新人ID', 'varchar', 'string', 'UpdateUserId', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:51:27', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('2bed33d9-c8bf-46ea-8a35-99a6b079da66', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'UpdateTime', '更新时间', 'datetime', 'DateTime', 'UpdateTime', 0, 0, 0, 0, 0, 1, 0, '', '', NULL, 'datetime', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 03:06:47', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('32b5b4e9-44a7-410a-80d9-1200ffe048d5', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'UpdateUserId', '最后更新人ID', 'varchar', 'string', 'UpdateUserId', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-23 22:39:38', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('33a8a1bd-ea81-4942-9469-4f20a037bf94', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'AppName', '应用名称', 'varchar', 'string', 'AppName', 0, 0, 0, 1, 1, 1, 0, '', '', NULL, '', 90, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:51:44', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('3508e108-6fb3-44f2-aa61-4c61a42f5f38', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'CreateTime', '创建时间', 'datetime', 'DateTime', 'CreateTime', 0, 0, 1, 1, 0, 1, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:09:47', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('37219218-c8a1-40a8-be28-77d423a019b7', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'AppId', '应用ID', 'varchar', 'string', 'AppId', 0, 0, 0, 1, 1, 0, 0, '', '', 'PLATFORM', 'select', 0, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:51:49', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('3a5ed37f-4dca-420f-8a62-8465650dc1a3', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'UpdateTime', '最后更新时间', 'datetime', 'DateTime', 'UpdateTime', 0, 0, 0, 1, 0, 1, 0, '', '', NULL, '', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-23 22:39:33', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('3b96bd7f-38a6-4188-9205-5f6340e29548', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'UpdateTime', '最后更新时间', 'datetime', 'DateTime', 'UpdateTime', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:52:29', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('3d1b1192-aad3-4a6f-9770-ecf486bc4cc0', '03761b53-e229-4e0e-b7b1-2831bdc84384', 'Stock', 'Status', '出库/入库', 'int', 'int', 'Status', 0, 0, 1, 1, 1, 1, 0, '', '', 'COMMON_STATUS', 'select', 7, '2020-09-29 00:52:58', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:30:15', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('3e0dcc3c-3978-4615-bfe9-e65b78e67f4e', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'CreateTime', '创建时间', 'datetime', 'DateTime', 'CreateTime', 0, 0, 0, 0, 0, 1, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:51:57', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('430a695a-7975-4c63-bf57-13c9614d086d', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'TaxRate', '税率', 'decimal', 'decimal', 'TaxRate', 0, 0, 0, 1, 1, 1, 0, '', '', NULL, 'decimal', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:49:47', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('450ff804-a22e-4676-83e8-474a2d32cc75', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'CreateUserName', '创建人', 'varchar', 'string', 'CreateUserName', 0, 0, 1, 1, 0, 1, 0, '', '', NULL, '', 0, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:42:32', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 200);
INSERT INTO `buildertablecolumn` VALUES ('4922ec7f-8730-4c48-913b-a1c110c1e8c4', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'ScheduledInboundTime', '预定入库时间', 'datetime', 'DateTime', 'ScheduledInboundTime', 0, 0, 0, 1, 1, 0, 0, '', '', NULL, 'date', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:51:12', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('4b52a996-4f4d-4a7c-b068-091d1a378b4c', '03761b53-e229-4e0e-b7b1-2831bdc84384', 'Stock', 'OrgId', '组织ID', 'varchar', 'string', 'OrgId', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 20, '2020-09-29 00:52:58', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:30:02', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('4c44c915-d771-44b5-8030-f1c242425c7d', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'Id', '入库通知单明细号', 'varchar', 'string', 'Id', 1, 0, 1, 1, 1, 1, 0, '', '', NULL, 'text', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:48:11', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('4d6d87f3-b597-4dda-8f1f-a0d3d66a25e7', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'DtValue', '分类值', 'varchar', 'string', 'DtValue', 0, 0, 0, 1, 1, 1, 0, '', '', NULL, 'textarea', 95, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:42:07', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('4ddd9669-84c6-4fd4-ae2b-fc72eb2aecf7', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'Description', '描述', 'varchar', 'string', 'Description', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, '', 85, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-29 00:59:28', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 500);
INSERT INTO `buildertablecolumn` VALUES ('4e967746-afe2-431c-b549-3ffbe982c25a', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'TypeName', '分类名称', 'varchar', 'string', 'TypeName', 0, 0, 0, 1, 1, 1, 0, '', '', NULL, '', 0, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-29 00:27:29', '', NULL, NULL, '', '超级管理员', 20);
INSERT INTO `buildertablecolumn` VALUES ('50cf4640-ef20-4122-b21e-c4a6562813f3', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'SortNo', '排序号', 'int', 'int', 'SortNo', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, 'text', 0, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-29 00:31:48', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('51f693cc-33c9-47e0-8080-81118a1d6924', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'UpdateUserName', '最后更新人', 'varchar', 'string', 'UpdateUserName', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-23 22:40:06', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 200);
INSERT INTO `buildertablecolumn` VALUES ('53b76400-51d6-4f38-8142-7a855e9f872a', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'DtCode', '分类标识', 'varchar', 'string', 'DtCode', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, '', 99, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:42:00', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('54954a8b-b34b-41c3-a2bf-46cf5c3f1afa', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'UpdateTime', '更新时间', 'datetime', 'DateTime', 'UpdateTime', 0, 0, 0, 1, 0, 1, 0, '', '', NULL, '', 0, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:51:24', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('56f222a5-bce9-4ae9-acfc-a6c7de0c6dfa', '03761b53-e229-4e0e-b7b1-2831bdc84384', 'Stock', 'Name', '产品名称', 'text', 'string', 'Name', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, 'text', 40, '2020-09-29 00:52:58', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:29:52', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 0);
INSERT INTO `buildertablecolumn` VALUES ('5d372a7e-09f8-480c-9f05-0b28d24b713b', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'ShipperId', '承运人编号', 'varchar', 'string', 'ShipperId', 0, 0, 0, 1, 1, 1, 0, '', '', NULL, 'text', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:45:44', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('5d6c8d4f-b127-4959-a34c-5e641a9d89ed', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'SortNo', '排序号', 'int', 'int', 'SortNo', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, 'number', 70, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:42:51', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('6383b218-2658-4981-9f62-4690f398c1f2', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'Price', '含税单价', 'decimal', 'decimal', 'Price', 0, 0, 0, 1, 1, 1, 0, '', '', NULL, 'decimal', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:49:05', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('67137a1d-f572-40ed-8c67-7fd570b63f42', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'UpdateUserName', '最后更新人', 'varchar', 'string', 'UpdateUserName', 0, 0, 0, 0, 0, 1, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:52:05', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 200);
INSERT INTO `buildertablecolumn` VALUES ('67a497dd-19b5-44d6-9804-6b8c0769cef0', '03761b53-e229-4e0e-b7b1-2831bdc84384', 'Stock', 'Viewable', '可见范围', 'varchar', 'string', 'Viewable', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, '', 1, '2020-09-29 00:52:58', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:30:25', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('6bd63965-6353-47f8-bf46-eaa507457669', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'OrderType', '入库类型', 'varchar', 'string', 'OrderType', 0, 0, 1, 1, 1, 1, 0, '', '', 'SYS_INBOUNDTYPE', 'select', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:45:23', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('6cb07125-18fd-4268-adcc-e23ca1144ba5', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'PrivilegeRules', '权限规则', 'varchar', 'string', 'PrivilegeRules', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, '', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-23 22:35:02', '', NULL, NULL, '', '超级管理员', 1000);
INSERT INTO `buildertablecolumn` VALUES ('6e6c331c-31ff-40cf-bddc-f331f936c982', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'Name', '名称', 'varchar', 'string', 'Name', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, '', 95, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-29 00:58:42', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 255);
INSERT INTO `buildertablecolumn` VALUES ('6ec4c6b1-7a5f-4000-bf69-a2511b0febb2', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'ExternalType', '相关单据类型', 'varchar', 'string', 'ExternalType', 0, 0, 0, 0, 0, 0, 0, '', '', 'SYS_ORDERTYPE', 'select', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:13:21', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('6f59479c-9795-4df2-bd33-8f659f6b659d', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'CreateUserId', '创建人ID', 'varchar', 'string', 'CreateUserId', 0, 0, 1, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-23 22:38:44', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('7000e82f-da5d-4d5e-ac4b-eda825ae40c7', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'GoodsType', '商品类别', 'varchar', 'string', 'GoodsType', 0, 0, 0, 1, 1, 1, 0, '', '', 'SYS_GOODSTYPE', 'select', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:10:28', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('73759b1d-df4a-4c88-879e-503196604f67', '03761b53-e229-4e0e-b7b1-2831bdc84384', 'Stock', 'Time', '操作时间', 'datetime', 'DateTime', 'Time', 0, 0, 1, 1, 0, 1, 0, '', '', NULL, 'date', 5, '2020-09-29 00:52:58', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:30:19', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('7bc33f75-16dc-49b7-822d-32be5aae904b', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'OrderNum', '通知数量', 'decimal', 'decimal', 'OrderNum', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, 'number', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:48:58', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('7edebf71-aa41-4bac-bff3-eaa3c3159b40', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'SourceCode', '资源标识（模块编号）', 'varchar', 'string', 'SourceCode', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, '', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-23 22:35:02', '', NULL, NULL, '', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('85ebb3a8-1a19-44f8-9706-acac1c8bdc44', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'AsnStatus', '到货状况', 'int', 'int', 'AsnStatus', 0, 0, 1, 1, 1, 1, 0, '', '', 'SYS_STATUS', 'select', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:47:30', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('861ca9ab-e81e-4fa8-8b56-375127a8cb59', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'LeaveNum', '剩余数量', 'decimal', 'decimal', 'LeaveNum', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, 'number', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:48:44', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('87d68d3a-22b1-475c-a20a-d39724ca7639', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'CreateUserName', '创建人', 'varchar', 'string', 'CreateUserName', 0, 0, 1, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-23 22:38:48', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 200);
INSERT INTO `buildertablecolumn` VALUES ('8a43f4d1-73a7-408d-b3cc-02be321b8ef9', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'OwnerId', '货主编号', 'varchar', 'string', 'OwnerId', 0, 0, 0, 1, 1, 1, 0, '', '', NULL, 'text', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:45:33', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('8c0836e9-6da1-4510-a59b-ccc94f4c2c14', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'GoodsId', '商品编号', 'varchar', 'string', 'GoodsId', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-11 22:54:21', '', NULL, NULL, '', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('8d0326c3-fcbc-4b37-8c8b-20421daf6b34', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'Description', '权限描述', 'varchar', 'string', 'Description', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, '', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-23 22:35:02', '', NULL, NULL, '', '超级管理员', 255);
INSERT INTO `buildertablecolumn` VALUES ('8effdc32-477a-44a4-a0e6-3e58c5631307', '03761b53-e229-4e0e-b7b1-2831bdc84384', 'Stock', 'Price', '产品单价', 'decimal', 'decimal', 'Price', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, 'text', 10, '2020-09-29 00:52:58', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:31:44', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('8f161c08-1880-4b9f-95d6-88abb78a573b', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'SubSourceCode', '二级资源标识', 'varchar', 'string', 'SubSourceCode', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-26 00:28:18', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('94d03bc7-832c-4dbe-9df1-84e8ec6f1707', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'Description', '描述', 'varchar', 'string', 'Description', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 55, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:45:53', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 500);
INSERT INTO `buildertablecolumn` VALUES ('95b6e356-3687-4001-9ffb-1271c3baf31e', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'Id', '标识', 'varchar', 'string', 'Id', 1, 0, 1, 1, 1, 1, 0, '', '', NULL, 'text', 99, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:52:12', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('96083a87-d21b-4b25-98c6-780156d68b08', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'ParentName', '父节点名称', 'varchar', 'string', 'ParentName', 0, 0, 0, 1, 0, 1, 0, '', '', NULL, '', 0, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:50:16', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('9864568d-9816-47e6-ae35-992a3b10bae2', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'ReturnBoxNum', '销退箱数', 'decimal', 'decimal', 'ReturnBoxNum', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, 'number', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:44:24', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
@ -160,6 +181,8 @@ INSERT INTO `buildertablecolumn` VALUES ('a32c75ea-4095-458a-97b6-815db63d951e',
INSERT INTO `buildertablecolumn` VALUES ('a33882d0-89f1-4d21-b740-051b1742e33c', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'QualityFlg', '品质', 'varchar', 'string', 'QualityFlg', 0, 0, 1, 1, 1, 1, 0, '', '', 'SYS_GOODSTYPE', 'select', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:51:39', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('a5f9c89e-474f-4047-9e18-a8a31050a952', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'SupplierId', '供应商编号', 'varchar', 'string', 'SupplierId', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:13:11', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('a6e98eac-afd5-4465-9b60-206cfdeab9e1', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'CreateUserId', '创建人ID', 'varchar', 'string', 'CreateUserId', 0, 0, 1, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:09:56', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('a76d32c3-312e-41ba-af71-bee893648a56', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'UpdateUserName', '最后更新人', 'varchar', 'string', 'UpdateUserName', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:40:33', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 200);
INSERT INTO `buildertablecolumn` VALUES ('a79e8649-e2d9-4b51-a169-8c7f20472498', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'Name', '分类名称或描述', 'varchar', 'string', 'Name', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, '', 85, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:42:46', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 255);
INSERT INTO `buildertablecolumn` VALUES ('a8249275-9be3-4a92-ae3e-fa135233ef76', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'InNum', '到货数量', 'decimal', 'decimal', 'InNum', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-11 22:54:21', '', NULL, NULL, '', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('acbae3d8-fb55-404b-8680-53cb02b02927', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'UpdateUserName', '最后更新人', 'varchar', 'string', 'UpdateUserName', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-29 00:56:36', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 200);
INSERT INTO `buildertablecolumn` VALUES ('b0898ec0-ff90-46a6-9129-bd67aad6a547', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'CreateTime', '创建时间', 'datetime', 'DateTime', 'CreateTime', 0, 0, 1, 1, 0, 1, 0, '', '', NULL, 'datetime', 0, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-29 00:28:32', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
@ -170,17 +193,26 @@ INSERT INTO `buildertablecolumn` VALUES ('b98e4da3-32c0-48bd-b09a-e56b4521504d',
INSERT INTO `buildertablecolumn` VALUES ('bcf8079e-f046-4fba-b98f-3f840c59edd3', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'CreateUserName', '创建人', 'varchar', 'string', 'CreateUserName', 0, 0, 0, 0, 0, 1, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:51:58', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 200);
INSERT INTO `buildertablecolumn` VALUES ('bd084fcd-b00b-41b1-85c4-ea856eda4bc1', '03761b53-e229-4e0e-b7b1-2831bdc84384', 'Stock', 'Id', '数据ID', 'varchar', 'string', 'Id', 1, 0, 1, 1, 0, 0, 0, '', '', NULL, '', 50, '2020-09-29 00:52:58', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:31:36', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('c084f056-fd43-4b47-8fea-d668d2aef488', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'PurchaseNo', '采购单号', 'varchar', 'string', 'PurchaseNo', 0, 0, 0, 1, 1, 1, 0, '', '', NULL, 'text', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:45:39', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 30);
INSERT INTO `buildertablecolumn` VALUES ('c7366b20-7fcf-4784-8a7f-57695c2745c0', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'Id', 'Id', 'varchar', 'string', 'Id', 1, 0, 1, 1, 1, 0, 0, '', '', NULL, '', 0, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:40:19', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('c7b30d11-9a00-48ba-86ff-68e4b78fd8c2', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'TypeId', '分类ID', 'varchar', 'string', 'TypeId', 0, 0, 0, 1, 1, 1, 0, '', '', NULL, 'text', 80, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:42:59', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('c7e16730-9af0-4290-9c4f-e37bb3a22aef', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'CreateUserId', '创建人ID', 'varchar', 'string', 'CreateUserId', 0, 0, 1, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:38:37', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('cac9af55-805e-4af8-8936-8a2ef0f886f5', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'InBondedArea', '是否保税', 'tinyint', 'bool', 'InBondedArea', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, 'switch', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:45:12', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('d2366b5d-992f-4f68-b08d-ebd01962c55c', '03761b53-e229-4e0e-b7b1-2831bdc84384', 'Stock', 'User', '操作人', 'varchar', 'string', 'User', 0, 0, 1, 1, 0, 1, 0, '', '', NULL, '', 3, '2020-09-29 00:52:58', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:30:22', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('d73b377d-c6a3-4f74-b608-0e0223dbbd0a', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'CreateUserId', '创建人ID', 'varchar', 'string', 'CreateUserId', 0, 0, 1, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-29 00:28:40', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('d8913d5b-c62f-4cb5-aedc-60b652a41427', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'UpdateUserName', '最后更新人', 'varchar', 'string', 'UpdateUserName', 0, 0, 0, 1, 0, 1, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:49:50', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 200);
INSERT INTO `buildertablecolumn` VALUES ('dfbb6dd4-d03a-452a-8f9e-b6747b585819', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'ExternalNo', '相关单据号', 'varchar', 'string', 'ExternalNo', 0, 0, 0, 0, 0, 0, 0, '', '', NULL, 'text', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:46:16', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('e075aeb7-82ba-4858-9551-d11ee7f61156', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'UpdateUserId', '最后更新人ID', 'varchar', 'string', 'UpdateUserId', 0, 0, 0, 1, 0, 0, 0, '', '', NULL, '', 0, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:38:22', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('e7f071ca-2ba0-4a89-a988-424d1e9b0b8b', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'Enable', '是否可用', 'tinyint', 'bool', 'Enable', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, 'switch', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-23 22:38:54', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('ea35d6b5-aa14-495f-ba36-d51eb73125ac', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'ExpireDate', '失效日期', 'varchar', 'string', 'ExpireDate', 0, 0, 0, 1, 1, 1, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-11 22:54:21', '', NULL, NULL, '', '超级管理员', 30);
INSERT INTO `buildertablecolumn` VALUES ('ec8aac16-7f9c-4b19-977c-aecede234910', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'Status', '入库通知单状态', 'int', 'int', 'Status', 0, 0, 0, 0, 0, 0, 0, '', '', 'COMMON_STATUS', 'select', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:14:30', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('ecab3cf5-312c-46a9-aa82-87c34396ea90', '7f0ca2fd-7fa0-4316-a466-22733d466dd2', 'wmsinboundordertbl', 'StockId', '仓库编号', 'varchar', 'string', 'StockId', 0, 0, 0, 0, 0, 0, 0, '', '', NULL, '', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 01:14:39', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 12);
INSERT INTO `buildertablecolumn` VALUES ('ee53d454-c8f9-48d3-9bc1-b4a1fdf6c390', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'InStockStatus', '是否收货中', 'tinyint', 'bool', 'InStockStatus', 0, 0, 1, 1, 1, 1, 0, '', 'switch', NULL, 'switch', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:48:30', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('f8392fe0-0591-4ca7-8ebe-c8f69a8a30f0', 'f07df6d0-eb47-4f00-9167-79d88bcace36', 'wmsinboundorderdtbl', 'ProdDate', '生产日期', 'varchar', 'string', 'ProdDate', 0, 0, 0, 1, 1, 1, 0, '', '', NULL, 'datetime', 0, '2021-08-11 22:54:21', '00000000-0000-0000-0000-000000000000', '2021-08-23 02:49:17', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 30);
INSERT INTO `buildertablecolumn` VALUES ('f8d7f45a-8754-46a1-8ce4-9a8992801f68', 'de4a5527-0d8c-4493-b668-39fc9c555df1', 'Resource', 'ParentId', '父节点ID', 'varchar', 'string', 'ParentId', 0, 0, 0, 1, 1, 0, 0, '', '', '/Resources/Load', 'selectDynamic', 0, '2021-08-29 00:27:29', '00000000-0000-0000-0000-000000000000', '2021-08-30 00:51:13', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
INSERT INTO `buildertablecolumn` VALUES ('fc13f50a-51ec-4bfc-82b6-ad1f4c71c297', '1751d517-6d2b-4638-8f5c-aa6355bccb0e', 'Category', 'Enable', '是否可用', 'tinyint', 'bool', 'Enable', 0, 0, 1, 1, 1, 1, 0, '', '', NULL, 'switch', 90, '2021-09-27 00:26:55', '00000000-0000-0000-0000-000000000000', '2021-09-27 00:42:13', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', NULL);
INSERT INTO `buildertablecolumn` VALUES ('fd03c732-f369-4b79-a1be-dc16ee053cb4', 'fc52b31a-fc29-42b6-b53c-99463644fff2', 'dataprivilegerule', 'Id', '数据ID', 'varchar', 'string', 'Id', 1, 0, 1, 1, 1, 0, 0, '', '', NULL, '', 0, '2021-09-23 22:35:02', '00000000-0000-0000-0000-000000000000', '2021-09-23 22:39:05', '00000000-0000-0000-0000-000000000000', NULL, NULL, '超级管理员', '超级管理员', 50);
-- ----------------------------
-- Table structure for category

89
sql server 初始化脚本/Sql Server脚本.sql
View File

@ -294,7 +294,10 @@ GO
INSERT INTO [dbo].[BuilderTable] ([Id], [TableName], [Comment], [DetailTableName], [DetailComment], [ClassName], [Namespace], [ModuleCode], [ModuleName], [Folder], [Options], [TypeId], [TypeName], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [UpdateUserName], [CreateUserName], [ForeignKey], [IsDynamicHeader], [ParentTableId]) VALUES (N'03761b53-e229-4e0e-b7b1-2831bdc84384', N'Stock', N'请在自己的电脑测试，服务器是看不出效果的', N'', N'', N'Stock', N'OpenAuth.Repository.Domain', N'StockApp', N'仓储', N'D:/OpenAuth.Pro/Client', N'', N'', N'', N'2020-09-29 00:52:58', N'00000000-0000-0000-0000-000000000000', N'2021-08-30 00:32:09', N'00000000-0000-0000-0000-000000000000', N'超级管理员', N'超级管理员', N'', N'1', NULL)
GO
INSERT INTO [dbo].[BuilderTable] ([Id], [TableName], [Comment], [DetailTableName], [DetailComment], [ClassName], [Namespace], [ModuleCode], [ModuleName], [Folder], [Options], [TypeId], [TypeName], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [UpdateUserName], [CreateUserName], [ForeignKey], [IsDynamicHeader], [ParentTableId]) VALUES (N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'入库订单头表', N'', N'', N'wmsinboundordertbl', N'OpenAuth.Repository.Domain', N'WmsInApp', N'入库模块', N'D:/OpenAuth.Pro/Client', N'', N'', N'', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 01:17:34', N'00000000-0000-0000-0000-000000000000', N'超级管理员', N'超级管理员', N'', N'0', NULL)
INSERT INTO [dbo].[BuilderTable] ([Id], [TableName], [Comment], [DetailTableName], [DetailComment], [ClassName], [Namespace], [ModuleCode], [ModuleName], [Folder], [Options], [TypeId], [TypeName], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [UpdateUserName], [CreateUserName], [ForeignKey], [IsDynamicHeader], [ParentTableId]) VALUES (N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'', N'', N'', N'Category', N'OpenAuth.Repository.Domain', N'CategoryApp', N'分类管理', N'D:/OpenAuth.Pro/Client', N'', N'', N'', N'2021-09-27 00:26:54', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:45:56', N'00000000-0000-0000-0000-000000000000', N'超级管理员', N'超级管理员', N'', N'1', NULL)
GO
INSERT INTO [dbo].[BuilderTable] ([Id], [TableName], [Comment], [DetailTableName], [DetailComment], [ClassName], [Namespace], [ModuleCode], [ModuleName], [Folder], [Options], [TypeId], [TypeName], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [UpdateUserName], [CreateUserName], [ForeignKey], [IsDynamicHeader], [ParentTableId]) VALUES (N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'入库订单头表', N'', N'', N'wmsinboundordertbl', N'OpenAuth.Repository.Domain', N'WmsInApp', N'入库模块', N'D:/OpenAuth.Pro/Client', N'', N'', N'', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:48:54', N'00000000-0000-0000-0000-000000000000', N'超级管理员', N'超级管理员', N'', N'1', NULL)
GO
INSERT INTO [dbo].[BuilderTable] ([Id], [TableName], [Comment], [DetailTableName], [DetailComment], [ClassName], [Namespace], [ModuleCode], [ModuleName], [Folder], [Options], [TypeId], [TypeName], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [UpdateUserName], [CreateUserName], [ForeignKey], [IsDynamicHeader], [ParentTableId]) VALUES (N'de4a5527-0d8c-4493-b668-39fc9c555df1', N'Resource', N'', N'', N'', N'Resource', N'OpenAuth.Repository.Domain', N'ResourceApp', N'资源管理', N'D:/OpenAuth.Pro/Client', N'', N'', N'', N'2021-08-29 00:27:29', N'00000000-0000-0000-0000-000000000000', N'2021-08-30 00:50:17', N'00000000-0000-0000-0000-000000000000', N'超级管理员', N'超级管理员', N'', N'1', NULL)
@ -303,6 +306,9 @@ GO
INSERT INTO [dbo].[BuilderTable] ([Id], [TableName], [Comment], [DetailTableName], [DetailComment], [ClassName], [Namespace], [ModuleCode], [ModuleName], [Folder], [Options], [TypeId], [TypeName], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [UpdateUserName], [CreateUserName], [ForeignKey], [IsDynamicHeader], [ParentTableId]) VALUES (N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'', N'', N'', N'wmsinboundorderdtbl', N'OpenAuth.Repository.Domain', N'wmsinboundorderdtbl', N'入库订单模块子表', N'D:/OpenAuth.Pro/Client', N'', N'', N'', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 01:09:27', N'00000000-0000-0000-0000-000000000000', N'超级管理员', N'超级管理员', N'OrderId', N'1', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2')
GO
INSERT INTO [dbo].[BuilderTable] ([Id], [TableName], [Comment], [DetailTableName], [DetailComment], [ClassName], [Namespace], [ModuleCode], [ModuleName], [Folder], [Options], [TypeId], [TypeName], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [UpdateUserName], [CreateUserName], [ForeignKey], [IsDynamicHeader], [ParentTableId]) VALUES (N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'', N'', N'', N'DataPrivilegeRule', N'OpenAuth.Repository.Domain', N'DataPrivilegeRuleApp', N'数据权限', N'D:/OpenAuth.Pro/Client', N'', N'', N'', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-26 00:28:20', N'00000000-0000-0000-0000-000000000000', N'超级管理员', N'超级管理员', N'', N'1', NULL)
GO
-- ----------------------------
-- Table structure for BuilderTableColumn
@ -578,6 +584,12 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'11997d76-06da-480f-9505-d7b6ed824d30', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'OrgId', N'所属部门', N'varchar', N'string', N'OrgId', N'0', N'0', N'0', N'1', N'0', N'0', N'0', N'', N'', N'', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 01:50:35', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'15797df5-1392-4eff-8c2f-e142eed7a9f9', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'CreateTime', N'创建时间', N'datetime', N'DateTime', N'CreateTime', N'0', N'0', N'1', N'1', N'0', N'1', N'0', N'', N'', N'', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-23 22:39:53', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'165bb5dd-634d-470a-850c-8483bf967d0b', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'UpdateTime', N'最后更新时间', N'datetime', N'DateTime', N'UpdateTime', N'0', N'0', N'0', N'1', N'0', N'0', N'0', N'', N'', N'', N'0', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:40:31', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'17cf3076-9b38-4ac8-a05a-07b1f5b4a309', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'Remark', N'备注', N'varchar', N'string', N'Remark', N'0', N'0', N'0', N'1', N'1', N'1', N'0', N'', N'', N'textarea', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:49:42', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'128', NULL)
GO
@ -587,6 +599,12 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'2105d04e-8c65-4a21-9701-76f64ac119d3', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'OrderId', N'入库单号', N'varchar', N'string', N'OrderId', N'1', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 03:06:40', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'24d51a8f-7102-41f1-8d39-c8e9e6d72a53', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'SortNo', N'排序号', N'int', N'int', N'SortNo', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'number', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-23 22:39:19', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'27178bae-387a-4e16-84c4-3fb9d5927afb', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'CreateTime', N'创建时间', N'datetime', N'DateTime', N'CreateTime', N'0', N'0', N'1', N'1', N'0', N'1', N'0', N'', N'', N'', N'0', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:42:27', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'28bd8b85-b62a-4fa3-a50d-a78b015897be', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'OwnerId', N'货主编号', N'varchar', N'string', N'OwnerId', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-11 22:54:21', N'', NULL, NULL, N'', N'超级管理员', N'32', NULL)
GO
@ -596,6 +614,9 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'2bed33d9-c8bf-46ea-8a35-99a6b079da66', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'UpdateTime', N'更新时间', N'datetime', N'DateTime', N'UpdateTime', N'0', N'0', N'0', N'0', N'0', N'1', N'0', N'', N'', N'datetime', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 03:06:47', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'32b5b4e9-44a7-410a-80d9-1200ffe048d5', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'UpdateUserId', N'最后更新人ID', N'varchar', N'string', N'UpdateUserId', N'0', N'0', N'0', N'1', N'0', N'0', N'0', N'', N'', N'', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-23 22:39:38', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'33a8a1bd-ea81-4942-9469-4f20a037bf94', N'de4a5527-0d8c-4493-b668-39fc9c555df1', N'Resource', N'AppName', N'应用名称', N'varchar', N'string', N'AppName', N'0', N'0', N'0', N'1', N'1', N'1', N'0', N'', N'', N'', N'90', N'2021-08-29 00:27:29', N'00000000-0000-0000-0000-000000000000', N'2021-08-30 00:51:44', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
@ -605,6 +626,9 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'37219218-c8a1-40a8-be28-77d423a019b7', N'de4a5527-0d8c-4493-b668-39fc9c555df1', N'Resource', N'AppId', N'应用ID', N'varchar', N'string', N'AppId', N'0', N'0', N'0', N'1', N'1', N'0', N'0', N'', N'', N'select', N'0', N'2021-08-29 00:27:29', N'00000000-0000-0000-0000-000000000000', N'2021-08-30 00:51:49', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', N'PLATFORM')
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'3a5ed37f-4dca-420f-8a62-8465650dc1a3', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'UpdateTime', N'最后更新时间', N'datetime', N'DateTime', N'UpdateTime', N'0', N'0', N'0', N'1', N'0', N'1', N'0', N'', N'', N'', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-23 22:39:33', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'3b96bd7f-38a6-4188-9205-5f6340e29548', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'UpdateTime', N'最后更新时间', N'datetime', N'DateTime', N'UpdateTime', N'0', N'0', N'0', N'1', N'0', N'0', N'0', N'', N'', N'', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 01:52:29', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
@ -617,6 +641,9 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'430a695a-7975-4c63-bf57-13c9614d086d', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'TaxRate', N'税率', N'decimal', N'decimal', N'TaxRate', N'0', N'0', N'0', N'1', N'1', N'1', N'0', N'', N'', N'decimal', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:49:47', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'450ff804-a22e-4676-83e8-474a2d32cc75', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'CreateUserName', N'创建人', N'varchar', N'string', N'CreateUserName', N'0', N'0', N'1', N'1', N'0', N'1', N'0', N'', N'', N'', N'0', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:42:32', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'200', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'4922ec7f-8730-4c48-913b-a1c110c1e8c4', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'ScheduledInboundTime', N'预定入库时间', N'datetime', N'DateTime', N'ScheduledInboundTime', N'0', N'0', N'0', N'1', N'1', N'0', N'0', N'', N'', N'date', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 01:51:12', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
@ -626,6 +653,9 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'4c44c915-d771-44b5-8030-f1c242425c7d', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'Id', N'入库通知单明细号', N'varchar', N'string', N'Id', N'1', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'text', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:48:11', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'4d6d87f3-b597-4dda-8f1f-a0d3d66a25e7', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'DtValue', N'分类值', N'varchar', N'string', N'DtValue', N'0', N'0', N'0', N'1', N'1', N'1', N'0', N'', N'', N'textarea', N'95', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:42:07', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'4ddd9669-84c6-4fd4-ae2b-fc72eb2aecf7', N'de4a5527-0d8c-4493-b668-39fc9c555df1', N'Resource', N'Description', N'描述', N'varchar', N'string', N'Description', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'', N'85', N'2021-08-29 00:27:29', N'00000000-0000-0000-0000-000000000000', N'2021-08-29 00:59:28', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'500', NULL)
GO
@ -635,6 +665,12 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'50cf4640-ef20-4122-b21e-c4a6562813f3', N'de4a5527-0d8c-4493-b668-39fc9c555df1', N'Resource', N'SortNo', N'排序号', N'int', N'int', N'SortNo', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'text', N'0', N'2021-08-29 00:27:29', N'00000000-0000-0000-0000-000000000000', N'2021-08-29 00:31:48', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'51f693cc-33c9-47e0-8080-81118a1d6924', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'UpdateUserName', N'最后更新人', N'varchar', N'string', N'UpdateUserName', N'0', N'0', N'0', N'1', N'0', N'0', N'0', N'', N'', N'', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-23 22:40:06', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'200', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'53b76400-51d6-4f38-8142-7a855e9f872a', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'DtCode', N'分类标识', N'varchar', N'string', N'DtCode', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'', N'99', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:42:00', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'54954a8b-b34b-41c3-a2bf-46cf5c3f1afa', N'de4a5527-0d8c-4493-b668-39fc9c555df1', N'Resource', N'UpdateTime', N'更新时间', N'datetime', N'DateTime', N'UpdateTime', N'0', N'0', N'0', N'1', N'0', N'1', N'0', N'', N'', N'', N'0', N'2021-08-29 00:27:29', N'00000000-0000-0000-0000-000000000000', N'2021-08-30 00:51:24', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
@ -644,6 +680,9 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'5d372a7e-09f8-480c-9f05-0b28d24b713b', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'ShipperId', N'承运人编号', N'varchar', N'string', N'ShipperId', N'0', N'0', N'0', N'1', N'1', N'1', N'0', N'', N'', N'text', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:45:44', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'5d6c8d4f-b127-4959-a34c-5e641a9d89ed', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'SortNo', N'排序号', N'int', N'int', N'SortNo', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'number', N'70', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:42:51', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'6383b218-2658-4981-9f62-4690f398c1f2', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'Price', N'含税单价', N'decimal', N'decimal', N'Price', N'0', N'0', N'0', N'1', N'1', N'1', N'0', N'', N'', N'decimal', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:49:05', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
@ -656,12 +695,18 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'6bd63965-6353-47f8-bf46-eaa507457669', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'OrderType', N'入库类型', N'varchar', N'string', N'OrderType', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'select', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:45:23', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', N'SYS_INBOUNDTYPE')
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'6cb07125-18fd-4268-adcc-e23ca1144ba5', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'PrivilegeRules', N'权限规则', N'varchar', N'string', N'PrivilegeRules', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-23 22:35:02', N'', NULL, NULL, N'', N'超级管理员', N'1000', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'6e6c331c-31ff-40cf-bddc-f331f936c982', N'de4a5527-0d8c-4493-b668-39fc9c555df1', N'Resource', N'Name', N'名称', N'varchar', N'string', N'Name', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'', N'95', N'2021-08-29 00:27:29', N'00000000-0000-0000-0000-000000000000', N'2021-08-29 00:58:42', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'255', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'6ec4c6b1-7a5f-4000-bf69-a2511b0febb2', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'ExternalType', N'相关单据类型', N'varchar', N'string', N'ExternalType', N'0', N'0', N'0', N'0', N'0', N'0', N'0', N'', N'', N'select', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 01:13:21', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', N'SYS_ORDERTYPE')
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'6f59479c-9795-4df2-bd33-8f659f6b659d', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'CreateUserId', N'创建人ID', N'varchar', N'string', N'CreateUserId', N'0', N'0', N'1', N'1', N'0', N'0', N'0', N'', N'', N'', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-23 22:38:44', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'7000e82f-da5d-4d5e-ac4b-eda825ae40c7', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'GoodsType', N'商品类别', N'varchar', N'string', N'GoodsType', N'0', N'0', N'0', N'1', N'1', N'1', N'0', N'', N'', N'select', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 01:10:28', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', N'SYS_GOODSTYPE')
GO
@ -671,21 +716,36 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'7bc33f75-16dc-49b7-822d-32be5aae904b', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'OrderNum', N'通知数量', N'decimal', N'decimal', N'OrderNum', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'number', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:48:58', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'7edebf71-aa41-4bac-bff3-eaa3c3159b40', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'SourceCode', N'资源标识（模块编号）', N'varchar', N'string', N'SourceCode', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-23 22:35:02', N'', NULL, NULL, N'', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'85ebb3a8-1a19-44f8-9706-acac1c8bdc44', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'AsnStatus', N'到货状况', N'int', N'int', N'AsnStatus', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'select', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:47:30', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, N'SYS_STATUS')
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'861ca9ab-e81e-4fa8-8b56-375127a8cb59', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'LeaveNum', N'剩余数量', N'decimal', N'decimal', N'LeaveNum', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'number', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:48:44', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'87d68d3a-22b1-475c-a20a-d39724ca7639', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'CreateUserName', N'创建人', N'varchar', N'string', N'CreateUserName', N'0', N'0', N'1', N'1', N'0', N'0', N'0', N'', N'', N'', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-23 22:38:48', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'200', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'8a43f4d1-73a7-408d-b3cc-02be321b8ef9', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'OwnerId', N'货主编号', N'varchar', N'string', N'OwnerId', N'0', N'0', N'0', N'1', N'1', N'1', N'0', N'', N'', N'text', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:45:33', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'8c0836e9-6da1-4510-a59b-ccc94f4c2c14', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'GoodsId', N'商品编号', N'varchar', N'string', N'GoodsId', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-11 22:54:21', N'', NULL, NULL, N'', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'8d0326c3-fcbc-4b37-8c8b-20421daf6b34', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'Description', N'权限描述', N'varchar', N'string', N'Description', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-23 22:35:02', N'', NULL, NULL, N'', N'超级管理员', N'255', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'8effdc32-477a-44a4-a0e6-3e58c5631307', N'03761b53-e229-4e0e-b7b1-2831bdc84384', N'Stock', N'Price', N'产品单价', N'decimal', N'decimal', N'Price', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'text', N'10', N'2020-09-29 00:52:58', N'00000000-0000-0000-0000-000000000000', N'2021-08-30 00:31:44', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'8f161c08-1880-4b9f-95d6-88abb78a573b', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'SubSourceCode', N'二级资源标识', N'varchar', N'string', N'SubSourceCode', N'0', N'0', N'0', N'1', N'0', N'0', N'0', N'', N'', N'', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-26 00:28:18', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'94d03bc7-832c-4dbe-9df1-84e8ec6f1707', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'Description', N'描述', N'varchar', N'string', N'Description', N'0', N'0', N'0', N'1', N'0', N'0', N'0', N'', N'', N'', N'55', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:45:53', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'500', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'95b6e356-3687-4001-9ffb-1271c3baf31e', N'de4a5527-0d8c-4493-b668-39fc9c555df1', N'Resource', N'Id', N'标识', N'varchar', N'string', N'Id', N'1', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'text', N'99', N'2021-08-29 00:27:29', N'00000000-0000-0000-0000-000000000000', N'2021-08-30 00:52:12', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
@ -722,6 +782,12 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'a6e98eac-afd5-4465-9b60-206cfdeab9e1', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'CreateUserId', N'创建人ID', N'varchar', N'string', N'CreateUserId', N'0', N'0', N'1', N'1', N'0', N'0', N'0', N'', N'', N'', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 01:09:56', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'a76d32c3-312e-41ba-af71-bee893648a56', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'UpdateUserName', N'最后更新人', N'varchar', N'string', N'UpdateUserName', N'0', N'0', N'0', N'1', N'0', N'0', N'0', N'', N'', N'', N'0', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:40:33', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'200', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'a79e8649-e2d9-4b51-a169-8c7f20472498', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'Name', N'分类名称或描述', N'varchar', N'string', N'Name', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'', N'85', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:42:46', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'255', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'a8249275-9be3-4a92-ae3e-fa135233ef76', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'InNum', N'到货数量', N'decimal', N'decimal', N'InNum', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-11 22:54:21', N'', NULL, NULL, N'', N'超级管理员', NULL, NULL)
GO
@ -752,6 +818,15 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'c084f056-fd43-4b47-8fea-d668d2aef488', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'PurchaseNo', N'采购单号', N'varchar', N'string', N'PurchaseNo', N'0', N'0', N'0', N'1', N'1', N'1', N'0', N'', N'', N'text', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:45:39', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'30', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'c7366b20-7fcf-4784-8a7f-57695c2745c0', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'Id', N'Id', N'varchar', N'string', N'Id', N'1', N'0', N'1', N'1', N'1', N'0', N'0', N'', N'', N'', N'0', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:40:19', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'c7b30d11-9a00-48ba-86ff-68e4b78fd8c2', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'TypeId', N'分类ID', N'varchar', N'string', N'TypeId', N'0', N'0', N'0', N'1', N'1', N'1', N'0', N'', N'', N'text', N'80', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:42:59', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'c7e16730-9af0-4290-9c4f-e37bb3a22aef', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'CreateUserId', N'创建人ID', N'varchar', N'string', N'CreateUserId', N'0', N'0', N'1', N'1', N'0', N'0', N'0', N'', N'', N'', N'0', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:38:37', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'cac9af55-805e-4af8-8936-8a2ef0f886f5', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'InBondedArea', N'是否保税', N'tinyint', N'bool', N'InBondedArea', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'switch', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:45:12', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
@ -767,6 +842,12 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'dfbb6dd4-d03a-452a-8f9e-b6747b585819', N'7f0ca2fd-7fa0-4316-a466-22733d466dd2', N'wmsinboundordertbl', N'ExternalNo', N'相关单据号', N'varchar', N'string', N'ExternalNo', N'0', N'0', N'0', N'0', N'0', N'0', N'0', N'', N'', N'text', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-23 02:46:16', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'e075aeb7-82ba-4858-9551-d11ee7f61156', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'UpdateUserId', N'最后更新人ID', N'varchar', N'string', N'UpdateUserId', N'0', N'0', N'0', N'1', N'0', N'0', N'0', N'', N'', N'', N'0', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:38:22', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'e7f071ca-2ba0-4a89-a988-424d1e9b0b8b', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'Enable', N'是否可用', N'tinyint', N'bool', N'Enable', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'switch', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-23 22:38:54', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'ea35d6b5-aa14-495f-ba36-d51eb73125ac', N'f07df6d0-eb47-4f00-9167-79d88bcace36', N'wmsinboundorderdtbl', N'ExpireDate', N'失效日期', N'varchar', N'string', N'ExpireDate', N'0', N'0', N'0', N'1', N'1', N'1', N'0', N'', N'', N'', N'0', N'2021-08-11 22:54:21', N'00000000-0000-0000-0000-000000000000', N'2021-08-11 22:54:21', N'', NULL, NULL, N'', N'超级管理员', N'30', NULL)
GO
@ -785,6 +866,12 @@ GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'f8d7f45a-8754-46a1-8ce4-9a8992801f68', N'de4a5527-0d8c-4493-b668-39fc9c555df1', N'Resource', N'ParentId', N'父节点ID', N'varchar', N'string', N'ParentId', N'0', N'0', N'0', N'1', N'1', N'0', N'0', N'', N'', N'selectDynamic', N'0', N'2021-08-29 00:27:29', N'00000000-0000-0000-0000-000000000000', N'2021-08-30 00:51:13', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', N'/Resources/Load')
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'fc13f50a-51ec-4bfc-82b6-ad1f4c71c297', N'1751d517-6d2b-4638-8f5c-aa6355bccb0e', N'Category', N'Enable', N'是否可用', N'tinyint', N'bool', N'Enable', N'0', N'0', N'1', N'1', N'1', N'1', N'0', N'', N'', N'switch', N'90', N'2021-09-27 00:26:55', N'00000000-0000-0000-0000-000000000000', N'2021-09-27 00:42:13', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', NULL, NULL)
GO
INSERT INTO [dbo].[BuilderTableColumn] ([Id], [TableId], [TableName], [ColumnName], [Comment], [ColumnType], [EntityType], [EntityName], [IsKey], [IsIncrement], [IsRequired], [IsInsert], [IsEdit], [IsList], [IsQuery], [QueryType], [HtmlType], [EditType], [Sort], [CreateTime], [CreateUserId], [UpdateTime], [UpdateUserId], [EditRow], [EditCol], [UpdateUserName], [CreateUserName], [MaxLength], [DataSource]) VALUES (N'fd03c732-f369-4b79-a1be-dc16ee053cb4', N'fc52b31a-fc29-42b6-b53c-99463644fff2', N'dataprivilegerule', N'Id', N'数据ID', N'varchar', N'string', N'Id', N'1', N'0', N'1', N'1', N'1', N'0', N'0', N'', N'', N'', N'0', N'2021-09-23 22:35:02', N'00000000-0000-0000-0000-000000000000', N'2021-09-23 22:39:05', N'00000000-0000-0000-0000-000000000000', NULL, NULL, N'超级管理员', N'超级管理员', N'50', NULL)
GO
-- ----------------------------
-- Table structure for Category