Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContext.cs

@@ -4,6 +4,8 @@ using Business.Models;
 using Bussiness.Model.MES.IC;
 using Bussiness.Model.Tech;
 using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using Volo.Abp.Data;

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs

@@ -1,4 +1,5 @@
 using Business.Core.Extensions;
+using Business.Model;
 using Business.Models;
 using Bussiness.Model.MES.IC;
 using Bussiness.Model.MES.PO;
@@ -9,6 +10,7 @@ using Bussiness.Model.Tech;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using System;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -583,34 +585,18 @@ namespace Business.EntityFrameworkCore
                 b.ConfigureByConvention();
             });
             //Code generation...
-        }
 
-        public static void DecimalPrecisionAttributeConvention(IMutableEntityType table)
-        {
-            foreach (var col in table.GetProperties())
+            //添加表名字段名描述属性，请放在最后
+            foreach (var entityType in builder.Model.GetEntityTypes())
             {
-                var attribute = col
-                    ?.PropertyInfo
-                    ?.GetCustomAttributes<DecimalPrecisionAttribute>()
-                    ?.FirstOrDefault();
-
-                if (attribute == null)
-                {
-                    continue;
-                }
-
-                if (attribute.Precision < 1 || attribute.Precision > 38)
+                var type = entityType.ClrType;
+                //通过DescriptionAttribute创建字段注释
+                var descriptionAttrs = type.GetProperties().Where(c => c.IsDefined(typeof(DescriptionAttribute), true));
+                foreach (var attr in descriptionAttrs)
                 {
-                    throw new InvalidOperationException("Precision must be between 1 and 38.");
+                    var descriptionAttr = attr.GetCustomAttribute<DescriptionAttribute>();
+                    builder.Entity(type).Property(attr.Name).HasComment(descriptionAttr.Description);
                 }
-
-                if (attribute.Scale > attribute.Precision)
-                {
-                    throw new InvalidOperationException(
-                        "Scale must be between 0 and the Precision value.");
-                }
-
-                col.SetColumnType($"decimal({attribute.Precision}, {attribute.Scale})");
             }
         }
     }

MicroServices/Business/Business.Host/EntityFrameworkCore/BusinessMigrationDbContext.cs

@@ -1,5 +1,8 @@
 using Business.Core.Extensions;
+using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using Volo.Abp.EntityFrameworkCore;

MicroServices/Business/Business.Host/appsettings.json

@@ -4,7 +4,7 @@
   },
   "ConnectionStrings": {
     "Default": "Server=123.60.180.165;Database=DOPCore;Uid=root; Pwd=5heng=uN;",
-    "dopbiz": "Server=123.60.180.165;Database=dopbiz;Uid=root; Pwd=5heng=uN;"
+    "dopbiz": "Server=123.60.180.165;Database=dopbizTest;Uid=root; Pwd=5heng=uN;"
   },
   "Redis": {
     "Configuration": "192.168.1.191"

MicroServices/Business/Bussiness.Model/Base/BaseEntity.cs

@@ -15,49 +15,58 @@ namespace Business.Model
         /// <summary>
         /// 创建人
         /// </summary>
+        [Description("创建人id")]
         public virtual long? create_by { get; set; }
 
         /// <summary>
         /// 创建人名称
         /// </summary>
         [StringLength(50)]
+        [Description("创建人名称")]
         public virtual string? create_by_name { get; set; }
 
         /// <summary>
         /// 创建时间
         /// </summary>
+        [Description("创建时间")]
         public virtual DateTime? create_time { get; set; }
 
         /// <summary>
         /// 修改人
         /// </summary>
+        [Description("修改人")]
         public virtual long? update_by { get; set; }
 
         /// <summary>
         /// 修改人名称
         /// </summary>
         [StringLength(50)]
+        [Description("修改人名称")]
         public virtual string? update_by_name { get; set; }
 
         /// <summary>
         /// 修改时间
         /// </summary>
+        [Description("修改时间")]
         public virtual DateTime? update_time { get; set; }
 
         /// <summary>
         /// 企业ID
         /// </summary>
         [Required]
+        [Description("企业ID")]
         public virtual long tenant_id { get; set; }
 
         /// <summary>
         /// 工厂ID
         /// </summary>
+        [Description("工厂ID")]
         public virtual long? factory_id { get; set; }
 
         /// <summary>
         /// 组织ID
         /// </summary>
+        [Description("组织ID")]
         public virtual long? org_id { get; set; }
 
         /// <summary>
@@ -65,6 +74,7 @@ namespace Business.Model
         /// </summary>
         [Required]
         [DefaultValue(false)]
+        [Description("删除标识")]
         public bool IsDeleted { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/Sale/wms_prdprogress.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -6,35 +7,42 @@ namespace Bussiness.Model.Tech
     /// <summary>
     ///进度字典
     /// </summary>
+    [Description("进度字典表")]
     public class wms_prdprogress: BaseEntity
     {
         /// <summary>
         /// 进度字典id
         /// </summary>
         [Key]
+        [Description("进度字典主键id")]
         public long progress_id { get; set; }
 
         /// <summary>
         /// 进度类型
         /// </summary>
         [StringLength(255)]
-        public string prdprog_type { get; set; }
+        [Description("进度类型")]
+        public string? prdprog_type { get; set; }
 
         /// <summary>
         /// 进度名称
         /// </summary>
         [StringLength(255)]
-        public string prdprog_name { get; set; }
+        [Description("进度名称")]
+        public string? prdprog_name { get; set; }
 
         /// <summary>
         /// 进度顺序
         /// </summary>
         [Required]
+        [Description("进度顺序")]
         public int prdprog_seq { get; set; }
 
         /// <summary>
-        /// 进度状态1启用-1停用
+        /// 进度状态1启用0停用
         /// </summary>
+        [Description("进度状态1启用0停用")]
+        [DefaultValue(true)]
         public bool state { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/Sale/wms_seorder.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -7,177 +8,213 @@ namespace Bussiness.Model.Tech
     /// <summary>
     ///销售订单表
     /// </summary>
+    [Description("销售订单表")]
     public class wms_seorder : BaseEntity
     {
         /// <summary>
         /// 销售订单id
         /// </summary>
         [Key]
+        [Description("销售订单id")]
         public long seorder_id { get; set; }
 
         /// <summary>
         /// 订单编号
         /// </summary>
         [StringLength(50)]
-        public string bill_no { get; set; }
+        [Description("订单编号")]
+        public string? bill_no { get; set; }
 
         /// <summary>
         /// 订单类别（销售、计划）
         /// </summary>
-        public int order_type { get; set; }
+        [Description("订单类别(销售、计划)")]
+        public int? order_type { get; set; }
 
         /// <summary>
         /// 贸易类型
         /// </summary>
-        public int trade_type { get; set; }
+        [Description("贸易类型")]
+        public int? trade_type { get; set; }
 
         /// <summary>
         /// 销售订单类型
         /// </summary>
-        public int sale_style { get; set; }
+        /// </summary>
+        [Description("销售订单类型")]
+        public int? sale_style { get; set; }
 
         /// <summary>
         /// 销售订单类型编码
         /// </summary>
         [StringLength(80)]
-        public string sale_style_no { get; set; }
+        [Description("销售订单类型编码")]
+        public string? sale_style_no { get; set; }
 
         /// <summary>
         /// 客户id
         /// </summary>
-        public int custom_id { get; set; }
+        [Description("客户id")]
+        public int? custom_id { get; set; }
 
         /// <summary>
         /// 客户名称
         /// </summary>
-        public int custom_name { get; set; }
+        [Description("客户名称")]
+        [StringLength(80)]
+        public string? custom_name { get; set; }
 
         /// <summary>
         /// 客户编码
         /// </summary>
         [StringLength(80)]
-        public string custom_no { get; set; }
+        [Description("客户编码")]
+        public string? custom_no { get; set; }
 
         /// <summary>
         /// 客户级别
         /// </summary>
         [StringLength(80)]
-        public string custom_level { get; set; }
+        [Description("客户级别")]
+        public string? custom_level { get; set; }
 
         /// <summary>
         /// 签订日期
         /// </summary>
-        public DateTime date { get; set; }
+        [Description("签订日期")]
+        public DateTime? date { get; set; }
 
         /// <summary>
         /// 采购下单日期
         /// </summary>
-        public DateTime rdate { get; set; }
-  
+        [Description("采购下单日期")]
+        public DateTime? rdate { get; set; }
+
         /// <summary>
         /// 加急级别
         /// </summary>
-        public int urgent { get; set; }
+        [Description("加急级别")]
+        public int? urgent { get; set; }
 
         /// <summary>
         /// 币种
         /// </summary>
         [StringLength(50)]
-        public int currency { get; set; }
+        [Description("币种")]
+        public int? currency { get; set; }
 
         /// <summary>
         /// 汇率
         /// </summary>
         [Precision(20,8)]
-        public decimal exchange_rate { get; set; }
+        [Description("汇率")]
+        public decimal? exchange_rate { get; set; }
 
 
         /// <summary>
         /// 制单人
         /// </summary>
         [StringLength(50)]
-        public string biller { get; set; }
+        [Description("制单人")]
+        public string? biller { get; set; }
 
         /// <summary>
         /// 业务员工号
         /// </summary>
         [StringLength(50)]
-        public string emp_no { get; set; }
+        [Description("业务员工号")]
+        public string? emp_no { get; set; }
 
         /// <summary>
         /// 业务员名称
         /// </summary>
         [StringLength(50)]
-        public string emp_name { get; set; }
+        [Description("业务员名称")]
+        public string? emp_name { get; set; }
 
         /// <summary>
         /// 审核人
         /// </summary>
         [StringLength(50)]
-        public string auditor { get; set; }
+        [Description("审核人")]
+        public string? auditor { get; set; }
 
         /// <summary>
         /// 审核日期
         /// </summary>
-        public DateTime audit_date { get; set; }
+        [Description("审核日期")]
+        public DateTime? audit_date { get; set; }
 
         /// <summary>
-        /// 是否关闭
+        /// 订单状态
         /// </summary>
-        public int status { get; set; }
+        [Description("订单状态")]
+        public int? status { get; set; }
 
         /// <summary>
-        /// 订单状态
+        /// 是否关闭1关闭0未关闭
         /// </summary>
+        [DefaultValue(false)]
+        [Description("是否关闭1关闭0未关闭")]
         public bool closed { get; set; }
 
         /// <summary>
         /// 操作时间
         /// </summary>
-        public DateTime op_time { get; set; }
+        [Description("操作时间")]
+        public DateTime? op_time { get; set; }
 
         /// <summary>
-        /// 项目名称
+        /// 订单来源
         /// </summary>
         [StringLength(255)]
-        public string bill_from { get; set; }
+        [Description("订单来源")]
+        public string? bill_from { get; set; }
 
         /// <summary>
-        /// 提交人id
+        /// 项目名称
         /// </summary>
-        public long project_name { get; set; }
+        [Description("项目名称")]
+        [StringLength(255)]
+        public string? project_name { get; set; }
 
         /// <summary>
         /// 项目编号
         /// </summary>
         [StringLength(255)]
-        public string project_code { get; set; }
+        [Description("项目编号")]
+        public string? project_code { get; set; }
 
         /// <summary>
         /// 销售出库类型
         /// </summary>
-        public int out_stock_type { get; set; }
+        [Description("销售出库类型")]
+        public int? out_stock_type { get; set; }
 
         /// <summary>
         /// 销售部门id
         /// </summary>
-        public long sale_dept_id { get; set; }
+        [Description("销售部门id")]
+        public long? sale_dept_id { get; set; }
 
         /// <summary>
         /// 销售部门名称
         /// </summary>
         [StringLength(80)]
-        public string sale_dept_name { get; set; }
+        [Description("销售部门名称")]
+        public string? sale_dept_name { get; set; }
 
         /// <summary>
         /// 销售部门编号
         /// </summary>
-        [StringLength(255)]
-        public string sale_dept_code { get; set; }
+        [StringLength(80)]
+        [Description("销售部门编号")]
+        public string? sale_dept_code { get; set; }
 
         /// <summary>
         /// 创建部门id
         /// </summary>
-        public long create_dept { get; set; }
+        [Description("创建部门id")]
+        public long? create_dept { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/Sale/wms_seorderentry.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -7,6 +8,7 @@ namespace Bussiness.Model.Tech
     /// <summary>
     ///销售订单明细表
     /// </summary>
+    [Description("销售订单明细表")]
     public class wms_seorderentry : BaseEntity
     {
         /// <summary>

MicroServices/Business/Bussiness.Model/SystemData/sys_code.cs

@@ -1,49 +1,57 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Bussiness.Model.SystemData
 {
     /// <summary>
     /// 系统编码表
     /// </summary>
+    [Description("系统编码表")]
     public class sys_code
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long sys_code_id { get; set; }
 
         /// <summary>
         /// 编码生成名称
         /// </summary>
         [StringLength(50)]
-         [Required]
-        public string code_name { get; set; }
+        [Required]
+        [Description("编码生成名称")]
+        public string? code_name { get; set; }
 
         /// <summary>
         /// 编码生成规则
         /// </summary>
         [Required]
         [StringLength(50)]
-        public string code_rule { get; set; }
+        [Description("编码生成规则")]
+        public string? code_rule { get; set; }
 
         /// <summary>
         /// 编码生成时间
         /// </summary>
         [Required]
+        [Description("编码生成时间")]
         public DateTime code_date { get; set; }
 
         /// <summary>
         /// 编码生成当前值
         /// </summary>
         [Required]
+        [Description("编码生成当前值")]
         public long code_value { get; set; }
 
         /// <summary>
         /// 中文注释
         /// </summary>
         [StringLength(255)]
+        [Description("中文注释")]
         public string chinese_name { get; set; }
-
     }
 }

MicroServices/Business/Bussiness.Model/SystemData/sys_post.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -6,62 +7,74 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// 岗位表
     /// </summary>
+    [Description("岗位表")]
     public class sys_post: BaseEntity
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long post_id { get; set; }
 
         /// <summary>
         /// 岗位编码
         /// </summary>
         [StringLength(50)]
-        public string post_code { get; set; }
+        [Description("岗位编码")]
+        public string? post_code { get; set; }
 
         /// <summary>
         /// 岗位名称
         /// </summary>
         [StringLength(255)]
-        public string post_name { get; set; }
+        [Description("岗位名称")]
+        public string? post_name { get; set; }
 
         /// <summary>
         /// 岗位备注
         /// </summary>
         [StringLength(255)]
-        public string post_remark { get; set; }
+        [Description("岗位备注")]
+        public string? post_remark { get; set; }
 
         /// <summary>
         /// 岗位级别
         /// </summary>
-        public int post_level { get; set; }
+        [Description("岗位级别")]
+        public int? post_level { get; set; }
 
         /// <summary>
         /// 岗位路径
         /// </summary>
         [StringLength(255)]
-        public string post_path { get; set; }
+        [Description("岗位路径")]
+        public string? post_path { get; set; }
 
         /// <summary>
         /// 岗位排序
         /// </summary>
-        public int post_sort { get; set; }
+        [Description("岗位排序")]
+        public int? post_sort { get; set; }
 
         /// <summary>
         /// 上级岗位
         /// </summary>
-        public long parent_id { get; set; }
+        [Description("上级岗位")]
+        public long? parent_id { get; set; }
 
         /// <summary>
         /// 部门id
         /// </summary>
-        public long dept_id { get; set; }
+        [Description("部门id")]
+        public long? dept_id { get; set; }
 
         /// <summary>
         /// 数据状态标识 1启用 0停用
         /// </summary>
         [StringLength(255)]
+        [Description("数据状态标识 1启用 -1停用")]
+        [DefaultValue(true)]
         public bool state { get; set; }
     }
 }