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

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

@@ -25,25 +25,25 @@ namespace Business.EntityFrameworkCore
         {
             //TODO：这样太麻烦了，有时间研究一下批量
             Check.NotNull(builder, nameof(builder));
-            builder.Entity<Book>(b =>
-            {
-                b.ToTable("Book");
+            //builder.Entity<Book>(b =>
+            //{
+            //    b.ToTable("Book");
 
-                b.ConfigureByConvention();
+            //    b.ConfigureByConvention();
 
-                b.Property(x => x.Name).IsRequired();
+            //    b.Property(x => x.Name).IsRequired();
 
         
-            });
+            //});
 
-            builder.Entity<PrintTemplate>(b =>
-            {
-                b.ToTable("base_print_template");
+            //builder.Entity<PrintTemplate>(b =>
+            //{
+            //    b.ToTable("base_print_template");
 
-                b.ConfigureByConvention();
+            //    b.ConfigureByConvention();
                 
-                b.Property(x => x.Name).IsRequired();
-            });
+            //    b.Property(x => x.Name).IsRequired();
+            //});
 
             builder.Entity<ic_bom>(b =>
             {

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

@@ -1,5 +1,4 @@
 using Business.Core.Extensions;
-using Business.Model;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel;
@@ -22,9 +21,9 @@ namespace Business.EntityFrameworkCore
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             base.OnModelCreating(modelBuilder);
-            
-            modelBuilder.ConfigureForm();
-            modelBuilder.ConfigureFlow();
+            //改用低代码平台的表单流程
+            //modelBuilder.ConfigureForm();
+            //modelBuilder.ConfigureFlow();
             modelBuilder.ConfigureBusiness();
         }
     }

MicroServices/Business/Business.sln

@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.HttpApi.Client", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bussiness.Model", "Bussiness.Model\Bussiness.Model.csproj", "{D9A37E35-A3BD-4A11-A3D8-571586EB2007}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business.Core", "Business.Core\Business.Core.csproj", "{EFA46C37-CF8B-425D-8DE3-85FE11116980}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.Core", "Business.Core\Business.Core.csproj", "{EFA46C37-CF8B-425D-8DE3-85FE11116980}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

MicroServices/Business/Bussiness.Model/Bussiness - Backup.Model.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Validation" Version="6.0.0" />
-  </ItemGroup>
-
-</Project>

MicroServices/Business/Bussiness.Model/Production/mes_moentry.cs

@@ -2,6 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -18,44 +19,58 @@ namespace Bussiness.Model.Production
         /// 生产工单子表id
         /// </summary>
         [Key]
+        [Description("生产工单子表id")]
         public long moentry_id { get; set; }
         /// <summary>
         /// 工单主表id
         /// </summary>
+        [Description("工单主表id")]
         public long moentry_moid { get; set; }
         /// <summary>
         /// 工单编号
         /// </summary>
+        [StringLength(80)]
+        [Description("工单编号")]
         public string moentry_mono { get; set; }
         /// <summary>
         /// 订单行id
         /// </summary>
+        [Description("订单行id")]
         public long soentry_id { get; set; }
         /// <summary>
         /// 订单行号
         /// </summary>
+        [Description("订单行号")]
         public long fentry_id { get; set; }
         /// <summary>
         /// 订单编号
         /// </summary>
+        [StringLength(80)]
+        [Description("订单编号")]
         public string fbill_no { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
+        [StringLength(80)]
+        [Description("单位")]
         public string unit { get; set; }
         /// <summary>
         /// 工单生产数量(计划数量)
         /// </summary>
+        [Precision(20, 8)]
+        [Description("工单生产数量(计划数量)")]
         public decimal? morder_production_number { get; set; }
         /// <summary>
         /// 需求数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("需求数量")]
         public decimal? need_number { get; set; }
         /// <summary>
         /// 剩余可用数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("剩余可用数量")]
         public decimal? remaining_number { get; set; }
 
     }

MicroServices/Business/Bussiness.Model/Production/mes_mooccupy.cs

@@ -1,6 +1,8 @@
 using Business.Model;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -17,87 +19,116 @@ namespace Bussiness.Model.Production
         /// 工单占用ID
         /// </summary>
         [Key]
+        [Description("工单占用ID")]
         public long moo_id { get; set; }
 
         /// <summary>
         /// 类型--原始,分配
         /// </summary>
+        [StringLength(50)]
+        [Description("类型--原始,分配")]
         public string moo_id_type { get; set; }
 
         /// <summary>
         /// 订单id
         /// </summary>
+        [Description("订单id")]
         public long moo_id_billid { get; set; }
 
         /// <summary>
         /// 订单号
         /// </summary>
+        [StringLength(50)]
+        [Description("订单号")]
         public string fbill_no { get; set; }
 
         /// <summary>
         /// 行号
         /// </summary>
+        [Description("行号")]
         public long fentry_id { get; set; }
 
         /// <summary>
         /// 物料编码
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("物料编码")]
         public string fitem_number { get; set; }
 
         /// <summary>
         /// 物料名称
         /// </summary>
+        [Required]
+        [StringLength(500)]
+        [Description("物料名称")]
         public string fitem_name { get; set; }
 
         /// <summary>
         /// 规格型号
         /// </summary>
+        [StringLength(500)]
+        [Description("规格型号")]
         public string fmodel { get; set; }
 
         /// <summary>
         /// 工单id
         /// </summary>
+        [Description("工单id")]
         public long moo_moid { get; set; }
 
         /// <summary>
         /// 工单号
         /// </summary>
+        [StringLength(50)]
+        [Description("工单号")]
         public string moo_mo { get; set; }
 
         /// <summary>
         /// 占用量
         /// </summary>
+        [Precision(20, 8)]
+        [Description("占用量")]
         public decimal? moo_qty { get; set; }
 
         /// <summary>
         /// 开始时间
         /// </summary>
-        public DateTime moo_stime { get; set; }
+        [Description("开始时间")]
+        public DateTime? moo_stime { get; set; }
 
         /// <summary>
         /// 结束时间
         /// </summary>
-        public DateTime moo_etime { get; set; }
+        [Description("结束时间")]
+        public DateTime? moo_etime { get; set; }
 
         /// <summary>
         /// 占用状态-1占用  默认0
         /// </summary>
+        [DefaultValue(0)]
+        [Description("占用状态-1占用  默认0")]
         public int moo_state { get; set; }
 
         /// <summary>
         /// 变更人
         /// </summary>
-        public string moo_cbr { get; set; }
+        [StringLength(50)]
+        [Description("变更人")]
+        public string? moo_cbr { get; set; }
 
         /// <summary>
         /// 变更时间
         /// </summary>
-        public DateTime moo_ctime { get; set; }
+        [Description("变更时间")]
+        public DateTime? moo_ctime { get; set; }
 
         /// <summary>
         /// 变更原因
         /// </summary>
-        public string moo_creason { get; set; }
+        [StringLength(500)]
+        [Description("变更原因")]
+        public string? moo_creason { get; set; }
 
     }
 }

MicroServices/Business/Bussiness.Model/Production/mes_morder.cs

@@ -1,6 +1,8 @@
 using Business.Model;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -18,127 +20,174 @@ namespace Bussiness.Model.Production
         /// 生产工单id
         /// </summary>
         [Key]
+        [Description("生产工单id")]
         public long morder_id { get; set; }
         /// <summary>
         /// 上级工单id
         /// </summary>
-        public long parent_id { get; set; }
+        [Description("上级工单id")]
+        public long? parent_id { get; set; }
         /// <summary>
         /// 关联工单id
         /// </summary>
-        public long relation_moid { get; set; }
+        [Description("关联工单id")]
+        public long? relation_moid { get; set; }
         /// <summary>
         /// 关联编号
-        /// </summary>
-        public string relation_mono { get; set; }
+        /// </summary>   
+        [StringLength(50)]
+        [Description("关联编号")]
+        public string? relation_mono { get; set; }
         /// <summary>
         /// 生产工单编号
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("生产工单编号")]
         public string morder_no { get; set; }
         /// <summary>
         /// 生产工单类型(类型：计划工单、销售工单、委外工单、预测工单)
         /// </summary>
-        public string morder_type { get; set; }
+        [StringLength(50)]
+        [Description("生产工单类型(类型：计划工单、销售工单、委外工单、预测工单)")]
+        public string? morder_type { get; set; }
         /// <summary>
         /// 工单所属物料类型
         /// </summary>
-        public string morder_icitem_type { get; set; }
+        [StringLength(255)]
+        [Description("工单所属物料类型")]
+        public string? morder_icitem_type { get; set; }
         /// <summary>
         /// 工单类型(类型：发货工单、试产工单、备库工单、常规工单、返工工单)
         /// </summary>
-        public string work_order_type { get; set; }
+        [StringLength(255)]
+        [Description("工单类型(类型：发货工单、试产工单、备库工单、常规工单、返工工单)")]
+        public string? work_order_type { get; set; }
         /// <summary>
         /// 生产工单日期
         /// </summary>
+        [Description("生产工单日期")]
         public  DateTime? morder_date { get; set; }
         /// <summary>
         /// 生产工单状态(订单状态:初始，下达，暂停、完成)
         /// </summary>
-        public string morder_state { get; set; }
+        [StringLength(50)]
+        [Description("生产工单状态(订单状态:初始，下达，暂停、完成)")]
+        public string? morder_state { get; set; }
         /// <summary>
         /// 生产组织id
         /// </summary>
-        public long moentry_prd { get; set; }
+        [Description("生产组织id")]
+        public long? moentry_prd { get; set; }
         /// <summary>
         /// 生产组织名称
         /// </summary>
-        public string moentry_prdname { get; set; }
+        [StringLength(50)]
+        [Description("生产组织名称")]
+        public string? moentry_prdname { get; set; }
         /// <summary>
         /// 工作中心id
         /// </summary>
-        public long moentry_wrkc { get; set; }
+        [Description("工作中心id")]
+        public long? moentry_wrkc { get; set; }
         /// <summary>
         /// 工作中心名称
         /// </summary>
-        public string moentry_wrkcname { get; set; }
+        [StringLength(50)]
+        [Description("工作中心名称")]
+        public string? moentry_wrkcname { get; set; }
         /// <summary>
         /// 计划员工号
         /// </summary>
-        public string planner_num { get; set; }
+        [StringLength(80)]
+        [Description("计划员工号")]
+        public string? planner_num { get; set; }
         /// <summary>
         /// 计划员名称
         /// </summary>
-        public string planner_name { get; set; }
+        [StringLength(80)]
+        [Description("计划员名称")]
+        public string? planner_name { get; set; }
         /// <summary>
         /// 生产工单开始日期
         /// </summary>
+        [Description("生产工单开始日期")]
         public DateTime? moentry_stime { get; set; }
         /// <summary>
         /// 生产工单结束日期
         /// </summary>
+        [Description("生产工单结束日期")]
         public DateTime? moentry_etime { get; set; }
         /// <summary>
         /// 系统建议开工时间
         /// </summary>
+        [Description("系统建议开工时间")]
         public DateTime? moentry_sys_stime { get; set; }
         /// <summary>
         /// 系统建议完工时间
         /// </summary>
+        [Description("系统建议完工时间")]
         public DateTime? moentry_sys_etime { get; set; }
         /// <summary>
         /// 实际开始时间
         /// </summary>
+        [Description("实际开始时间")]
         public DateTime? reality_start_time { get; set; }
         /// <summary>
         /// 实际结束时间
         /// </summary>
+        [Description("实际结束时间")]
         public DateTime? reality_end_time { get; set; }
         /// <summary>
         /// 计划员设定开始时间
         /// </summary>
+        [Description("计划员设定开始时间")]
         public DateTime? planner_start_date { get; set; }
         /// <summary>
         /// 计划员设定结束时间
         /// </summary>
+        [Description("计划员设定结束时间")]
         public DateTime? planner_end_date { get; set; }
         /// <summary>
         /// 基于物料开始时间
         /// </summary>
+        [Description("基于物料开始时间")]
         public DateTime? mat_start_date { get; set; }
         /// <summary>
         /// 基于物料结束时间
         /// </summary>
+        [Description("基于物料结束时间")]
         public DateTime? mat_end_date { get; set; }
         /// <summary>
         /// 产品代码
         /// </summary>
-        public string product_code { get; set; }
+        [StringLength(80)]
+        [Description("产品代码")]
+        public string? product_code { get; set; }
         /// <summary>
         /// 产品名称
         /// </summary>
-        public string product_name { get; set; }
+        [StringLength(500)]
+        [Description("产品名称")]
+        public string? product_name { get; set; }
         /// <summary>
         /// fms旧料号
         /// </summary>
-        public string fms_number { get; set; }
+        [StringLength(80)]
+        [Description("fms旧料号")]
+        public string? fms_number { get; set; }
         /// <summary>
         /// 规格型号
         /// </summary>
-        public string fmodel { get; set; }
+        [StringLength(500)]
+        [Description("规格型号")]
+        public string? fmodel { get; set; }
         /// <summary>
         /// bom编码
         /// </summary>
-        public string bom_number { get; set; }
+        [StringLength(80)]
+        [Description("bom编码")]
+        public string? bom_number { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
@@ -146,10 +195,14 @@ namespace Bussiness.Model.Production
         /// <summary>
         /// 工单进度
         /// </summary>
-        public string morder_progress { get; set; }
+        [StringLength(1000)]
+        [Description("工单进度")]
+        public string? morder_progress { get; set; }
         /// <summary>
         /// 工单所需工时
         /// </summary>
+        [Precision(20, 8)]
+        [Description("工单所需工时")]
         public decimal? morder_need_time { get; set; }
         /// <summary>
         /// 工单生产数量(计划数量)
@@ -166,66 +219,91 @@ namespace Bussiness.Model.Production
         /// <summary>
         /// 报工数量
         /// </summary>
+        [Precision(20, 8)]
+        [Description("报工数量")]
         public decimal? work_number { get; set; }
         /// <summary>
         /// 报检数量
         /// </summary>
+        [Precision(20, 8)]
+        [Description("报检数量")]
         public decimal? inspection_number { get; set; }
         /// <summary>
         /// 合格数量
         /// </summary>
+        [Precision(20, 8)]
+        [Description("合格数量")]
         public decimal? qualified_number { get; set; }
         /// <summary>
         /// 入库数量
         /// </summary>
+        [Precision(20, 8)]
+        [Description("入库数量")]
         public decimal? inventory_number { get; set; }
-        /// <summary>
-        /// 扩展
-        /// </summary>
-        public string ext { get; set; }
+        ///// <summary>
+        ///// 扩展
+        ///// </summary>
+        //public string ext { get; set; }
         /// <summary>
         /// 已开入库通知单数量
         /// </summary>
+        [Precision(20, 8)]
+        [Description("已开入库通知单数量")]
         public decimal? notice_qty { get; set; }
         /// <summary>
         /// 启动状态
         /// </summary>
-        public int moentry_startup_status { get; set; }
+        [Description("启动状态")]
+        public int? moentry_startup_status { get; set; }
         /// <summary>
         /// 开始时间
         /// </summary>
+        [Description("开始时间")]
         public DateTime? start_time { get; set; }
         /// <summary>
         /// 最近暂停时间
         /// </summary>
+        [Description("最近暂停时间")]
         public DateTime? pause_time { get; set; }
         /// <summary>
         /// 最近重启时间
         /// </summary>
+        [Description("最近重启时间")]
         public DateTime? restart_time { get; set; }
         /// <summary>
         /// 项目名称
         /// </summary>
-        public string project_name { get; set; }
+        [StringLength(255)]
+        [Description("项目名称")]
+        public string? project_name { get; set; }
         /// <summary>
         /// 逾期原因备注
         /// </summary>
-        public string overdue_Remark { get; set; }
+        [StringLength(255)]
+        [Description("逾期原因备注")]
+        public string? overdue_Remark { get; set; }
         /// <summary>
         /// 已领料数量
         /// </summary>
+        [Precision(20, 8)]
+        [Description("已领料数量")]
         public decimal? picking_qty { get; set; }
         /// <summary>
         /// 前状态--计划、下达、完成、关闭
         /// </summary>
-        public string morder_fstate { get; set; }
+        [StringLength(50)]
+        [Description("前状态--计划、下达、完成、关闭")]
+        public string? morder_fstate { get; set; }
         /// <summary>
         /// 工单批号--(批号管理的物料出入库要使用)
         /// </summary>
-        public string morder_batchno { get; set; }
+        [StringLength(100)]
+        [Description("工单批号--(批号管理的物料出入库要使用)")]
+        public string? morder_batchno { get; set; }
         /// <summary>
         /// 下达日期
         /// </summary>
+        [Description("下达日期")]
         public DateTime? convey_date { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/Production/mes_morder_loss_time.cs

@@ -1,6 +1,8 @@
 using Business.Model;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -11,85 +13,121 @@ namespace Bussiness.Model.Production
     /// <summary>
     /// 工单损失时间表
     /// </summary>
-    public class mes_morder_loss_time :BaseEntity
+    public class mes_morder_loss_time : BaseEntity
     {
         /// <summary>
         /// 主键
         /// </summary>
         [Key]
+        [Description("工单损失时间主键")]
         public long id { get; set; }
         /// <summary>
         /// 生产工单id
         /// </summary>
+        [Description("生产工单id")]
         public long morder_id { get; set; }
         /// <summary>
         /// 生产工单编号
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("生产工单编号")]
         public string morder_no { get; set; }
         /// <summary>
         /// 生产工单行号
         /// </summary>
+        [Required]
+        [Description("生产工单编号")]
         public int morder_no_row { get; set; }
         /// <summary>
         /// 损失开始时间
         /// </summary>
+        [Description("损失开始时间")]
         public DateTime start_time { get; set; }
         /// <summary>
         /// 损失结束时间
         /// </summary>
+        [Description("损失结束时间")]
         public DateTime end_time { get; set; }
         /// <summary>
         /// 记录人id
         /// </summary>
+        [Description("记录人id")]
         public long recorder_id { get; set; }
         /// <summary>
         /// 记录人名称
         /// </summary>
+        [Required]
+        [StringLength(255)]
+        [Description("记录人名称")]
         public string recorder_name { get; set; }
         /// <summary>
         /// 人员数量
         /// </summary>
+        [Precision(20, 8)]
+        [Description("人员数量")]
         public decimal staff_qty { get; set; }
         /// <summary>
         /// 损失时间（用户输入）
         /// </summary>
+        [Precision(20, 8)]
+        [Description("损失时间（用户输入）")]
         public decimal loss_work_hours { get; set; }
         /// <summary>
         /// 系统计算损失时间
         /// </summary>
+        [Precision(20, 8)]
+        [Description("系统计算损失时间")]
         public decimal sys_loss_time { get; set; }
         /// <summary>
         /// 工作中心id
         /// </summary>
+        [Description("工作中心id")]
         public long workc_id { get; set; }
         /// <summary>
         /// 工作中心名称
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("工作中心名称")]
         public string workc_name { get; set; }
         /// <summary>
         /// 责任单位id
         /// </summary>
+        [Description("责任单位id")]
         public long dept_id { get; set; }
         /// <summary>
         /// 责任单位名称
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("责任单位名称")]
         public string dept_name { get; set; }
         /// <summary>
         /// 损失时间原因
         /// </summary>
+        [Required]
+        [StringLength(255)]
+        [Description("损失时间原因")]
         public string reason { get; set; }
         /// <summary>
         /// 描述
         /// </summary>
-        public string description { get; set; }
+        [StringLength(255)]
+        [Description("描述")]
+        public string? description { get; set; }
         /// <summary>
         /// 是否停产（0未停产，1停产）
         /// </summary>
+        [DefaultValue(0)]
+        [Description("是否停产（0未停产，1停产）")]
         public int is_stop_production { get; set; }
         /// <summary>
         /// 用工卡号
         /// </summary>
-        public string card_no { get; set; }
+        [StringLength(50)]
+        [Description("用工卡号")]
+        public string? card_no { get; set; }
         
     }
 }

MicroServices/Business/Bussiness.Model/Production/mes_oorder.cs

@@ -1,6 +1,8 @@
 using Business.Model;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -17,155 +19,217 @@ namespace Bussiness.Model.Production
         /// 委外订单id
         /// </summary>
         [Key]
+        [Description("委外订单id")]
         public long oorder_id { get; set; }
         /// <summary>
         /// 生产工单编号
         /// </summary>
-        public string oorder_no { get; set; }
+        [StringLength(50)]
+        [Description("生产工单编号")]
+        public string? oorder_no { get; set; }
         /// <summary>
         /// 生产工单类型
         /// </summary>
-        public string oorder_type { get; set; }
+        [StringLength(80)]
+        [Description("生产工单类型")]
+        public string? oorder_type { get; set; }
         /// <summary>
-        /// 日期
+        /// 委外订单日期
         /// </summary>
+        [Description("委外订单日期")]
         public DateTime? oorder_date { get; set; }
         /// <summary>
         /// 订单状态
         /// </summary>
-        public string oorder_state { get; set; }
+        [StringLength(50)]
+        [Description("订单状态")]
+        public string? oorder_state { get; set; }
         /// <summary>
         /// 生产组织
         /// </summary>
-        public long ooentry_prd { get; set; }
+        [Description("生产组织")]
+        public long? ooentry_prd { get; set; }
         /// <summary>
         /// 生产组织名称
         /// </summary>
-        public string ooentry_prdname { get; set; }
+        [StringLength(50)]
+        [Description("生产组织名称")]
+        public string? ooentry_prdname { get; set; }
         /// <summary>
-        /// 工作中心
+        /// 工作中心id
         /// </summary>
-        public long ooentry_wrkc { get; set; }
+        [Description("工作中心id")]
+        public long? ooentry_wrkc { get; set; }
         /// <summary>
         /// 工作中心名称
         /// </summary>
-        public string ooentry_wrkcname { get; set; }
+        [StringLength(50)]
+        [Description("工作中心名称")]
+        public string? ooentry_wrkcname { get; set; }
         /// <summary>
         /// 计划员工号
         /// </summary>
-        public string planner_num { get; set; }
+        [StringLength(80)]
+        [Description("计划员工号")]
+        public string? planner_num { get; set; }
         /// <summary>
         /// 计划员名称
         /// </summary>
-        public string planner_name { get; set; }
+        [StringLength(80)]
+        [Description("计划员名称")]
+        public string? planner_name { get; set; }
         /// <summary>
         /// 计划开工日期
         /// </summary>
+        [Description("计划开工日期")]
         public DateTime? ooentry_stime { get; set; }
         /// <summary>
         /// 计划完工日期
         /// </summary>
+        [Description("计划完工日期")]
         public DateTime? ooentry_etime { get; set; }
         /// <summary>
         /// 产品代码
         /// </summary>
-        public string product_code { get; set; }
+        [StringLength(80)]
+        [Description("产品代码")]
+        public string? product_code { get; set; }
         /// <summary>
         /// fms旧料号
         /// </summary>
-        public string ffms_number { get; set; }
+        [StringLength(80)]
+        [Description("fms旧料号")]
+        public string? ffms_number { get; set; }
         /// <summary>
         /// 产品名称
         /// </summary>
-        public string product_name { get; set; }
+        [StringLength(500)]
+        [Description("产品名称")]
+        public string? product_name { get; set; }
         /// <summary>
         /// 规格型号
         /// </summary>
-        public string specification_model { get; set; }
+        [StringLength(500)]
+        [Description("规格型号")]
+        public string? specification_model { get; set; }
         /// <summary>
         /// bom编码
         /// </summary>
-        public string bom_number { get; set; }
+        [StringLength(80)]
+        [Description("bom编码")]
+        public string? bom_number { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
-        public string unit { get; set; }
+        [StringLength(80)]
+        [Description("单位")]
+        public string? unit { get; set; }
         /// <summary>
         /// 工单进度
         /// </summary>
-        public string morder_progress { get; set; }
+        [StringLength(500)]
+        [Description("工单进度")]
+        public string? morder_progress { get; set; }
         /// <summary>
         /// 工单生产数量(计划数量)
         /// </summary>
-        public decimal morder_production_number { get; set; }
+        [Precision(20, 10)]
+        [Description("工单生产数量(计划数量)")]
+        public decimal? morder_production_number { get; set; }
         /// <summary>
         /// 需求数量
         /// </summary>
-        public decimal need_number { get; set; }
+        [Precision(20, 10)]
+        [Description("需求数量")]
+        public decimal? need_number { get; set; }
         /// <summary>
         /// 剩余可用数量
         /// </summary>
-        public decimal remaining_number { get; set; }
+        [Precision(20, 10)]
+        [Description("剩余可用数量")]
+        public decimal? remaining_number { get; set; }
         /// <summary>
         /// 报工数量
         /// </summary>
-        public decimal work_number { get; set; }
+        [Precision(20, 8)]
+        [Description("报工数量")]
+        public decimal? work_number { get; set; }
         /// <summary>
         /// 报检数量
         /// </summary>
-        public decimal inspection_number { get; set; }
+        [Precision(20, 8)]
+        [Description("报检数量")]
+        public decimal? inspection_number { get; set; }
         /// <summary>
         /// 合格数量
         /// </summary>
-        public decimal qualified_number { get; set; }
+        [Precision(20, 8)]
+        [Description("合格数量")]
+        public decimal? qualified_number { get; set; }
         /// <summary>
         /// 入库数量
         /// </summary>
-        public decimal inventory_number { get; set; }
+        [Precision(20, 8)]
+        [Description("入库数量")]
+        public decimal? inventory_number { get; set; }
         /// <summary>
         /// 已开通知单数量
         /// </summary>
-        public decimal notice_qty { get; set; }
+        [Precision(20, 8)]
+        [Description("已开通知单数量")]
+        public decimal? notice_qty { get; set; }
         /// <summary>
         /// 启动状态
         /// </summary>
-        public int moentry_on { get; set; }
+        [Description("启动状态")]
+        public int? moentry_on { get; set; }
         /// <summary>
         /// 开始时间
         /// </summary>
+        [Description("开始时间")]
         public DateTime? start_time { get; set; }
         /// <summary>
         /// 最近暂停时间
         /// </summary>
+        [Description("最近暂停时间")]
         public DateTime? pause_time { get; set; }
         /// <summary>
         /// 最近重启时间
         /// </summary>
+        [Description("最近重启时间")]
         public DateTime? restart_time { get; set; }
-        /// <summary>
-        /// 扩展
-        /// </summary>
-        public string ext { get; set; }
+        ///// <summary>
+        ///// 扩展
+        ///// </summary>
+        //public string ext { get; set; }
         /// <summary>
         /// 项目名称
         /// </summary>
-        public string project_name { get; set; }
+        [StringLength(255)]
+        [Description("项目名称")]
+        public string? project_name { get; set; }
         /// <summary>
         /// 发料状态 1-待发料  2-已发料
         /// </summary>
-        public int sent_status { get; set; }
+        [Description("发料状态 1-待发料  2-已发料")]
+        public int? sent_status { get; set; }
         /// <summary>
         /// 加工单位
         /// </summary>
-        public string production_unit { get; set; }
+        [StringLength(100)]
+        [Description("加工单位")]
+        public string? production_unit { get; set; }
         /// <summary>
         /// 加工单位编码
         /// </summary>
-        public string production_unit_code { get; set; }
+        [StringLength(20)]
+        [Description("加工单位编码")]
+        public string? production_unit_code { get; set; }
         /// <summary>
         /// 所需物料是否充足  1-充足 0-缺料
         /// </summary>
-        public int need_icitem_status { get; set; }
+        [Description("加工单位编码")]
+        public int? need_icitem_status { get; set; }
 
     }
 }

MicroServices/Business/Bussiness.Model/Production/mes_schedule_occupy.cs

@@ -1,6 +1,8 @@
 using Business.Model;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -14,41 +16,53 @@ namespace Bussiness.Model.Production
     public class mes_schedule_occupy : BaseEntity
     {
         /// <summary>
-        /// 主键id
+        /// 排程时间占用记录id
         /// </summary>
         [Key]
+        [Description("排程时间占用记录id")]
         public long id { get; set; }
         /// <summary>
         /// 开始时间
         /// </summary>
-        public DateTime start_time { get; set; }
+        [Description("开始时间")]
+        public DateTime? start_time { get; set; }
         /// <summary>
         /// 结束时间
         /// </summary>
-        public DateTime end_time { get; set; }
+        [Description("结束时间")]
+        public DateTime? end_time { get; set; }
         /// <summary>
         /// 工作时长(h)
         /// </summary>
-        public decimal working_minute { get; set; }
+        [Precision(20, 8)]
+        [Description("工作时长(h)")]
+        public decimal? working_minute { get; set; }
         /// <summary>
         /// 状态 0-待使用，1-已使用
         /// </summary>
+        [DefaultValue(0)]
+        [Description("状态 0-待使用，1-已使用")]
         public int status { get; set; }
         /// <summary>
         /// 是否锁定 0-正常，1-锁定
         /// </summary>
+        [DefaultValue(0)]
+        [Description("是否锁定 0-正常，1-锁定")]
         public int is_Locked { get; set; }
         /// <summary>
         /// 生产组织id
         /// </summary>
+        [Description("生产组织id")]
         public long prd_org_id { get; set; }
         /// <summary>
         /// 工作中心id
         /// </summary>
+        [Description("工作中心id")]
         public long work_center_id { get; set; }
         /// <summary>
         /// 工作日历id
         /// </summary>
+        [Description("工作日历id")]
         public long work_calendar_id { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/Production/mes_stockoccupy.cs

@@ -1,6 +1,8 @@
 using Business.Model;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -17,74 +19,104 @@ namespace Bussiness.Model.Production
         /// 成品库存占用id
         /// </summary>
         [Key]
+        [Description("成品库存占用id")]
         public long soccupy_id { get; set; }
         /// <summary>
         /// 类型
         /// </summary>
-        public long soccupy_type { get; set; }
+        [Required]
+        [StringLength(50)]
+        [Description("类型")]
+        public string soccupy_type { get; set; }
         /// <summary>
         /// 订单行id
         /// </summary>
-        public long soentry_id { get; set; }
+        [Description("订单行id")]
+        public long? soentry_id { get; set; }
         /// <summary>
         /// 订单行号
         /// </summary>
-        public long fentry_id { get; set; }
+        [Description("订单行号")]
+        public long? fentry_id { get; set; }
         /// <summary>
         /// 订单编号
         /// </summary>
-        public string fbill_no { get; set; }
+        [StringLength(50)]
+        [Description("订单编号")]
+        public string? fbill_no { get; set; }
         /// <summary>
         /// 物料编码
         /// </summary>
-        public string fitem_number { get; set; }
+        [StringLength(50)]
+        [Description("物料编码")]
+        public string? fitem_number { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
-        public string fitem_name { get; set; }
+        [StringLength(200)]
+        [Description("物料名称")]
+        public string? fitem_name { get; set; }
         /// <summary>
         /// 规格型号
         /// </summary>
-        public string fmodel { get; set; }
+        [StringLength(200)]
+        [Description("规格型号")]
+        public string? fmodel { get; set; }
         /// <summary>
         /// 仓库id
         /// </summary>
+        [Description("仓库id")]
         public long warehouse_id { get; set; }
         /// <summary>
         /// 仓库名称
         /// </summary>
-        public string warehouse_name { get; set; }
+        [StringLength(80)]
+        [Description("仓库名称")]
+        public string? warehouse_name { get; set; }
         /// <summary>
         /// 仓库类型
         /// </summary>
-        public string warehouse_type { get; set; }
+        [StringLength(50)]
+        [Description("仓库类型")]
+        public string? warehouse_type { get; set; }
         /// <summary>
         /// 占用量
         /// </summary>
+        [Precision(20, 2)]
+        [Description("占用量")]
         public decimal? occupyqty { get; set; }
         /// <summary>
         /// 开始时间
         /// </summary>
-        public DateTime soccupy_stime { get; set; }
+        [Description("开始时间")]
+        public DateTime? soccupy_stime { get; set; }
         /// <summary>
         /// 结束时间
         /// </summary>
-        public DateTime soccupy_etime { get; set; }
+        [Description("结束时间")]
+        public DateTime? soccupy_etime { get; set; }
         /// <summary>
         /// 占用状态
         /// </summary>
-        public string soccupy_state { get; set; }
+        [StringLength(50)]
+        [Description("占用状态")]
+        public string? soccupy_state { get; set; }
         /// <summary>
         /// 变更人
         /// </summary>
-        public string soccupy_cby { get; set; }
+        [StringLength(50)]
+        [Description("变更人")]
+        public string? soccupy_cby { get; set; }
         /// <summary>
         /// 变更时间
         /// </summary>
-        public DateTime soccupy_ctime { get; set; }
+        [Description("变更时间")]
+        public DateTime? soccupy_ctime { get; set; }
         /// <summary>
         /// 变更原因
         /// </summary>
-        public string soccupy_creason { get; set; } 
+        [StringLength(255)]
+        [Description("变更原因")]
+        public string? soccupy_creason { get; set; } 
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_loss_time_record.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
@@ -12,66 +13,78 @@ namespace Bussiness.Model.ProductionProcess
         /// 主键ID
         /// </summary>
         [Key]
+        [Description("主键ID")]
         public long loss_time_record_id { get; set; }
         /// <summary>
         /// 工单id
         /// </summary>
+        [Description("工单id")]
 
         public long morder_id { get; set; }
         /// <summary>
         /// 工单编号
-        /// </summary>
+        /// </summary>    
+        [Required]
+        [StringLength(50)]
+        [Description("工单编号")]
 
         public string morder_no { get; set; }
         /// <summary>
         /// 损失开始时间
         /// </summary>
+        [Description("损失开始时间")]
 
-        public DateTime start_time { get; set; }
+        public DateTime? start_time { get; set; }
         /// <summary>
         /// 损失结束时间
         /// </summary>
+        [Description("损失结束时间")]
 
-        public DateTime end_time { get; set; }
+        public DateTime? end_time { get; set; }
         /// <summary>
         /// 生产车间
         /// </summary>
+        [Description("生产车间")]
 
         public long product_org { get; set; }
         /// <summary>
         /// 生产产线
         /// </summary>
+        [Description("生产产线")]
 
         public long product_line { get; set; }
         /// <summary>
         /// 记录时间
         /// </summary>
-
+        [Description("记录时间")]
         public DateTime record_time { get; set; }
         /// <summary>
         /// 记录人id
         /// </summary>
-
+        [Description("记录人id")]
         public long record_id { get; set; }
         /// <summary>
         /// 记录人工号
         /// </summary>
-
+        [Description("记录人工号")]
         public string record_no { get; set; }
         /// <summary>
         /// 是否停线
         /// </summary>
-
+        [DefaultValue(0)]
+        [Description("是否停线")]
         public int isstop { get; set; }
         /// <summary>
         /// 原因
         /// </summary>
-
-        public string cause { get; set; }
+        [StringLength(500)]
+        [Description("原因")]
+        public string? cause { get; set; }
         /// <summary>
         /// 问题描述
         /// </summary>
-
-        public string desc { get; set; }
+        [StringLength(500)]
+        [Description("问题描述")]
+        public string? desc { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_meaction.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
@@ -12,34 +13,47 @@ namespace Bussiness.Model.ProductionProcess
         /// 主键Id
         /// </summary>
         [Key]
+        [Description("生产动作Id")]
         public long meaction_id { get; set; }
         /// <summary>
         /// 生产工单id
         /// </summary>
+        [Description("生产工单id")]
         public long morder_id { get; set; }
         /// <summary>
         /// 生产工单号
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("生产工单号")]
         public string morder_no { get; set; }
         /// <summary>
         /// 操作时间
         /// </summary>
-        public DateTime oprtime { get; set; }
+        [Description("操作时间")]
+        public DateTime? oprtime { get; set; }
         /// <summary>
         /// 操作类型
         /// </summary>
-        public string oprtype { get; set; }
+        [StringLength(50)]
+        [Description("操作类型")]
+        public string? oprtype { get; set; }
         /// <summary>
         /// 操作人id
         /// </summary>
-        public long oprby { get; set; }
+        [Description("操作人id")]
+        public long? oprby { get; set; }
         /// <summary>
         /// 操作人名称
         /// </summary>
-        public string oprbyname { get; set; }
+        [StringLength(50)]
+        [Description("操作人名称")]
+        public string? oprbyname { get; set; }
         /// <summary>
         /// 操作人工号
         /// </summary>
-        public string oprbyno { get; set; }
+        [StringLength(100)]
+        [Description("操作人工号")]
+        public string? oprbyno { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_mebycard.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
@@ -12,34 +13,50 @@ namespace Bussiness.Model.ProductionProcess
         /// 刷卡id
         /// </summary>
         [Key]
+        [Description("刷卡id")]
         public long mebycard_id { get; set; }
         /// <summary>
         /// 生产工单号id
         /// </summary>
+        [Description("生产工单号id")]
         public long mebycard_moid { get; set; }
         /// <summary>
         /// 生产工单号
-        /// </summary>
+        /// </summary>    
+        [Required]
+        [StringLength(50)]
+        [Description("生产工单号")]
         public string mebycard_mono { get; set; }
         /// <summary>
         /// 工序id
         /// </summary>
+        [Description("工序id")]
         public long mebycard_pid { get; set; }
         /// <summary>
         /// 工序编码
         /// </summary>
+        [Required]
+        [StringLength(100)]
+        [Description("工序编码")]
         public string mebycard_pno { get; set; }
         /// <summary>
         /// 工序名称
-        /// </summary>
+        /// </summary>   
+        [Required]
+        [StringLength(100)]
+        [Description("工序名称")]
         public string mebycard_pname { get; set; }
         /// <summary>
         /// 刷卡人员卡号
-        /// </summary>
+        /// </summary>      
+        [Required]
+        [StringLength(100)]
+        [Description("刷卡人员卡号")]
         public string mebycard_byno { get; set; }
         /// <summary>
         /// 刷卡时间
-        /// </summary>
+        /// </summary>   
+        [Description("刷卡时间")]
         public DateTime mebycard_time { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_merecheck.cs

@@ -1,4 +1,6 @@
 using Business.Model;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
@@ -12,26 +14,35 @@ namespace Bussiness.Model.ProductionProcess
         /// 主键Id
         /// </summary>
         [Key]
+        [Description("生产报检记录Id")]
         public long merecheck_id { get; set; }
         /// <summary>
         /// 生产工单id
         /// </summary>
+        [Description("生产工单id")]
         public long morder_id { get; set; }
         /// <summary>
         /// 生产工单号
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("生产工单号")]
         public string morder_no { get; set; }
         /// <summary>
         /// 报检数量
         /// </summary>
+        [Precision(20, 10)]
+        [Description("报检数量")]
         public decimal qty { get; set; }
         /// <summary>
         /// 报检时间
         /// </summary>
+        [Description("报检时间")]
         public DateTime oprtime { get; set; }
         /// <summary>
         /// 报检人id
         /// </summary>
+        [Description("报检人id")]
         public long oprby { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_mereport.cs

@@ -1,4 +1,6 @@
 using Business.Model;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
@@ -12,34 +14,48 @@ namespace Bussiness.Model.ProductionProcess
         /// 主键ID
         /// </summary>
         [Key]
+        [Description("生产报工记录Id")]
         public long mereport_id { get; set; }
         /// <summary>
         /// 生产工单id
         /// </summary>
+        [Description("生产工单id")]
         public long morder_id { get; set; }
         /// <summary>
         /// 生产工单号
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("生产工单号")]
         public string morder_no { get; set; }
         /// <summary>
         /// 报工数量
         /// </summary>
+        [Precision(20, 10)]
+        [Description("报工数量")]
         public decimal qty { get; set; }
         /// <summary>
         /// 报工时间
         /// </summary>
+        [Description("报工时间")]
         public DateTime report_time { get; set; }
         /// <summary>
         /// 报工人id
         /// </summary>
+        [Description("报工人id")]
         public long report_by { get; set; }
         /// <summary>
         /// 报工人工号
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("报工人工号")]
         public string report_byno { get; set; }
         /// <summary>
         /// 已报数量
         /// </summary>
+        [Precision(20, 10)]
+        [Description("报工数量")]
         public decimal instock_qty { get; set; }
 
     }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_prd_sendmat.cs

@@ -1,4 +1,6 @@
-using System.ComponentModel.DataAnnotations;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
 {
@@ -8,51 +10,74 @@ namespace Bussiness.Model.ProductionProcess
         /// 发料单id
         /// </summary>
         [Key]
+        [Description("发料单id")]
         public long prdsm_id { get; set; }
         /// <summary>
         /// 单据类型 (发料、叫料、补料、退料)
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("单据类型 (发料、叫料、补料、退料)")]
         public string prdsm_type { get; set; }
         /// <summary>
         /// 单据编号
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("单据编号")]
         public string prdsm_no { get; set; }
         /// <summary>
         /// 单据日期
         /// </summary>
+        [Description("单据日期")]
         public DateTime prdsm_date { get; set; }
         /// <summary>
         /// 生产组织id
         /// </summary>
+        [Description("生产组织id")]
         public long prdsm_prdid { get; set; }
         /// <summary>
         /// 工作中心id
         /// </summary>
+        [Description("工作中心id")]
         public long prdsm_workcid { get; set; }
         /// <summary>
         /// 生产工单id
         /// </summary>
+        [Description("生产工单id")]
         public long prdsm_moid { get; set; }
         /// <summary>
         /// 生产工单号
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("生产工单号")]
         public string prdsm_mono { get; set; }
         /// <summary>
         /// 制单人
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("制单人")]
         public string prdsm_by { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
-        public string prdsm_note { get; set; }
+        [StringLength(500)]
+        [Description("备注")]
+        public string? prdsm_note { get; set; }
         /// <summary>
         /// 状态
         /// </summary>
-        public int prdsm_state { get; set; }
+        [DefaultValue(0)]
+        [Description("状态")]
+        public int? prdsm_state { get; set; }
         /// <summary>
         /// 补料理由
         /// </summary>
-        public string prdsm_reason { get; set; }
+        [StringLength(500)]
+        [Description("补料理由")]
+        public string? prdsm_reason { get; set; }
         /// <summary>
         /// 退料原因
         /// </summary>
@@ -60,26 +85,36 @@ namespace Bussiness.Model.ProductionProcess
         /// <summary>
         /// 叫料数量
         /// </summary>
+        [Precision(20, 10)]
+        [Description("叫料数量")]
         public decimal prdsm_qty { get; set; }
         /// <summary>
         /// 配送日期
         /// </summary>
-        public DateTime prdsm_ddate { get; set; }
+        [Description("配送日期")]
+        public DateTime? prdsm_ddate { get; set; }
         /// <summary>
         /// 关联委外po单号
         /// </summary>
-        public string prdsm_po_no { get; set; }
+        [StringLength(100)]
+        [Description("关联委外po单号")]
+        public string? prdsm_po_no { get; set; }
         /// <summary>
         /// 关联委外po行号
         /// </summary>
-        public int prdsm_po_row { get; set; }
+        [Description("关联委外po行号")]
+        public int? prdsm_po_row { get; set; }
         /// <summary>
         /// 原单类型  0 生产工单  1 委外工单
         /// </summary>
+        [DefaultValue(0)]
+        [Description("原单类型")]
         public int srcbill_type { get; set; }
         /// <summary>
         /// 源单状态  0 初始   1 下达 2 开始往金蝶推
         /// </summary>
+        [DefaultValue(0)]
+        [Description("源单状态")]
         public int srcbill_state { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_prd_sendmat_list.cs

@@ -1,4 +1,6 @@
 using Business.Model;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
@@ -6,112 +8,158 @@ namespace Bussiness.Model.ProductionProcess
     /// <summary>
     /// 发料单详情
     /// </summary>
-    public class mes_prd_sendmat_list :BaseEntity
+    public class mes_prd_sendmat_list : BaseEntity
     {
         /// <summary>
         /// 发料单详情id
         /// </summary>
         [Key]
+        [Description("发料单详情id")]
         public long prdsml_id { get; set; }
         /// <summary>
         /// 发料单id
         /// </summary>
+        [Description("发料单id")]
         public long prdsm_id { get; set; }
         /// <summary>
         /// 工序编码
         /// </summary>
-        public string prdsml_procno { get; set; }
+        [StringLength(50)]
+        [Description("工序编码")]
+        public string? prdsml_procno { get; set; }
         /// <summary>
         /// 工序名称
         /// </summary>
-        public string prdsml_procname { get; set; }
+        [StringLength(80)]
+        [Description("工序名称")]
+        public string? prdsml_procname { get; set; }
         /// <summary>
         /// 物料编码
         /// </summary>
-        public string fitem_number { get; set; }
+        [StringLength(100)]
+        [Description("物料编码")]
+        public string? fitem_number { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
-        public string fitem_name { get; set; }
+        [StringLength(100)]
+        [Description("物料编码")]
+        public string? fitem_name { get; set; }
         /// <summary>
         /// 规格型号
         /// </summary>
-        public string fmodel { get; set; }
+        [StringLength(100)]
+        [Description("物料编码")]
+        public string? fmodel { get; set; }
         /// <summary>
         /// 单位数量
         /// </summary>
-        public decimal prdsml_qtyper { get; set; }
+        [Precision(20, 10)]
+        [Description("单位数量")]
+        public decimal? prdsml_qtyper { get; set; }
         /// <summary>
         /// 确认单位数量
         /// </summary>
-        public decimal prdsml_cqtyper { get; set; }
+        [Precision(20, 10)]
+        [Description("确认单位数量")]
+        public decimal? prdsml_cqtyper { get; set; }
         /// <summary>
         /// 计量单位
         /// </summary>
-        public string prdsml_unit { get; set; }
+        [StringLength(50)]
+        [Description("计量单位")]
+        public string? prdsml_unit { get; set; }
         /// <summary>
         /// 应发数量
         /// </summary>
-        public decimal prdsml_qtyto { get; set; }
+        [Precision(20, 10)]
+        [Description("应发数量")]
+        public decimal? prdsml_qtyto { get; set; }
         /// <summary>
         /// 计划数量
         /// </summary>
-        public decimal prdsml_qtyplan { get; set; }
+        [Precision(20, 10)]
+        [Description("计划数量")]
+        public decimal? prdsml_qtyplan { get; set; }
         /// <summary>
         /// 已发数量
         /// </summary>
+        [Precision(20, 10)]
+        [Description("已发数量")]
         public decimal prdsml_qtyissued { get; set; }
         /// <summary>
         /// 发料仓库id
         /// </summary>
+        [Description("发料仓库id")]
         public long prdsml_whid { get; set; }
         /// <summary>
         /// 发料仓库编码
         /// </summary>
-        public string prdsml_whno { get; set; }
+        [StringLength(50)]
+        [Description("发料仓库编码")]
+        public string? prdsml_whno { get; set; }
         /// <summary>
         /// 发料仓库名称
         /// </summary>
-        public string prdsml_whname { get; set; }
+        [StringLength(500)]
+        [Description("发料仓库名称")]
+        public string? prdsml_whname { get; set; }
         /// <summary>
         /// 退料原因
         /// </summary>
-        public string prdsm_breason { get; set; }
+        [StringLength(500)]
+        [Description("退料原因")]
+        public string? prdsm_breason { get; set; }
         /// <summary>
         /// 是否倒冲 （0-否，1-是）
         /// </summary>
-        public int fbackflush { get; set; }
+        [Description("是否倒冲")]
+        public int? fbackflush { get; set; }
         /// <summary>
         /// 行号
         /// </summary>
-        public int prsml_row { get; set; }
+        [Description("行号")]
+        public int? prsml_row { get; set; }
         /// <summary>
         /// 子项属性
         /// </summary>
-        public string fmateriel_type { get; set; }
+        [StringLength(255)]
+        [Description("子项属性")]
+        public string? fmateriel_type { get; set; }
         /// <summary>
         /// 关键件
         /// </summary>
-        public string fisKey_item { get; set; }
+        [StringLength(255)]
+        [Description("子项属性")]
+        public string? fisKey_item { get; set; }
         /// <summary>
         /// 计划发料日期
         /// </summary>
-        public DateTime send_date { get; set; }
+        [Description("计划发料日期")]
+        public DateTime? send_date { get; set; }
         /// <summary>
         /// 工位
         /// </summary>
+        [StringLength(255)]
+        [Description("工位")]
         public string station { get; set; }
         /// <summary>
         /// 报废数量
         /// </summary>
-        public decimal fdiscard_aux_qty { get; set; }
+        [Precision(20, 10)]
+        [Description("报废数量")]
+        public decimal? fdiscard_aux_qty { get; set; }
         /// <summary>
         /// 补料数量
         /// </summary>
-        public decimal fqty_supply { get; set; }
+        [Precision(20, 10)]
+        [Description("补料数量")]
+        public decimal? fqty_supply { get; set; }
         /// <summary>
         /// 退料数量
         /// </summary>
-        public decimal fqty_send_back { get; set; }
+        [Precision(20, 10)]
+        [Description("退料数量")]
+        public decimal? fqty_send_back { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_prdlog.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
@@ -12,36 +13,50 @@ namespace Bussiness.Model.ProductionProcess
         /// 生产操作日志id
         /// </summary>
         [Key]
+        [Description("生产操作日志id")]
         public long prdlog_id { get; set; }
 
         /// <summary>
         /// 业务类型
         /// </summary>
+        [Required]
+        [StringLength(50)]
+        [Description("业务类型")]
         public string prdlog_type { get; set; }
         /// <summary>
         /// 关联单号
-        /// </summary>
+        /// </summary> 
+        [Required]
+        [StringLength(80)]
+        [Description("业务类型")]
         public string prdlog_no { get; set; }
         /// <summary>
         /// 行号
         /// </summary>
+        [Description("行号")]
         public int prdlog_entryid { get; set; }
         /// <summary>
         /// 执行时间
         /// </summary>
-        public DateTime prdlog_time { get; set; }
+        [Description("执行时间")]
+        public DateTime? prdlog_time { get; set; }
         /// <summary>
         /// 执行人id
         /// </summary>
-        public long prdlog_by_id { get; set; }
+        [Description("执行人id")]
+        public long? prdlog_by_id { get; set; }
         /// <summary>
         /// 执行人姓名
         /// </summary>
-        public string prdlog_by_name { get; set; }
+        [StringLength(80)]
+        [Description("执行人姓名")]
+        public string? prdlog_by_name { get; set; }
         /// <summary>
         /// 内容
         /// </summary>
-        public string prdlog_note { get; set; }
+        [StringLength(255)]
+        [Description("内容")]
+        public string? prdlog_note { get; set; }
      
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_product_work_time.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
@@ -12,26 +13,34 @@ namespace Bussiness.Model.ProductionProcess
         /// 生产时间记录id
         /// </summary>
         [Key]
+        [Description("生产时间记录id")]
         public long id { get; set; }
         /// <summary>
         /// 日期
         /// </summary>
-        public DateTime work_date { get; set; }
+        [Description("生产时间记录id")]
+        public DateTime? work_date { get; set; }
         /// <summary>
         /// 开始时间
         /// </summary>
-        public DateTime start { get; set; }
+        [Description("开始时间")]
+        public DateTime? start { get; set; }
         /// <summary>
         /// 结束时间
         /// </summary>
-        public DateTime stop { get; set; }
+        [Description("结束时间")]
+        public DateTime? stop { get; set; }
         /// <summary>
         /// 卡号
         /// </summary>
-        public string card_no { get; set; }
+        [StringLength(255)]
+        [Description("卡号")]
+        public string? card_no { get; set; }
         /// <summary>
         /// 产线
         /// </summary>
-        public string product_line { get; set; }
+        [StringLength(255)]
+        [Description("产线")]
+        public string? product_line { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_stock_enter.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
@@ -12,42 +13,58 @@ namespace Bussiness.Model.ProductionProcess
         /// 主键id
         /// </summary>
         [Key]
+        [Description("入库单id")]
         public long id { get; set; }
         /// <summary>
         /// 物料编码
         /// </summary>
-        public string fitem_number { get; set; }
+        [StringLength(255)]
+        [Description("物料编码")]
+        public string? fitem_number { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
-        public string fitem_name { get; set; }
+        [StringLength(255)]
+        [Description("物料名称")]
+        public string? fitem_name { get; set; }
         /// <summary>
         /// 全名
         /// </summary>
-        public string ffull_name { get; set; }
+        [StringLength(255)]
+        [Description("全名")]
+        public string? ffull_name { get; set; }
         /// <summary>
         /// 规格型号
         /// </summary>
-        public string fmodel { get; set; }
+        [StringLength(255)]
+        [Description("规格型号")]
+        public string? fmodel { get; set; }
         /// <summary>
         /// 工单号
         /// </summary>
-        public string order_no { get; set; }
+        [StringLength(80)]
+        [Description("工单号")]
+        public string? order_no { get; set; }
         /// <summary>
         /// 入库日期
         /// </summary>
+        [Description("入库日期")]
         public DateTime edate { get; set; }
         /// <summary>
         /// 入库数量
         /// </summary>
+        [Description("入库数量")]
         public int eqty { get; set; }
         /// <summary>
         /// 入库人id
         /// </summary>
+        [Description("入库人id")]
         public long eby { get; set; }
         /// <summary>
         /// 入库人姓名
         /// </summary>
+        [StringLength(80)]
+        [Description("入库人姓名")]
         public string ebyname { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_stock_out.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
@@ -12,67 +13,94 @@ namespace Bussiness.Model.ProductionProcess
         /// 主键Id
         /// </summary>
         [Key]
+        [Description("出库单Id")]
         public long id { get; set; }
 
         /// <summary>
         /// 出库单号
         /// </summary>
+        [StringLength(80)]
+        [Description("出库单号")]
         public string out_no { get; set; }
         /// <summary>
         /// 仓库名称
         /// </summary>
-        public string stock_name { get; set; }
+        [StringLength(255)]
+        [Description("仓库名称")]
+        public string? stock_name { get; set; }
         /// <summary>
         /// 仓库编码
         /// </summary>
-        public string stock_no { get; set; }
+        [StringLength(255)]
+        [Description("仓库编码")]
+        public string? stock_no { get; set; }
         /// <summary>
         /// 物料编码
         /// </summary>
-        public string fitem_number { get; set; }
+        [StringLength(80)]
+        [Description("物料编码")]
+        public string? fitem_number { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
+        [StringLength(255)]
+        [Description("物料名称")]
         public string fitem_name { get; set; }
         /// <summary>
         /// 全名
         /// </summary>
-        public string ffull_name { get; set; }
+        [StringLength(255)]
+        [Description("全名")]
+        public string? ffull_name { get; set; }
         /// <summary>
         /// 规格型号
         /// </summary>
-        public string fmodel { get; set; }
+        [StringLength(255)]
+        [Description("规格型号")]
+        public string? fmodel { get; set; }
         /// <summary>
         /// 销售订单号
         /// </summary>
+        [StringLength(80)]
+        [Description("销售订单号")]
         public string order_no { get; set; }
         /// <summary>
         /// 订单行号
         /// </summary>
-        public int order_number { get; set; }
+        [Description("订单行号")]
+        public int? order_number { get; set; }
         /// <summary>
         /// 发运通知单号
         /// </summary>
-        public string shipn_no { get; set; }
+        [StringLength(80)]
+        [Description("发运通知单号")]
+        public string? shipn_no { get; set; }
         /// <summary>
         /// 出库日期
         /// </summary>
+        [Description("出库日期")]
         public DateTime edate { get; set; }
         /// <summary>
         /// 出库数量
         /// </summary>
+        [Description("出库数量")]
         public int eqty { get; set; }
         /// <summary>
         /// 计量单位
         /// </summary>
-        public string unit { get; set; }
+        [StringLength(80)]
+        [Description("计量单位")]
+        public string? unit { get; set; }
         /// <summary>
         /// 出库人id
         /// </summary>
+        [Description("出库人id")]
         public long eby { get; set; }
         /// <summary>
         /// 出库人姓名
         /// </summary>
+        [StringLength(80)]
+        [Description("出库人姓名")]
         public string eby_name { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_swipe_card.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.ProductionProcess
 {
@@ -11,45 +12,61 @@ namespace Bussiness.Model.ProductionProcess
         /// mes打卡记录id
         /// </summary>
         [Key]
+        [Description("mes打卡记录id")]
         public long id { get; set; }
         /// <summary>
         /// 生产车间
         /// </summary>
+        [Required]
+        [StringLength(255)]
+        [Description("生产车间")]
 
         public string product_org { get; set; }
         /// <summary>
         /// 生产产线
         /// </summary>
+        [Required]
+        [StringLength(255)]
+        [Description("生产产线")]
 
         public string product_line { get; set; }
         /// <summary>
         /// 卡号
         /// </summary>
+        [Required]
+        [StringLength(80)]
+        [Description("卡号")]
 
         public string card_no { get; set; }
         /// <summary>
         /// 工单编号
         /// </summary>
+        [StringLength(50)]
+        [Description("工单编号")]
 
-        public string order_no { get; set; }
+        public string? order_no { get; set; }
         /// <summary>
         /// 上线时间
         /// </summary>
+        [Description("上线时间")]
 
-        public DateTime up_line_time { get; set; }
+        public DateTime? up_line_time { get; set; }
         /// <summary>
         /// 下线时间
         /// </summary>
+        [Description("下线时间")]
 
-        public DateTime off_line_time { get; set; }
+        public DateTime? off_line_time { get; set; }
         /// <summary>
         /// 刷卡类型  1 白班 ，2 晚班
         /// </summary>
+        [Description("刷卡类型")]
 
         public int type { get; set; }
         /// <summary>
         /// 刷卡日期
         /// </summary>
+        [Description("刷卡日期")]
 
         public DateTime swipe_date { get; set; }
     }

MicroServices/Business/Bussiness.Model/SIM/sim_base.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -7,40 +8,47 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// sim基本表
     /// </summary>
+    [Description("sim基本表")]
     public class sim_base:BaseEntity
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long sim_id { get; set; }
 
         /// <summary>
         /// sim等级
         /// </summary>
         [StringLength(255)]
-        public string sim_grade { get; set; }
+        [Description("sim等级")]
+        public string? sim_grade { get; set; }
 
         /// <summary>
         /// sim层级顺序
         /// </summary>
-        public int sim_level { get; set; }
+        [Description("sim层级顺序")]
+        public int? sim_level { get; set; }
 
         /// <summary>
         /// 上升周期
         /// </summary>
         [Precision(10,0)]
-        public decimal rise_cycle { get; set; }
+        [Description("上升周期")]
+        public decimal? rise_cycle { get; set; }
 
         /// <summary>
         /// 间隔天数
         /// </summary>
         [Precision(10, 0)]
-        public decimal interval_days { get; set; }
+        [Description("间隔天数")]
+        public decimal? interval_days { get; set; }
 
         /// <summary>
         /// 上升时间
         /// </summary>
-        public DateTime rise_time { get; set; }
+        [Description("上升时间")]
+        public DateTime? rise_time { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/SIM/sim_issue_type.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -6,48 +7,55 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// sim事项类别表
     /// </summary>
+    [Description("上升时间")]
     public class sim_issue_type: BaseEntity
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("上升时间")]
         public long issue_type_id { get; set; }
 
         /// <summary>
         /// 类别代码
         /// </summary>
         [StringLength(255)]
-        public string type_code { get; set; }
+        [Description("类别代码")]
+        public string? type_code { get; set; }
 
         /// <summary>
         /// 类别名称
         /// </summary>
         [StringLength(255)]
-        public string type_name { get; set; }
+        [Description("类别名称")]
+        public string? type_name { get; set; }
 
         /// <summary>
         /// 应用场景
         /// </summary>
         [StringLength(255)]
-        public string app_scenario { get; set; }
+        [Description("应用场景")]
+        public string? app_scenario { get; set; }
 
         /// <summary>
         /// 问题等级
         /// </summary>
         [StringLength(255)]
-        public string issue_grade { get; set; }
+        [Description("问题等级")]
+        public string? issue_grade { get; set; }
 
         /// <summary>
         /// 责任人
         /// </summary>
         [StringLength(255)]
-        public string duty_person { get; set; }
+        [Description("责任人")]
+        public string? duty_person { get; set; }
 
         /// <summary>
         /// 责任部门id
         /// </summary>
-        [StringLength(255)]
-        public long duty_dept { get; set; }
+        [Description("责任部门id")]
+        public long? duty_dept { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/SIM/sim_plant.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -6,18 +7,21 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// sim事项表
     /// </summary>
+    [Description("sim事项表")]
     public class sim_plant:BaseEntity
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long plant_id { get; set; }
 
         /// <summary>
         /// 事项名称
         /// </summary>
         [StringLength(255)]
-        public string plant_name { get; set; }
+        [Description("事项名称")]
+        public string? plant_name { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/SIM/sim_user_relation.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -6,22 +7,26 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// sim用户关联表
     /// </summary>
+    [Description("sim用户关联表")]
     public class sim_user_relation: BaseEntity
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long id { get; set; }
 
         /// <summary>
         /// base_sim表ID
         /// </summary>
+        [Description("base_sim表ID")]
         public long sim_id { get; set; }
 
         /// <summary>
         /// 用户id
         /// </summary>
+        [Description("用户id")]
         public long user_id { get; set; }
 
     }

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

@@ -15,269 +15,322 @@ namespace Bussiness.Model.Tech
         /// 销售订单明细表id
         /// </summary>
         [Key]
+        [Description("销售订单明细表id")]
         public long seorderentry_id { get; set; }
 
         /// <summary>
         /// 销售订单id
         /// </summary>
+        [Description("销售订单id")]
         public long seorder_id { get; set; }
 
         /// <summary>
         /// 销售订单编号
         /// </summary>
         [StringLength(50)]
-        public long bill_no { get; set; }
+        [Description("销售订单编号")]
+        public string? bill_no { get; set; }
 
         /// <summary>
         /// 行号
         /// </summary>
-        public int entry_seq { get; set; }
+        [Description("行号")]
+        public int? entry_seq { get; set; }
 
         /// <summary>
         /// 对应代码
         /// </summary>
         [StringLength(255)]
-        public string map_number { get; set; }
+        [Description("对应代码")]
+        public string? map_number { get; set; }
 
         /// <summary>
         /// 代码名称
         /// </summary>
         [StringLength(255)]
-        public string map_name { get; set; }
+        [Description("代码名称")]
+        public string? map_name { get; set; }
 
         /// <summary>
         /// 产品代码
         /// </summary>
         [StringLength(255)]
-        public string item_number { get; set; }
+        [Description("产品代码")]
+        public string? item_number { get; set; }
 
         /// <summary>
         /// FMS旧料号
         /// </summary>
         [StringLength(255)]
-        public string fms_number { get; set; }
+        [Description("FMS旧料号")]
+        public string? fms_number { get; set; }
 
         /// <summary>
         /// 产品名称
         /// </summary>
         [StringLength(255)]
-        public int item_name { get; set; }
+        [Description("产品名称")]
+        public string? item_name { get; set; }
 
         /// <summary>
         /// 规格型号
         /// </summary>
         [StringLength(255)]
-        public int specification { get; set; }
+        [Description("规格型号")]
+        public string? specification { get; set; }
 
         /// <summary>
         /// 加急级别
         /// </summary>
-        public int urgent { get; set; }
+        [Description("加急级别")]
+        public int? urgent { get; set; }
 
         /// <summary>
         /// BOM编号
         /// </summary>
         [StringLength(255)]
-        public string bom_number { get; set; }
+        [Description("BOM编号")]
+        public string? bom_number { get; set; }
 
         /// <summary>
         /// 单位
         /// </summary>
         [StringLength(50)]
-        public string unit { get; set; }
+        [Description("单位")]
+        public string? unit { get; set; }
 
         /// <summary>
         /// 订单数量
         /// </summary>
         [Precision(20,8)]
-        public decimal qty { get; set; }
+        [Description("订单数量")]
+        public decimal? qty { get; set; }
 
         /// <summary>
         /// 单价
         /// </summary>
         [Precision(20, 8)]
-        public decimal price { get; set; }
+        [Description("单价")]
+        public decimal? price { get; set; }
 
         /// <summary>
         /// 含税单价
         /// </summary>
         [Precision(20, 8)]
-        public decimal tax_price { get; set; }
+        [Description("含税单价")]
+        public decimal? tax_price { get; set; }
 
         /// <summary>
         /// 金额
         /// </summary>
         [Precision(20, 8)]
-        public decimal amount { get; set; }
+        [Description("金额")]
+        public decimal? amount { get; set; }
 
         /// <summary>
         /// 税率
         /// </summary>
         [Precision(20, 8)]
-        public decimal tax_rate { get; set; }
+        [Description("税率")]
+        public decimal? tax_rate { get; set; }
 
         /// <summary>
         /// 折扣率
         /// </summary>
         [Precision(20, 8)]
-        public decimal discount_rate { get; set; }
+        [Description("折扣率")]
+        public decimal? discount_rate { get; set; }
 
         /// <summary>
         /// 折扣额
         /// </summary>
         [Precision(20, 8)]
-        public decimal discount_amount { get; set; }
+        [Description("折扣额")]
+        public decimal? discount_amount { get; set; }
 
         /// <summary>
         /// 实际含税单价
         /// </summary>
         [Precision(20, 8)]
-        public decimal aux_price_discount { get; set; }
+        [Description("实际含税单价")]
+        public decimal? aux_price_discount { get; set; }
 
         /// <summary>
         /// 销项税额
         /// </summary>
         [Precision(20, 8)]
-        public decimal tax_amtount { get; set; }
+        [Description("销项税额")]
+        public decimal? tax_amtount { get; set; }
 
         /// <summary>
         /// 价税合计
         /// </summary>
         [Precision(20, 8)]
-        public decimal total_amount { get; set; }
+        [Description("价税合计")]
+        public decimal? total_amount { get; set; }
 
         /// <summary>
         /// 客户要求交期
         /// </summary>
-        public DateTime plan_date { get; set; }
+        [Description("客户要求交期")]
+        public DateTime? plan_date { get; set; }
 
         /// <summary>
         /// 最终交货日期
         /// </summary>
-        public DateTime date { get; set; }
+        [Description("最终交货日期")]
+        public DateTime? date { get; set; }
 
         /// <summary>
         /// 计划员
         /// </summary>
         [StringLength(50)]
-        public string planner_name { get; set; }
+        [Description("计划员")]
+        public string? planner_name { get; set; }
 
         /// <summary>
         /// 计划员_工号
         /// </summary>
         [StringLength(50)]
-        public string planner_no { get; set; }
+        [Description("计划员_工号")]
+        public string? planner_no { get; set; }
 
         /// <summary>
         /// 备注
         /// </summary>
         [StringLength(255)]
-        public string remark { get; set; }
+        [Description("备注")]
+        public string? remark { get; set; }
 
         /// <summary>
         /// 源单编号
         /// </summary>
         [StringLength(50)]
-        public string soure_bill_no { get; set; }
+        [Description("源单编号")]
+        public string? soure_bill_no { get; set; }
 
         /// <summary>
         /// 客户订单号
         /// </summary>
         [StringLength(50)]
-        public string custom_order_bill_no { get; set; }
+        [Description("客户订单号")]
+        public string? custom_order_bill_no { get; set; }
 
         /// <summary>
         /// 客户订单行号
         /// </summary>
-        public int custom_order_entryid { get; set; }
+        [Description("客户订单行号")]
+        public int? custom_order_entryid { get; set; }
 
         /// <summary>
         /// 系统建议交期(产能)
         /// </summary>
-        public DateTime sys_capacity_date { get; set; }
+        [Description("系统建议交期(产能)")]
+        public DateTime? sys_capacity_date { get; set; }
 
         /// <summary>
         ///调整建议交期
         /// </summary>
-        public DateTime adjust_date { get; set; }
+        [Description("调整建议交期")]
+        public DateTime? adjust_date { get; set; }
 
         /// <summary>
         ///调整建议交期
         /// </summary>
-        public bool mrp_closed { get; set; }
+        [Description("mrp关闭")]
+        [DefaultValue(false)]
+        public bool? mrp_closed { get; set; }
 
         /// <summary>
         /// 操作时间
         /// </summary>
-        public DateTime op_time { get; set; }
+        [Description("操作时间")]
+        public DateTime? op_time { get; set; }
 
         /// <summary>
         /// 客户料号
         /// </summary>
-        [StringLength(50)]
-        public string custom_order_itemno { get; set; }
+        [StringLength(80)]
+        [Description("客户料号")]
+        public string? custom_order_itemno { get; set; }
 
         /// <summary>
         /// 数据状态标识 0停用 1启用
         /// </summary>
+        [Description("数据状态标识 0停用 1启用")]
+        [DefaultValue(true)]
         public bool state { get; set; }
 
         /// <summary>
         /// 评审状态
         /// </summary>
-        public int rstate { get; set; }
+        [Description("评审状态")]
+        public int? rstate { get; set; }
 
         /// <summary>
         /// 评审次数
         /// </summary>
-        public int rnumber { get; set; }
+        [Description("评审次数")]
+        public int? rnumber { get; set; }
 
         /// <summary>
         /// 订单进度
         /// </summary>
         [StringLength(255)]
-        public string progress { get; set; }
+        [Description("订单进度")]
+        public string? progress { get; set; }
 
         /// <summary>
         /// 发货通知单数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal deliver_notice_count { get; set; }
+        [Description("发货通知单数量")]
+        public decimal? deliver_notice_count { get; set; }
 
         /// <summary>
         /// 发货数量（已出库数量）
         /// </summary>
         [Precision(20, 8)]
-        public decimal deliver_count { get; set; }
+        [Description("发货数量（已出库数量）")]
+        public decimal? deliver_count { get; set; }
 
         /// <summary>
         /// 业务员工号
         /// </summary>
-        [StringLength(255)]
-        public string se_reject_reason { get; set; }
+        [StringLength(80)]
+        [Description("业务员工号")]
+        public string? se_reject_reason { get; set; }
 
         /// <summary>
         /// 出库类型
         /// </summary>
         [StringLength(50)]
-        public string out_stock_type { get; set; }
+        [Description("出库类型")]
+        public string? out_stock_type { get; set; }
 
         /// <summary>
         /// 是否完成检测，0未完成，1完成
         /// </summary>
-        public bool is_checked { get; set; }
+        [Description("是否完成检测，0未完成，1完成")]
+        public bool? is_checked { get; set; }
 
         /// <summary>
         /// 系统建议交期(物料)
         /// </summary>
-        public DateTime sys_material_date { get; set; }
+        [Description("系统建议交期(物料)")]
+        public DateTime? sys_material_date { get; set; }
 
         /// <summary>
         /// 合同编号
         /// </summary>
-        public string contract_no { get; set; }
+        [Description("合同编号")]
+        [StringLength(50)]
+        public string? contract_no { 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_seorderprog.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -6,71 +7,84 @@ namespace Bussiness.Model.Tech
     /// <summary>
     ///销售订单进度表
     /// </summary>
+    [Description("销售订单进度表")]
     public class wms_seorderprog : BaseEntity
     {
         /// <summary>
         /// 销售订单进度id
         /// </summary>
         [Key]
+        [Description("销售订单进度表")]
         public long seorderprog_id { get; set; }
 
         /// <summary>
         /// 销售订单id
         /// </summary>
         [Required]
+        [Description("销售订单id")]
         public long seorder_id { get; set; }
 
         /// <summary>
         /// 销售订单编号
         /// </summary>
         [StringLength(80)]
-        public string bill_no { get; set; }
+        [Description("销售订单编号")]
+        public string? bill_no { get; set; }
 
         /// <summary>
         /// 销售订单行号
         /// </summary>
-        public int entry_seq { get; set; }
+        [Description("销售订单行号")]
+        public int? entry_seq { get; set; }
 
         /// <summary>
         /// 进度类型
         /// </summary>
-        public int seprog_type { get; set; }
+        [Description("进度类型")]
+        public int? seprog_type { get; set; }
 
         /// <summary>
         /// 进度阶段
         /// </summary>
         [StringLength(50)]
-        public string seprog_stage { get; set; }
+        [Description("进度阶段")]
+        public string? seprog_stage { get; set; }
 
         /// <summary>
         /// 进度阶段id
         /// </summary>
-        public long seprog_stage_id { get; set; }
+        [Description("进度阶段id")]
+        public long? seprog_stage_id { get; set; }
 
         /// <summary>
         /// 开始时间
         /// </summary>
-        public DateTime seprog_stime { get; set; }
+        [Description("开始时间")]
+        public DateTime? seprog_stime { get; set; }
 
         /// <summary>
         /// 完成时间
         /// </summary>
-        public DateTime seprog_etime { get; set; }
+        [Description("完成时间")]
+        public DateTime? seprog_etime { get; set; }
 
         /// <summary>
         /// 提交人id
         /// </summary>
-        public long seprog_by_id { get; set; }
+        [Description("提交人id")]
+        public long? seprog_by_id { get; set; }
 
         /// <summary>
         /// 提交人姓名
         /// </summary>
         [StringLength(80)]
-        public string seprog_by_name { get; set; }
+        [Description("提交人姓名")]
+        public string? seprog_by_name { 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_seorderreview.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -6,115 +7,135 @@ namespace Bussiness.Model.Tech
     /// <summary>
     ///销售订单评审表
     /// </summary>
+    [Description("销售订单评审表")]
     public class wms_seorderreview : BaseEntity
     {
         /// <summary>
         /// 销售订单评审id
         /// </summary>
         [Key]
+        [Description("销售订单评审id")]
         public long review_id { get; set; }
 
         /// <summary>
         /// 销售订单id
         /// </summary>
         [Required]
+        [Description("销售订单id")]
         public long seorder_id { get; set; }
 
         /// <summary>
         /// 业务类型
         /// </summary>
         [Required]
-        public string review_type { get; set; }
+        [Description("业务类型")]
+        public string? review_type { get; set; }
 
         /// <summary>
         /// 销售订单编号
         /// </summary>
         [StringLength(80)]
-        public string bill_no { get; set; }
+        [Description("销售订单编号")]
+        public string? bill_no { get; set; }
 
         /// <summary>
         /// 销售订单行号
         /// </summary>
-        public int entry_seq { get; set; }
+        [Description("销售订单行号")]
+        public int? entry_seq { get; set; }
 
         /// <summary>
         /// 提交时间
         /// </summary>
-        public DateTime review_stime { get; set; }
+        [Description("提交时间")]
+        public DateTime? review_stime { get; set; }
 
         /// <summary>
         /// 提交人id
         /// </summary>
-        public long review_by_id { get; set; }
+        [Description("提交人id")]
+        public long? review_by_id { get; set; }
 
         /// <summary>
         /// 提交人姓名
         /// </summary>
         [StringLength(80)]
-        public string review_by_name { get; set; }
+        [Description("提交人姓名")]
+        public string? review_by_name { get; set; }
 
 
         /// <summary>
         /// 评审时间
         /// </summary>
-        public DateTime review_time { get; set; }
+        [Description("评审时间")]
+        public DateTime? review_time { get; set; }
 
         /// <summary>
         /// 评审人id
         /// </summary>
-        public long reviewer_id { get; set; }
+        [Description("评审人id")]
+        public long? reviewer_id { get; set; }
 
         /// <summary>
         /// 评审人姓名
         /// </summary>
         [StringLength(80)]
-        public string reviewer_name { get; set; }
+        [Description("评审人姓名")]
+        public string? reviewer_name { get; set; }
 
         /// <summary>
         /// 评审结果
         /// </summary>
         [StringLength(255)]
-        public string review_result { get; set; }
+        [Description("评审结果")]
+        public string? review_result { get; set; }
 
         /// <summary>
         /// 拒绝原因
         /// </summary>
         [StringLength(255)]
-        public string reject_reason { get; set; }
+        [Description("拒绝原因")]
+        public string? reject_reason { get; set; }
 
         /// <summary>
         /// 拒绝等级
         /// </summary>
         [StringLength(255)]
-        public string review_reject_level { get; set; }
+        [Description("拒绝等级")]
+        public string? review_reject_level { get; set; }
 
         /// <summary>
         /// 拒绝备注
         /// </summary>
         [StringLength(255)]
-        public string review_reject_remark { get; set; }
+        [Description("拒绝备注")]
+        public string? review_reject_remark { get; set; }
 
         /// <summary>
         /// 可接受交期
         /// </summary>
         [StringLength(255)]
-        public string review_adjust_time { get; set; }
+        [Description("可接受交期")]
+        public DateTime? review_adjust_time { get; set; }
 
         /// <summary>
         /// 标题
         /// </summary>
         [StringLength(255)]
-        public string review_title { get; set; }
+        [Description("标题")]
+        public string? review_title { get; set; }
 
         /// <summary>
         /// 当前审批步骤id
         /// </summary>
-        public long audit_procedure_id { get; set; }
+        [Description("当前审批步骤id")]
+        public long? audit_procedure_id { get; set; }
 
         /// <summary>
         /// 当前审批步骤名称
         /// </summary>
         [StringLength(255)]
-        public string audit_procedure_name { get; set; }     
+        [Description("当前审批步骤名称")]
+        public string? audit_procedure_name { get; set; }     
     }
 }

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

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -6,12 +7,14 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 发运通知单
     /// </summary>
+    [Description("发运通知单")]
     public class wms_shipnotice : BaseEntity
     {
         /// <summary>
         /// 发运通知单主键id
         /// </summary>
         [Key]
+        [Description("发运通知单主键id")]
         public long shipnotice_id { get; set; }
 
         /// <summary>
@@ -19,36 +22,43 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [StringLength(80)]
         [Required]
-        public string shipnotice_no { get; set; }
+        [Description("发运通知单号")]
+        public string? shipnotice_no { get; set; }
 
         /// <summary>
         /// 发货计划id
         /// </summary>
         [Required]
+        [Description("发货计划id")]
         public long shipplan_id { get; set; }
 
         /// <summary>
         /// 发货计划号
         /// </summary>
         [StringLength(80)]
-        public string shipplan_no { get; set; }
+        [Description("发货计划号")]
+        public string? shipplan_no { get; set; }
 
         /// <summary>
         /// 发运时间
         /// </summary>
         [Required]
+        [Description("发运时间")]
         public DateTime shipnotice_date { get; set; }
 
         /// <summary>
         /// 状态
         /// </summary>
         [Required]
-        public int state { get; set; }
+        [StringLength(80)]
+        [Description("状态")]
+        public string? state { get; set; }
 
         /// <summary>
         /// 发运地址
         /// </summary>
-        [StringLength(200)]
-        public string address { get; set; }
+        [StringLength(255)]
+        [Description("发运地址")]
+        public string? address { get; set; }
     }
 }

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

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -7,83 +8,98 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 发运通知单详情清单
     /// </summary>
+    [Description("发运通知单详情清单")]
     public class wms_shipnoticelist : BaseEntity
     {
         /// <summary>
         /// 发运通知单详情id
         /// </summary>
         [Key]
+        [Description("发运通知单详情id")]
         public long shipnoticelist_id { get; set; }
 
         /// <summary>
         /// 发运通知单id
         /// </summary>
         [StringLength(80)]
+        [Description("发货计划号")]
         public long shipnotice_id { get; set; }
 
         /// <summary>
         /// 发货详情id
         /// </summary>
-        public long shipplanlist_id { get; set; }
+        [Description("发货详情id")]
+        public long? shipplanlist_id { get; set; }
 
 
         /// <summary>
         /// 销售单id
         /// </summary>
-        public long shipplanl_soid { get; set; }
+        [Description("销售单id")]
+        public long? shipplanl_soid { get; set; }
 
 
         /// <summary>
         /// 销售单号
         /// </summary>
         [StringLength(80)]
-        public string shipplanl_sono { get; set; }
+        [Description("销售单号")]
+        public string? shipplanl_sono { get; set; }
 
         /// <summary>
         /// 销售单行号
         /// </summary>
-        public int shipplanl_soeid { get; set; }
+        [Description("销售单行号")]
+        public int? shipplanl_soeid { get; set; }
 
         /// <summary>
         /// 客户id
         /// </summary>
-        public long shipnotice_custid { get; set; }
+        [Description("客户id")]
+        public long? shipnotice_custid { get; set; }
 
         /// <summary>
         /// 客户编号
         /// </summary>
         [StringLength(80)]
-        public string shipnotice_custno { get; set; }
+        [Description("客户编号")]
+        public string? shipnotice_custno { get; set; }
 
         /// <summary>
         /// 客户名称
         /// </summary>
         [StringLength(255)]
-        public string shipnotice_custname { get; set; }
+        [Description("客户名称")]
+        public string? shipnotice_custname { get; set; }
 
         /// <summary>
         /// 计划发货数量
         /// </summary>
         [Precision(20, 10)]
-        public decimal shipplanl_iqty { get; set; }
+        [Description("计划发货数量")]
+        public decimal? shipplanl_iqty { get; set; }
 
         /// <summary>
         /// 实际发货数量
         /// </summary>
         [Precision(20, 10)]
-        public decimal shipplanl_fqty { get; set; }
+        [Description("实际发货数量")]
+        public decimal? shipplanl_fqty { get; set; }
 
         /// <summary>
         /// 状态
         /// </summary>
         [Required]
-        public int state { get; set; }
+        [StringLength(80)]
+        [Description("状态")]
+        public string? state { get; set; }
 
         /// <summary>
         /// 发运地址
         /// </summary>
-        [StringLength(200)]
-        public string address { get; set; }
+        [StringLength(255)]
+        [Description("发运地址")]
+        public string? address { get; set; }
 
     }
 }

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

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -6,28 +7,34 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 发货计划表
     /// </summary>
+    [Description("发货计划表")]
     public class wms_shipplan : BaseEntity
     {
         /// <summary>
         /// 发货计划表主键
         /// </summary>
         [Key]
+        [Description("发货计划表主键")]
         public long shipplan_id { get; set; }
 
         /// <summary>
         /// 发货计划编号
         /// </summary>
         [StringLength(80)]
-        public string shipplan_no { get; set; }
+        [Description("发货计划编号")]
+        public string? shipplan_no { get; set; }
 
         /// <summary>
         /// 发货计划时间
         /// </summary>
-        public DateTime shipplan_date { get; set; }
+        [Description("发货计划时间")]
+        public DateTime? shipplan_date { get; set; }
 
         /// <summary>
         /// 状态
         /// </summary>
-        public int state { get; set; }
+        [Description("状态")]
+        [StringLength(80)]
+        public string? state { get; set; }
     }
 }

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

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -7,29 +8,34 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 发货计划详情清单
     /// </summary>
+    [Description("发货计划详情清单")]
     public class wms_shipplanlist : BaseEntity
     {
         /// <summary>
         /// 发货详情主键id
         /// </summary>
         [Key]
+        [Description("发货详情主键id")]
         public long shipplanlist_id { get; set; }
 
         /// <summary>
         /// 发货计划id
         /// </summary>
         [Required]
+        [Description("发货计划id")]
         public long shipplan_id { get; set; }
 
         /// <summary>
         /// 发货计划时间
         /// </summary>
-        public DateTime shipplan_date { get; set; }
+        [Description("发货计划时间")]
+        public DateTime? shipplan_date { get; set; }
 
         /// <summary>
         /// 销售单id
         /// </summary>
         [Required]
+        [Description("销售单id")]
         public long shipplanl_soid { get; set; }
 
 
@@ -37,65 +43,76 @@ namespace Bussiness.Model.Tech
         /// 销售单号
         /// </summary>
         [StringLength(80)]
-        public string shipplanl_sono { get; set; }
+        [Description("销售单号")]
+        public string? shipplanl_sono { get; set; }
 
         /// <summary>
         /// 行号
         /// </summary>
-        public int shipplanl_soeid { get; set; }
+        [Description("行号")]
+        public int? shipplanl_soeid { get; set; }
 
         /// <summary>
         /// 物料id
         /// </summary>
-        public long icitem_id { get; set; }
+        [Description("物料id")]
+        public long? icitem_id { get; set; }
 
         /// <summary>
         /// 物料编码
         /// </summary>
         [StringLength(80)]
-        public string item_number { get; set; }
+        [Description("物料编码")]
+        public string? item_number { get; set; }
 
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(255)]
-        public string item_name { get; set; }
+        [Description("物料名称")]
+        public string? item_name { get; set; }
 
         /// <summary>
         /// 发货数量
         /// </summary>
         [Precision(20, 10)]
-        public decimal shipplanl_iqty { get; set; }
+        [Description("发货数量")]
+        public decimal? shipplanl_iqty { get; set; }
 
 
         /// <summary>
         /// 发货日期
         /// </summary>
         [Precision(20, 10)]
-        public DateTime shipplanl_sdate { get; set; }
+        [Description("发货日期")]
+        public DateTime? shipplanl_sdate { get; set; }
 
 
         /// <summary>
         /// 客户id
         /// </summary>
-        public long shipnotice_custid { get; set; }
+        [Description("客户id")]
+        public long? shipnotice_custid { get; set; }
 
         /// <summary>
         /// 客户编号
         /// </summary>
         [StringLength(80)]
-        public string shipnotice_custno { get; set; }
+        [Description("客户编号")]
+        public string? shipnotice_custno { get; set; }
 
         /// <summary>
         /// 客户名称
         /// </summary>
         [StringLength(255)]
-        public string shipnotice_custname { get; set; }
+        [Description("客户名称")]
+        public string? shipnotice_custname { get; set; }
 
         /// <summary>
         /// 状态
         /// </summary>
-        [Required]
-        public int state { get; set; }
+        [StringLength(80)]
+        [Description("状态")]
+        public string? state { get; set; }
     }
 }

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

@@ -38,7 +38,7 @@ namespace Bussiness.Model.SystemData
         /// </summary>
         [Required]
         [Description("编码生成时间")]
-        public DateTime code_date { get; set; }
+        public DateTime? code_date { get; set; }
 
         /// <summary>
         /// 编码生成当前值
@@ -52,6 +52,6 @@ namespace Bussiness.Model.SystemData
         /// </summary>
         [StringLength(255)]
         [Description("中文注释")]
-        public string chinese_name { get; set; }
+        public string? chinese_name { get; set; }
     }
 }

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

@@ -1,23 +1,27 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
 {
     /// <summary>
     /// 系统编码前置表
     /// </summary>
+    [Description("系统编码前置表")]
     public class sys_code_pre
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long id { get; set; }
 
         /// <summary>
         /// 编码生成名称
         /// </summary>
         [StringLength(50)]
-         [Required]
+        [Required]
+        [Description("编码生成名称")]
         public string code_name { get; set; }
 
         /// <summary>
@@ -25,18 +29,21 @@ namespace Bussiness.Model.SystemData
         /// </summary>
         [Required]
         [StringLength(50)]
+        [Description("编码生成前置名称")]
         public string pre_name { get; set; }
 
         /// <summary>
         /// 编码生成时间
         /// </summary>
         [Required]
+        [Description("编码生成时间")]
         public DateTime code_date { get; set; }
 
         /// <summary>
         /// 编码生成当前值
         /// </summary>
         [Required]
+        [Description("编码生成当前值")]
         public long code_value { get; set; }
     }
 }

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

@@ -1,35 +1,44 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
 {
     /// <summary>
     /// 系统配置表
     /// </summary>
+    [Description("系统配置表")]
     public class sys_config
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long config_id { get; set; }
 
         /// <summary>
         /// 配置类型
         /// </summary>
+        [Description("配置类型")]
         [StringLength(50)]
         public string type { get; set; }
 
         /// <summary>
         /// 账务状态（0-关帐，1-开帐）
+        [Description("账务状态（0-关帐，1-开帐）")]
+        [DefaultValue(true)]
         public bool financeis_close { get; set; }
 
         /// <summary>
         /// 下一个开帐日期
         /// </summary>
-        public DateTime next_open_date { get; set; }
+        [Description("下一个开帐日期")]
+        public DateTime? next_open_date { get; set; }
 
         /// <summary>
         /// 是否显示（0不显示、1显示）
+        [Description("是否显示（0不显示、1显示）")]
+        [DefaultValue(true)]
         public bool is_show { get; set; }
     }
 }

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

@@ -1,38 +1,47 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
 {
     /// <summary>
     /// 计量单位信息表
     /// </summary>
+    [Description("计量单位信息表")]
     public class sys_measure_unit
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long unit_id { get; set; }
 
         /// <summary>
         /// 单位名称
         /// </summary>
         [StringLength(50)]
-        public string unit_name { get; set; }
+        [Description("单位名称")]
+        public string? unit_name { get; set; }
 
         /// <summary>
         /// 单位编码
         /// </summary>
         [StringLength(50)]
-        public string unit_code { get; set; }
+        [Description("单位编码")]
+        public string? unit_code { get; set; }
 
         /// <summary>
         /// 是否是标准单位0-否，1是
         /// </summary>
+        [Description("是否是标准单位0-否，1是")]
+        [DefaultValue(true)]
         public bool is_standard { get; set; }
 
         /// <summary>
         /// 状态：0-无效，1-有效
         /// </summary>
+        [Description("状态：0-无效，1-有效")]
+        [DefaultValue(true)]
         public bool status { get; set; }
 
     }

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

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -6,22 +7,26 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// 员工岗位关联表
     /// </summary>
+    [Description("员工岗位关联表")]
     public class sys_post_staff: BaseEntity
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long id { get; set; }
 
         /// <summary>
         /// 员工id
         /// </summary>
+        [Description("员工id")]
         public long staff_id { get; set; }
 
         /// <summary>
         /// 岗位id
         /// </summary>
+        [Description("岗位id")]
         public long post_id { get; set; }
     }
 }

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

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -6,45 +7,55 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// 班制表
     /// </summary>
+    [Description("班制表")]
     public class sys_shift: BaseEntity
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long shift_id { get; set; }
 
         /// <summary>
         /// 班制编码
         /// </summary>
         [StringLength(50)]
-        public string shift_no { get; set; }
+        [Description("班制编码")]
+        public string? shift_no { get; set; }
 
         /// <summary>
         /// 班制名称
         /// </summary>
         [StringLength(255)]
-        public string shift_name { get; set; }
+        [Description("班制名称")]
+        public string? shift_name { get; set; }
 
         /// <summary>
         /// 是否跨天 1是 0否
         /// </summary>
+        [Description("岗位id")]
+        [DefaultValue(false)]
         public bool is_across { get; set; }
 
         /// <summary>
         /// 备注
         /// </summary>
         [StringLength(255)]
-        public long remark { get; set; }
+        [Description("备注")]
+        public string? remark { get; set; }
 
         /// <summary>
         /// 有效时长
         /// </summary>
-        public int validate_hours { get; set; }
+        [Description("有效时长")]
+        public int? validate_hours { get; set; }
 
         /// <summary>
         /// 数据状态标识 1启用 0停用
         /// </summary>
+        [Description("数据状态标识 1启用 0停用")]
+        [DefaultValue(true)]
         public bool state { get; set; }
 
     }

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

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -6,28 +7,33 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// 班次无效时间表
     /// </summary>
+    [Description("数据状态标识 1启用 0停用")]
     public class sys_shift_invalid_time:BaseEntity
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("数据状态标识 1启用 0停用")]
         public long invalid_time_id { get; set; }
 
         /// <summary>
         /// 班次id
         /// </summary>
+        [Description("班次id")]
         public long slice_id { get; set; }
 
 
         /// <summary>
         /// 开始时间
         /// </summary>
+        [Description("开始时间")]
         public DateTime start_time { get; set; }
 
         /// <summary>
         /// 结束时间
         /// </summary>
+        [Description("结束时间")]
         public DateTime end_time { get; set; }
     }
 }

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

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -6,24 +7,28 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// 班制班次关联表
     /// </summary>
+    [Description("班制班次关联表")]
     public class sys_shift_shiftslice:BaseEntity
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long id { get; set; }
 
         /// <summary>
         /// 班制id
         /// </summary>
         [StringLength(50)]
-        public string shift_id { get; set; }
+        [Description("班制id")]
+        public long shift_id { get; set; }
 
         /// <summary>
         /// 班次id
         /// </summary>
         [StringLength(255)]
-        public string slice_id { get; set; }
+        [Description("班次id")]
+        public long slice_id { get; set; }
     }
 }

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

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -6,60 +7,73 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// 班次表
     /// </summary>
+    [Description("班制班次关联表")]
     public class sys_shiftslice: BaseEntity
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("班制班次关联表")]
         public long slice_id { get; set; }
 
         /// <summary>
         /// 班次编码
         /// </summary>
         [StringLength(50)]
-        public string slice_no { get; set; }
+        [Description("班次编码")]
+        public string? slice_no { get; set; }
 
         /// <summary>
         /// 班次名称
         /// </summary>
         [StringLength(255)]
-        public string slice_name { get; set; }
+        [Description("班次名称")]
+        public string? slice_name { get; set; }
 
         /// <summary>
         /// 起始工作时间
         /// </summary>
-        public DateTime slice_start_time { get; set; }
+        [Description("起始工作时间")]
+        public DateTime? slice_start_time { get; set; }
 
         /// <summary>
         /// 结束工作时间
         /// </summary>
-        public DateTime slice_end_time { get; set; }
+        [Description("结束工作时间")]
+        public DateTime? slice_end_time { get; set; }
 
         /// <summary>
         /// 是否跨天 1是 0否
         /// </summary>
+        [Description("是否跨天 1是 0否")]
+        [DefaultValue(false)]
         public bool is_across { get; set; }
 
         /// <summary>
         /// 备注
         /// </summary>
         [StringLength(255)]
-        public long remark { get; set; }
+        [Description("备注")]
+        public string? remark { get; set; }
 
         /// <summary>
         /// 有效时长
         /// </summary>
-        public int validate_hours { get; set; }
+        [Description("有效时长")]
+        public int? validate_hours { get; set; }
 
         /// <summary>
         /// 工作时长
         /// </summary>
-        public int work_hours { get; set; }
+        [Description("工作时长")]
+        public int? work_hours { get; set; }
 
         /// <summary>
         /// 数据状态标识 1启用 0停用
         /// </summary>
+        [Description("数据状态标识 1启用 0停用")]
+        [DefaultValue(true)]
         public bool state { get; set; }
     }
 }

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

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -6,131 +7,154 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// 员工表
     /// </summary>
+    [Description("是否跨天 1是 0否")]
     public class sys_staff:BaseEntity
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long staff_id { get; set; }
 
         /// <summary>
         /// 员工编码
         /// </summary>
         [StringLength(50)]
-        public string staff_no { get; set; }
+        [Description("员工编码")]
+        public string? staff_no { get; set; }
 
         /// <summary>
         /// 用户id
         /// </summary>
-        public long user_id { get; set; }
+        [Description("用户id")]
+        public long? user_id { get; set; }
 
         /// <summary>
         /// 用户名称
         /// </summary>
         [StringLength(255)]
-        public string user_name { get; set; }
+        [Description("用户名称")]
+        public string? user_name { get; set; }
 
         /// <summary>
         /// 中文名
         /// </summary>
         [StringLength(255)]
-        public string chinese_name { get; set; }
+        [Description("中文名")]
+        public string? chinese_name { get; set; }
 
         /// <summary>
         /// 电话
         /// </summary>
         [StringLength(80)]
-        public string phone { get; set; }
+        [Description("电话")]
+        public string? phone { get; set; }
 
         /// <summary>
         /// 照片
         /// </summary>
         [StringLength(255)]
-        public string photo { get; set; }
+        [Description("照片")]
+        public string? photo { get; set; }
 
         /// <summary>
         /// 组织名称
         /// </summary>
         [StringLength(255)]
-        public string org_name { get; set; }
+        [Description("组织名称")]
+        public string? org_name { get; set; }
 
         /// <summary>
         /// 生日
         /// </summary>
-        public DateOnly birthday { get; set; }
+        [Description("生日")]
+        public DateOnly? birthday { get; set; }
 
         /// <summary>
         /// 邮箱
         /// </summary>
         [StringLength(255)]
-        public string email { get; set; }
+        [Description("邮箱")]
+        public string? email { get; set; }
 
         /// <summary>
-        /// 性别
+        /// 性别 1 男 2 女
         /// </summary>
         [StringLength(1)]
-        public string sex { get; set; }
+        [Description("性别 1 男 2 女")]
+        public string? sex { get; set; }
 
 
         /// <summary>
         /// 卡号
         /// </summary>
         [StringLength(50)]
-        public string card_no { get; set; }
+        [Description("卡号")]
+        public string? card_no { 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 id_no { get; set; }
+        [Description("身份证号")]
+        public string? id_no { get; set; }
 
         /// <summary>
         /// 移动电话
         /// </summary>
         [StringLength(50)]
-        public string mobile { get; set; }
+        [Description("移动电话")]
+        public string? mobile { get; set; }
 
         /// <summary>
         /// 政治面貌
         /// </summary>
         [StringLength(50)]
-        public string politics { get; set; }
+        [Description("政治面貌")]
+        public string? politics { get; set; }
 
         /// <summary>
         /// 备注
         /// </summary>
         [StringLength(255)]
-        public string staff_remark { get; set; }
+        [Description("备注")]
+        public string? staff_remark { get; set; }
 
         /// <summary>
         /// 部门id
         /// </summary>
-        public long dept_id { get; set; }
+        [Description("部门id")]
+        public long? dept_id { get; set; }
 
         /// <summary>
         /// 部门编号
         /// </summary>
         [StringLength(50)]
-        public string dept_no { get; set; }
+        [Description("部门编号")]
+        public string? dept_no { get; set; }
 
 
         /// <summary>
         /// 部门名称
         /// </summary>
         [StringLength(255)]
-        public string dept_name { get; set; }
+        [Description("部门名称")]
+        public string? dept_name { get; set; }
 
         /// <summary>
         /// 数据状态标识 1启用 0停用
         /// </summary>
         [StringLength(255)]
+        [Description("数据状态标识 1启用 0停用")]
+        [DefaultValue(true)]
         public bool state { get; set; }
     }
 }

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

@@ -1,38 +1,45 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
 {
     /// <summary>
     /// 文件上传表
     /// </summary>
+    [Description("文件上传表")]
     public class sys_upload
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
+        [Description("主键id")]
         public long upload_id { get; set; }
 
         /// <summary>
         /// 文件存储路径
         /// </summary>
         [StringLength(255)]
-        public string file_url { get; set; }
+        [Description("文件存储路径")]
+        public string? file_url { get; set; }
 
         /// <summary>
         /// 文件数据类型
         [StringLength(255)]
-        public string data_type { get; set; }
+        [Description("文件数据类型")]
+        public string? data_type { get; set; }
 
         /// <summary>
         /// 文件后缀
         /// </summary>
         [StringLength(255)]
-        public string file_type { get; set; }
+        [Description("文件后缀")]
+        public string? file_type { get; set; }
 
         /// <summary>
         /// 源文件名称
         [StringLength(255)]
-        public string original_file_name { get; set; }
+        [Description("源文件名称")]
+        public string? original_file_name { get; set; }
     }
 }

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

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -7,181 +8,210 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// 客户
     /// </summary>
+    [Description("客户")]
     public class wms_customer:BaseEntity
     {
         /// <summary>
         /// 客户主键id
         /// </summary>
         [Key]
+        [Description("客户主键id")]
         public long customer_id { get; set; }
 
         /// <summary>
         /// 客户编号
         /// </summary>
         [StringLength(80)]
-        public string customer_no { get; set; }
+        [Description("客户编号")]
+        public string? customer_no { get; set; }
 
         /// <summary>
         /// 客户名称
         /// </summary>
         [StringLength(255)]
-        public string customer_name { get; set; }
+        [Description("客户名称")]
+        public string? customer_name { get; set; }
 
         /// <summary>
         /// 客户级别
         /// </summary>
         [StringLength(255)]
-        public string customer_level { get; set; }
+        [Description("客户级别")]
+        public string? customer_level { get; set; }
 
         /// <summary>
         /// 手机号码
         /// </summary>
         [StringLength(80)]
-        public string mobile { get; set; }
+        [Description("手机号码")]
+        public string? mobile { get; set; }
 
         /// <summary>
         /// 电话号码
         /// </summary>
         [StringLength(80)]
-        public string telephone { get; set; }
+        [Description("电话号码")]
+        public string? telephone { get; set; }
 
         /// <summary>
         /// 邮件地址
         /// </summary>
         [StringLength(80)]
-        public string email { get; set; }
+        [Description("邮件地址")]
+        public string? email { get; set; }
 
         /// <summary>
         /// 联系人
         /// </summary>
         [StringLength(80)]
-        public string contact { get; set; }
+        [Description("联系人")]
+        public string? contact { get; set; }
 
         /// <summary>
         /// 邮政编码
         /// </summary>
         [StringLength(80)]
-        public string post_code { get; set; }
+        [Description("邮政编码")]
+        public string? post_code { get; set; }
 
         /// <summary>
         /// 国别地区
         /// </summary>
         [StringLength(255)]
-        public string country { get; set; }
+        [Description("国别地区")]
+        public string? country { get; set; }
 
         /// <summary>
         /// 省份
         /// </summary>
         [StringLength(255)]
-        public string province { get; set; }
+        [Description("省份")]
+        public string? province { get; set; }
 
 
         /// <summary>
         /// 城市
         /// </summary>
         [StringLength(255)]
-        public string city { get; set; }
+        [Description("城市")]
+        public string? city { get; set; }
 
         /// <summary>
         /// 区
         /// </summary>
         [StringLength(255)]
-        public string region { get; set; }
+        [Description("区")]
+        public string? region { get; set; }
 
         /// <summary>
         /// 地址
         /// </summary>
         [StringLength(255)]
-        public string address { get; set; }
+        [Description("地址")]
+        public string? address { get; set; }
 
         /// <summary>
         /// 销售模式
         /// </summary>
         [StringLength(255)]
-        public string sale_mode { get; set; }
+        [Description("销售模式")]
+        public string? sale_mode { get; set; }
 
         /// <summary>
         /// 客户简称
         /// </summary>
         [StringLength(255)]
-        public string short_name { get; set; }
+        [Description("客户简称")]
+        public string? short_name { get; set; }
 
         /// <summary>
         /// 客户简码
         /// </summary>
         [StringLength(255)]
-        public string short_number { get; set; }
+        [Description("客户简码")]
+        public string? short_number { get; set; }
 
         /// <summary>
         /// 状态
         /// </summary>
-        [Required]
-        public int state { get; set; }
+        [StringLength(80)]
+        [Description("状态")]
+        public string? state { get; set; }
 
         /// <summary>
         /// 增值税率
         /// </summary>
         [Precision(18,10)]
-        public decimal value_add_rate { get; set; }
+        [Description("增值税率")]
+        public decimal? value_add_rate { get; set; }
 
         /// <summary>
         /// 默认运输提前期_天
         /// </summary>
         [Required]
+        [Description("默认运输提前期_天")]
         public int carrying_aos { get; set; }
 
         /// <summary>
         /// 法人代表
         /// </summary>
         [StringLength(255)]
-        public string corperate { get; set; }
+        [Description("法人代表")]
+        public string? corperate { get; set; }
 
         /// <summary>
         /// 结算币种
         /// </summary>
         [StringLength(80)]
-        public string currency { get; set; }
+        [Description("结算币种")]
+        public string? currency { get; set; }
 
         /// <summary>
         /// 专营业务员
         /// </summary>
         [StringLength(80)]
-        public string employee_name { get; set; }
+        [Description("专营业务员")]
+        public string? employee_name { get; set; }
 
         /// <summary>
         /// 专营业务员_工号
         /// </summary>
         [StringLength(80)]
-        public string employee_no { get; set; }
+        [Description("专营业务员_工号")]
+        public string? employee_no { get; set; }
 
         /// <summary>
         /// 操作时间
         /// </summary>
-        [StringLength(80)]
-        public string op_time { get; set; }
+        [Description("操作时间")]
+        public DateTime? op_time { get; set; }
 
         /// <summary>
         /// 客户类别编码
         /// </summary>
         [StringLength(255)]
-        public string cust_type_number { get; set; }
+        [Description("客户类别编码")]
+        public string? cust_type_number { get; set; }
 
         /// <summary>
         /// 客户类别
         /// </summary>
         [StringLength(255)]
-        public string cust_type { get; set; }
+        [Description("客户类别")]
+        public string? cust_type { get; set; }
 
         /// <summary>
         /// 客户分组编号
         /// </summary>
         [StringLength(255)]
-        public string cust_group_number { get; set; }
+        [Description("客户分组编号")]
+        public string? cust_group_number { get; set; }
 
         /// <summary>
         /// 客户分组名称
         /// </summary>
         [StringLength(255)]
-        public string cust_group_name { get; set; }
+        [Description("客户分组名称")]
+        public string? cust_group_name { get; set; }
     }
 }

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

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.SystemData
@@ -7,283 +8,332 @@ namespace Bussiness.Model.SystemData
     /// <summary>
     /// 供应商
     /// </summary>
+    [Description("供应商")]
     public class wms_supplier: BaseEntity
     {
         /// <summary>
         /// 供应商主键id
         /// </summary>
         [Key]
+        [Description("供应商主键id")]
         public long supplier_id { get; set; }
 
         /// <summary>
         /// 供应商编号
         /// </summary>
         [StringLength(80)]
-        public string supplier_no { get; set; }
+        [Description("供应商编号")]
+        public string? supplier_no { get; set; }
 
         /// <summary>
         /// 供应商名称
         /// </summary>
         [StringLength(255)]
-        public string supplier_name { get; set; }
+        [Description("供应商名称")]
+        public string? supplier_name { get; set; }
 
         /// <summary>
         /// 供应商全称
         /// </summary>
         [StringLength(255)]
-        public string supplier_full_name { get; set; }
+        [Description("供应商全称")]
+        public string? supplier_full_name { get; set; }
 
         /// <summary>
         /// 供应商助记码
         /// </summary>
         [StringLength(80)]
-        public string supplier_help_code { get; set; }
+        [Description("供应商助记码")]
+        public string? supplier_help_code { get; set; }
 
         /// <summary>
         /// 供应商简称
         /// </summary>
         [StringLength(255)]
-        public string supplier_short_name { get; set; }
+        [Description("供应商简称")]
+        public string? supplier_short_name { get; set; }
 
         /// <summary>
         /// 供应商地址
         /// </summary>
         [StringLength(255)]
-        public string supplier_address { get; set; }
+        [Description("供应商地址")]
+        public string? supplier_address { get; set; }
 
         /// <summary>
         /// 状态
         /// </summary>
-        [Required]
-        public int state { get; set; }
+        [Description("状态")]
+        public string? state { get; set; }
 
         /// <summary>
         /// 区域
         /// </summary>
         [StringLength(255)]
-        public string region { get; set; }
+        [Description("区域")]
+        public string? region { get; set; }
 
         /// <summary>
         /// 行业
         /// </summary>
         [StringLength(255)]
-        public string trade { get; set; }
+        [Description("行业")]
+        public string? trade { get; set; }
 
 
         /// <summary>
         /// 联系人
         /// </summary>
         [StringLength(80)]
-        public string contact { get; set; }
+        [Description("联系人")]
+        public string? contact { get; set; }
 
         /// <summary>
         /// 联系电话
         /// </summary>
         [StringLength(80)]
-        public string telephone { get; set; }
+        [Description("联系电话")]
+        public string? telephone { get; set; }
 
         /// <summary>
         /// 移动电话
         /// </summary>
         [StringLength(80)]
-        public string mobile { get; set; }
+        [Description("移动电话")]
+        public string? mobile { get; set; }
 
         /// <summary>
         /// 传真号码
         /// </summary>
         [StringLength(80)]
-        public string fax { get; set; }
+        [Description("传真号码")]
+        public string? fax { get; set; }
 
         /// <summary>
         /// 邮政编码
         /// </summary>
         [StringLength(80)]
-        public string post_code { get; set; }
+        [Description("邮政编码")]
+        public string? post_code { get; set; }
 
         /// <summary>
         /// 邮件地址
         /// </summary>
         [StringLength(80)]
-        public string email { get; set; }
+        [Description("邮件地址")]
+        public string? email { get; set; }
 
 
         /// <summary>
         /// 税务登记号
         /// </summary>
         [StringLength(255)]
-        public string taxid { get; set; }
+        [Description("税务登记号")]
+        public string? taxid { get; set; }
 
         /// <summary>
         /// 开户银行
         /// </summary>
         [StringLength(255)]
-        public string bank { get; set; }
+        [Description("开户银行")]
+        public string? bank { get; set; }
 
         /// <summary>
         /// 银行账号
         /// </summary>
         [StringLength(80)]
-        public string bank_account { get; set; }
+        [Description("银行账号")]
+        public string? bank_account { get; set; }
 
         /// <summary>
         /// 增值税率
         /// </summary>
         [Precision(18,10)]
-        public decimal value_add_rate { get; set; }
+        [Description("增值税率")]
+        public decimal? value_add_rate { get; set; }
 
         /// <summary>
         /// 供应商分类
         /// </summary>
         [StringLength(80)]
-        public string type { get; set; }
+        [Description("供应商分类")]
+        public string? type { get; set; }
 
         /// <summary>
         /// 采购模式
         /// </summary>
         [StringLength(80)]
-        public string po_mode { get; set; }
+        [Description("采购模式")]
+        public string? po_mode { get; set; }
 
         /// <summary>
         /// VMI仓
         /// </summary>
         [StringLength(255)]
-        public string vmi_stock { get; set; }
+        [Description("VMI仓")]
+        public string? vmi_stock { get; set; }
 
         /// <summary>
         /// 受托代销虚仓
         /// </summary>
         [StringLength(255)]
-        public string stockid_assignee { get; set; }
+        [Description("受托代销虚仓")]
+        public string? stockid_assignee { get; set; }
 
         /// <summary>
         /// 分支机构信息
         /// </summary>
         [StringLength(255)]
-        public string branch_info { get; set; }
+        [Description("分支机构信息")]
+        public string? branch_info { get; set; }
 
         /// <summary>
         /// 注册商标
         /// </summary>
         [StringLength(255)]
-        public string regmark { get; set; }
+        [Description("注册商标")]
+        public string? regmark { get; set; }
 
         /// <summary>
         /// 营业执照
         /// </summary>
         [StringLength(255)]
-        public string licence { get; set; }
+        [Description("营业执照")]
+        public string? licence { get; set; }
 
         /// <summary>
         /// 注册日期
         /// </summary>
-        public DateTime regster_date { get; set; }
+        [Description("注册日期")]
+        public DateTime? regster_date { get; set; }
 
         /// <summary>
         /// 批准日期
         /// </summary>
-        public DateTime approve_date { get; set; }
+        [Description("批准日期")]
+        public DateTime? approve_date { get; set; }
 
         /// <summary>
         /// 生效日期
         /// </summary>
-        public DateTime begin_day { get; set; }
+        [Description("生效日期")]
+        public DateTime? begin_day { get; set; }
 
         /// <summary>
         /// 失效日期
         /// </summary>
-        public DateTime end_day { get; set; }
+        [Description("失效日期")]
+        public DateTime? end_day { get; set; }
 
         /// <summary>
         /// 供应商等级
         /// </summary>
         [StringLength(80)]
-        public string supply_grade { get; set; }
+        [Description("供应商等级")]
+        public string? supply_grade { get; set; }
 
         /// <summary>
         /// 供应类别
         /// </summary>
         [StringLength(80)]
-        public string supply_type { get; set; }
+        [Description("供应类别")]
+        public string? supply_type { get; set; }
 
         /// <summary>
         /// 公司类别
         /// </summary>
         [StringLength(80)]
-        public string company_type { get; set; }
+        [Description("公司类别")]
+        public string? company_type { get; set; }
 
         /// <summary>
         /// 交货自动生成收货单据
         /// </summary>
-        public bool auto_create_mr { get; set; }
+        [Description("交货自动生成收货单据")]
+        [DefaultValue(false)]
+        public bool? auto_create_mr { get; set; }
 
         /// <summary>
         /// 自动确认订单
         /// </summary>
-        public bool auto_validate_order { get; set; }
+        [DefaultValue(false)]
+        [Description("自动确认订单")]
+        public bool? auto_validate_order { get; set; }
 
         /// <summary>
         /// 启用供应商门户
         /// </summary>
-        public bool isuse_supplier_portal { get; set; }
+        [Description("启用供应商门户")]
+        [DefaultValue(true)]
+        public bool? isuse_supplier_portal { get; set; }
 
         /// <summary>
         /// 分管部门
         /// </summary>
         [StringLength(80)]
-        public string department { get; set; }
+        [Description("分管部门")]
+        public string? department { get; set; }
 
         /// <summary>
         /// 专营业务员
         /// </summary>
         [StringLength(80)]
-        public string employee_name { get; set; }
+        [Description("专营业务员")]
+        public string? employee_name { get; set; }
 
         /// <summary>
         /// 专营业务员_工号
         /// </summary>
         [StringLength(80)]
-        public string employee_no { get; set; }
+        [Description("专营业务员_工号")]
+        public string? employee_no { get; set; }
 
         /// <summary>
         /// 结算币种
         /// </summary>
         [StringLength(80)]
-        public string currency { get; set; }
+        [Description("结算币种")]
+        public string? currency { get; set; }
 
         /// <summary>
         /// 结算方式
         /// </summary>
         [StringLength(80)]
-        public string settlement { get; set; }
+        [Description("结算方式")]
+        public string? settlement { get; set; }
 
         /// <summary>
         /// 英文名称
         /// </summary>
         [StringLength(255)]
-        public string name_en { get; set; }
+        [Description("英文名称")]
+        public string? name_en { get; set; }
 
         /// <summary>
         /// 英文地址
         /// </summary>
         [StringLength(255)]
-        public string addr_en { get; set; }
+        [Description("英文地址")]
+        public string? addr_en { get; set; }
 
         /// <summary>
         /// 国别地区
         /// </summary>
         [StringLength(255)]
-        public string country { get; set; }
+        [Description("国别地区")]
+        public string? country { get; set; }
 
         /// <summary>
         /// 审核人
         /// </summary>
         [StringLength(80)]
-        public string checker { get; set; }
+        [Description("审核人")]
+        public string? checker { get; set; }
 
         /// <summary>
         /// 操作时间
         /// </summary>
-        [StringLength(80)]
-        public string op_time { get; set; }
+        [Description("操作时间")]
+        public DateTime? op_time { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/Tech/mes_process.cs

@@ -29,13 +29,6 @@ namespace Bussiness.Model.Tech
         [Description("工序名称")]
         public string proc_name { get; set; }
 
-        /// <summary>
-        /// 是否需要排产:1-是;0-否
-        /// </summary>
-        [Required]
-        [Description("是否需要排产:1-是;0-否")]
-        public int is_schedule { get; set; }
-
         /// <summary>
         /// 简述
         /// </summary>

MicroServices/Business/Bussiness.Model/Tech/mes_tech_process.cs

@@ -38,6 +38,13 @@ namespace Bussiness.Model.Tech
         [Description("组合层级")]
         public int level { get; set; }
 
+        /// <summary>
+        /// 是否需要排产:1-是;0-否
+        /// </summary>
+        [Required]
+        [Description("是否需要排产:1-是;0-否")]
+        public int is_schedule { get; set; }
+
         /// <summary>
         /// 前置准备时间
         /// </summary>