更新MybatisPlusSaasConfig中的租户ID默认值为1002;在ShiroConfig中添加MES密炼物料管理和系统分类字典的免密接口;在MesMixerMaterialController中实现密炼物料信息的免密增删改查接口,并添加相应的事件广播功能;在SysCategoryController中新增分类字典的免密查询接口;更新前端导航和菜单数据以支持密炼物料信息模块。
This commit is contained in:
38
yy-admin-master/YY.Admin.Core/Entity/JeecgSysCategoryItem.cs
Normal file
38
yy-admin-master/YY.Admin.Core/Entity/JeecgSysCategoryItem.cs
Normal file
@@ -0,0 +1,38 @@
|
||||
namespace YY.Admin.Core.Entity;
|
||||
|
||||
/// <summary>
|
||||
/// Jeecg 分类字典镜像表
|
||||
/// </summary>
|
||||
[SugarTable("jeecg_sys_category_item", "Jeecg分类字典镜像表")]
|
||||
[SysTable]
|
||||
[SugarIndex("index_{table}_PC", nameof(Pid), OrderByType.Asc, nameof(Code), OrderByType.Asc)]
|
||||
public class JeecgSysCategoryItem
|
||||
{
|
||||
[SugarColumn(IsPrimaryKey = true, ColumnDescription = "主键ID", Length = 64)]
|
||||
public string Id { get; set; } = string.Empty;
|
||||
|
||||
[SugarColumn(ColumnDescription = "父ID", Length = 64)]
|
||||
public string? Pid { get; set; }
|
||||
|
||||
[SugarColumn(ColumnDescription = "分类名称", Length = 128)]
|
||||
public string? Name { get; set; }
|
||||
|
||||
[SugarColumn(ColumnDescription = "分类编码", Length = 128)]
|
||||
public string? Code { get; set; }
|
||||
|
||||
[SugarColumn(ColumnDescription = "是否有子节点", Length = 1)]
|
||||
public string? HasChild { get; set; }
|
||||
|
||||
[SugarColumn(ColumnDescription = "创建人", Length = 64)]
|
||||
public string? CreateBy { get; set; }
|
||||
|
||||
[SugarColumn(ColumnDescription = "创建时间")]
|
||||
public DateTime? CreateTime { get; set; }
|
||||
|
||||
[SugarColumn(ColumnDescription = "更新人", Length = 64)]
|
||||
public string? UpdateBy { get; set; }
|
||||
|
||||
[SugarColumn(ColumnDescription = "更新时间")]
|
||||
public DateTime? UpdateTime { get; set; }
|
||||
}
|
||||
|
||||
40
yy-admin-master/YY.Admin.Core/Entity/MesMixerMaterial.cs
Normal file
40
yy-admin-master/YY.Admin.Core/Entity/MesMixerMaterial.cs
Normal file
@@ -0,0 +1,40 @@
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace YY.Admin.Core.Entity;
|
||||
|
||||
public class MesMixerMaterial
|
||||
{
|
||||
public string? Id { get; set; }
|
||||
public string? MaterialCode { get; set; }
|
||||
public string? MaterialName { get; set; }
|
||||
public string? ErpCode { get; set; }
|
||||
public string? MajorCategoryId { get; set; }
|
||||
public string? MinorCategoryId { get; set; }
|
||||
public string? MaterialDesc { get; set; }
|
||||
public string? AliasName { get; set; }
|
||||
public int? FeedManageStatus { get; set; }
|
||||
public int? UseStatus { get; set; }
|
||||
public double? SpecificGravity { get; set; }
|
||||
public int? ShelfLifeDays { get; set; }
|
||||
public int? MinBakeMinutes { get; set; }
|
||||
public double? TotalSafetyStockKg { get; set; }
|
||||
public double? QualifiedSafetyStockKg { get; set; }
|
||||
public string? Remark { get; set; }
|
||||
public int? TenantId { get; set; }
|
||||
public string? SysOrgCode { get; set; }
|
||||
public string? CreateBy { get; set; }
|
||||
public DateTime? CreateTime { get; set; }
|
||||
public string? UpdateBy { get; set; }
|
||||
public DateTime? UpdateTime { get; set; }
|
||||
public int? DelFlag { get; set; }
|
||||
|
||||
[JsonPropertyName("majorCategoryId_dictText")]
|
||||
public string? MajorCategoryText { get; set; }
|
||||
|
||||
[JsonPropertyName("minorCategoryId_dictText")]
|
||||
public string? MinorCategoryText { get; set; }
|
||||
|
||||
public string FeedManageStatusText => FeedManageStatus == 1 ? "在投管" : "未投管";
|
||||
public string UseStatusText => UseStatus == 1 ? "使用中" : "停用";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user