Sfoglia il codice sorgente

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

Murphy 3 anni fa
parent
commit
a2160671e6
32 ha cambiato i file con 461 aggiunte e 30 eliminazioni
  1. 6 6
      MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs
  2. 20 2
      MicroServices/Business/Bussiness.Model/MES/IC/ic_bom.cs
  3. 24 1
      MicroServices/Business/Bussiness.Model/MES/IC/ic_bom_child.cs
  4. 34 0
      MicroServices/Business/Bussiness.Model/MES/IC/ic_factory_details.cs
  5. 40 0
      MicroServices/Business/Bussiness.Model/MES/IC/ic_item.cs
  6. 9 0
      MicroServices/Business/Bussiness.Model/MES/IC/ic_item_ie.cs
  7. 16 0
      MicroServices/Business/Bussiness.Model/MES/IC/ic_item_inventory.cs
  8. 14 0
      MicroServices/Business/Bussiness.Model/MES/IC/ic_item_pur.cs
  9. 7 0
      MicroServices/Business/Bussiness.Model/MES/IC/ic_item_stock.cs
  10. 11 0
      MicroServices/Business/Bussiness.Model/MES/IC/ic_metering_unit.cs
  11. 21 0
      MicroServices/Business/Bussiness.Model/MES/IC/ic_plan.cs
  12. 15 0
      MicroServices/Business/Bussiness.Model/MES/IC/ic_purchase.cs
  13. 8 4
      MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute.cs
  14. 14 4
      MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute_all.cs
  15. 10 4
      MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute_all_dtl.cs
  16. 32 0
      MicroServices/Business/Bussiness.Model/MES/PO/po_list.cs
  17. 28 9
      MicroServices/Business/Bussiness.Model/MES/PO/po_main.cs
  18. 15 0
      MicroServices/Business/Bussiness.Model/MES/PO/po_occupy.cs
  19. 37 0
      MicroServices/Business/Bussiness.Model/MES/PO/pr_main.cs
  20. 7 0
      MicroServices/Business/Bussiness.Model/Tech/mes_process.cs
  21. 6 0
      MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_accessory.cs
  22. 5 0
      MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_document.cs
  23. 5 0
      MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop.cs
  24. 6 0
      MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop_equipment.cs
  25. 5 0
      MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop_icitem.cs
  26. 5 0
      MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop_staff.cs
  27. 15 0
      MicroServices/Business/Bussiness.Model/Tech/mes_tech_process.cs
  28. 7 0
      MicroServices/Business/Bussiness.Model/Tech/mes_technique.cs
  29. 9 0
      MicroServices/Business/Bussiness.Model/Tech/mes_workshop.cs
  30. 6 0
      MicroServices/Business/Bussiness.Model/Tech/mes_workshop_shelf.cs
  31. 17 0
      MicroServices/Business/Bussiness.Model/Tech/work_calendar.cs
  32. 7 0
      MicroServices/Business/Bussiness.Model/Tech/work_calendar_list.cs

+ 6 - 6
MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs

@@ -128,23 +128,23 @@ namespace Business.EntityFrameworkCore
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<replace_group>(b =>
+            builder.Entity<ic_substitute>(b =>
             {
-                b.ToTable("replace_group").HasComment("替代群组");
+                b.ToTable("ic_substitute").HasComment("替代群组");
 
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<replace_group_all>(b =>
+            builder.Entity<ic_substitute_all>(b =>
             {
-                b.ToTable("replace_group_all").HasComment("物料替代多群组");
+                b.ToTable("ic_substitute_all").HasComment("物料替代多群组");
 
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<replace_group_all_dtl>(b =>
+            builder.Entity<ic_substitute_all_dtl>(b =>
             {
-                b.ToTable("replace_group_all_dtl").HasComment("物料替代多群组明细");
+                b.ToTable("ic_substitute_all_dtl").HasComment("物料替代多群组明细");
 
                 b.ConfigureByConvention();
             });

+ 20 - 2
MicroServices/Business/Bussiness.Model/MES/IC/ic_bom.cs

@@ -21,86 +21,104 @@ namespace Bussiness.Model.MES.IC
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long bom_id { get; set; }
         /// <summary>
         /// bom单编号
         /// </summary>
         [StringLength(20)]
+        [Description("bom单编号")]
         public string? bom_number { get; set; }
         /// <summary>
         /// 序号
         /// </summary>
+        [Description("序号")]
         public int bom_num { get; set; }
         /// <summary>
         /// 使用状态
         /// </summary>
+        [Description("使用状态")]
         public int fse_status { get; set; }
         /// <summary>
         /// 生效日期
         /// </summary>
+        [Description("生效日期")]
         public DateTime? begin_day { get; set; }
         /// <summary>
         /// 失效日期
         /// </summary>
+        [Description("失效日期")]
         public DateTime? end_day { get; set; }
         /// <summary>
         /// 工艺主键
         /// </summary>
         [Required]
+        [Description("工艺主键")]
         public long tech_id { get; set; }
         /// <summary>
         /// 工艺名称
         /// </summary>
         [StringLength(20)]
+        [Description("工艺名称")]
         public string? tech_name { get; set; }
 
         /// <summary>
         /// 生产负责人
         /// </summary>
         [StringLength(80)]
+        [Description("生产负责人")]
         public string? product_principal { get; set; }
         /// <summary>
         /// 产品设计员
         /// </summary>
         [StringLength(80)]
+        [Description("产品设计员")]
         public string? product_designer { get; set; }
         /// <summary>
         /// 版本
         /// </summary>
         [StringLength(80)]
+        [Description("版本")]
         public string? version { get; set; }
         /// <summary>
         /// 图表编号
         /// </summary>
         [StringLength(80)]
+        [Description("图表编号")]
         public string? chartnumber { get; set; }
         /// <summary>
         /// 图片
         /// </summary>
         [StringLength(80)]
+        [Description("图片")]
         public string? biller { get; set; }
         /// <summary>
-        /// string
+        /// 检验人
         /// </summary>
         [StringLength(80)]
+        [Description("检验人")]
         public string? checker { get; set; }
         /// <summary>
         /// 检验时间
         /// </summary>
+        [Description("检验时间")]
         public DateTime? check_date { get; set; }
         /// <summary>
         /// bom创建人
         /// </summary>
         [StringLength(20)]
+        [Description("bom创建人")]
         public string? user { get; set; }
         /// <summary>
-        /// 创建时间
+        /// bom创建时间
         /// </summary>
+        [Description("bom创建时间")]
         public DateTime? use_date { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
         [StringLength(20)]
+        [Description("单位")]
         public string? unit { get; set; }
     }
 }

+ 24 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_bom_child.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.MES.IC
@@ -13,100 +14,122 @@ namespace Bussiness.Model.MES.IC
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long bom_child_id { get; set; }
         /// <summary>
         /// bom主键
         /// </summary>
         [Required]
+        [Description("bom主键")]
         public long bom_id { get; set; }
         /// <summary>
         /// bom单编号
         /// </summary>
         [StringLength(20)]
+        [Description("bom单编号")]
         public string? bom_number { get; set; }
         /// <summary>
         /// 父级id
         /// </summary>
         [Required]
+        [Description("父级id")]
         public long parent_child_id { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
         [Required]
+        [Description("物料id")]
         public long icitem_id { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
         [StringLength(20)]
+        [Description("单位")]
         public string? unit { get; set; }
         /// <summary>
         /// 用量
         /// </summary>
         [Precision(20, 8)]
+        [Description("用量")]
         public decimal? qty { get; set; }
         /// <summary>
         /// 损耗率
         /// </summary>
         [Precision(20, 8)]
+        [Description("损耗率")]
         public decimal? scrap { get; set; }
         /// <summary>
         /// 是否倒冲
         /// </summary>
+        [Description("是否倒冲")]
         public int backflush { get; set; }
         /// <summary>
         /// 是否关键件
         /// </summary>
+        [Description("是否关键件")]
         public int iskeyitem { get; set; }
         /// <summary>
         /// 存在替代关系
         /// </summary>
+        [Description("存在替代关系")]
         public int haveicsubs { get; set; }
         /// <summary>
         /// 群组代码
         /// </summary>
         [StringLength(20)]
-        public string? group_code { get; set; }
+        [Description("群组代码")]
+        public string? substitute_code { get; set; }
         /// <summary>
         /// 是否群组替代
         /// </summary>
+        [Description("是否群组替代")]
         public int is_replace { get; set; }
         /// <summary>
         /// 组合模式
         /// </summary>
         [StringLength(2000)]
+        [Description("组合模式")]
         public string? icitem_ids { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
         [StringLength(1000)]
+        [Description("备注")]
         public string? note { get; set; }
         /// <summary>
         /// 顺序号
         /// </summary>
+        [Description("顺序号")]
         public int entryid { get; set; }
         /// <summary>
         /// 物料类型
         /// </summary>
+        [Description("物料类型")]
         public int type { get; set; }
         /// <summary>
         /// 物料属性
         /// </summary>
+        [Description("物料属性")]
         public int erp_cls { get; set; }
         /// <summary>
         /// 使用状态
         /// </summary>
+        [Description("使用状态")]
         public int use_status { get; set; }
         /// <summary>
         /// 生效日期
         /// </summary>
+        [Description("生效日期")]
         public DateTime? begin_day { get; set; }
         /// <summary>
         /// 失效日期
         /// </summary>
+        [Description("失效日期")]
         public DateTime? end_day { get; set; }
         /// <summary>
         /// 操作时间
         /// </summary>
+        [Description("操作时间")]
         public DateTime? op_time { get; set; }
     }
 }

+ 34 - 0
MicroServices/Business/Bussiness.Model/MES/IC/ic_factory_details.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.MES.IC
@@ -13,162 +14,195 @@ namespace Bussiness.Model.MES.IC
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long icitem_dtl_id { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
         [Required]
+        [Description("物料id")]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
+        [Description("物料名称")]
         public string? icitem_name { get; set; }
         /// <summary>
         /// 工厂编码
         /// </summary>
         [StringLength(80)]
+        [Description("工厂编码")]
         public string? factory_fode { get; set; }
         /// <summary>
         /// 特殊备注
         /// </summary>
         [StringLength(1000)]
+        [Description("特殊备注")]
         public string? note { get; set; }
         /// <summary>
         /// 产品线
         /// </summary>
         [StringLength(80)]
+        [Description("产品线")]
         public string? product_line { get; set; }
         /// <summary>
         /// 领料类型
         /// </summary>
         [Required]
+        [Description("领料类型")]
         public long pick_type { get; set; }
         /// <summary>
         /// 是否采用业务批次管理
         /// </summary>
+        [Description("是否采用业务批次管理")]
         public int batch_manager { get; set; }
         /// <summary>
         /// 是否需要库龄管理
         /// </summary>
+        [Description("是否需要库龄管理")]
         public int stock_time { get; set; }
         /// <summary>
         /// 盘点周期单位
         /// </summary>
         [StringLength(80)]
+        [Description("盘点周期单位")]
         public string? check_cycunit { get; set; }
         /// <summary>
         /// 盘点周期
         /// </summary>
         [Precision(20, 8)]
+        [Description("盘点周期")]
         public decimal? check_cycle { get; set; }
         /// <summary>
         /// 每周_月第天
         /// </summary>
+        [Description("每周_月第天")]
         public int days_per { get; set; }
         /// <summary>
         /// 上次盘点日期
         /// </summary>
+        [Description("上次盘点日期")]
         public DateTime? last_checkdate { get; set; }
         /// <summary>
         /// 默认待检仓库
         /// </summary>
         [Required]
+        [Description("默认待检仓库")]
         public long default_chkloc { get; set; }
         /// <summary>
         /// 默认待检仓位
         /// </summary>
         [Required]
+        [Description("默认待检仓位")]
         public long default_chksp { get; set; }
         /// <summary>
         /// 默认仓库
         /// </summary>
         [Required]
+        [Description("默认仓库")]
         public long default_loc { get; set; }
         /// <summary>
         /// 默认仓位
         /// </summary>
         [Required]
+        [Description("默认仓位")]
         public long default_sp { get; set; }
         /// <summary>
         /// 货架信息
         /// </summary>
         [StringLength(80)]
+        [Description("货架信息")]
         public string? item_shelve { get; set; }
         /// <summary>
         /// 默认仓管员
         /// </summary>
         [StringLength(80)]
+        [Description("默认仓管员")]
         public string? default_manager { get; set; }
         /// <summary>
         /// 最低存量
         /// </summary>
         [Precision(20, 8)]
+        [Description("最低存量")]
         public decimal? low_limit { get; set; }
         /// <summary>
         /// 最高存量
         /// </summary>
         [Precision(20, 8)]
+        [Description("最高存量")]
         public decimal? high_limit { get; set; }
         /// <summary>
         /// 最大订货量
         /// </summary>
         [Precision(20, 8)]
+        [Description("最大订货量")]
         public decimal? qty_max { get; set; }
         /// <summary>
         /// 日消耗量
         /// </summary>
         [Precision(20, 8)]
+        [Description("日消耗量")]
         public decimal? daily_consume { get; set; }
         /// <summary>
         /// 材料成本差异科目代码
         /// </summary>
         [Required]
+        [Description("材料成本差异科目代码")]
         public long mcv_acct { get; set; }
         /// <summary>
         /// 加工费差异科目代码
         /// </summary>
         [Required]
+        [Description("加工费差异科目代码")]
         public long pcv_acct { get; set; }
         /// <summary>
         /// 废品损失科目代码
         /// </summary>
         [Required]
+        [Description("废品损失科目代码")]
         public long sl_acct { get; set; }
         /// <summary>
         /// 标准成本调整差异科目代码
         /// </summary>
         [Required]
+        [Description("标准成本调整差异科目代码")]
         public long cav_acct { get; set; }
         /// <summary>
         /// 库存备注
         /// </summary>
         [StringLength(1000)]
+        [Description("库存备注")]
         public string? warehouse_note { get; set; }
         /// <summary>
         /// 工单发料时间/天
         /// </summary>
         [Precision(20, 8)]
+        [Description("工单发料时间/天")]
         public decimal? ordissu_days { get; set; }
         /// <summary>
         /// 原材料收货处理时间/天
         /// </summary>
         [Precision(20, 8)]
+        [Description("原材料收货处理时间/天")]
         public decimal? raw_matreceiv_days { get; set; }
         /// <summary>
         /// 成品入库时间/天
         /// </summary>
         [Precision(20, 8)]
+        [Description("成品入库时间/天")]
         public decimal? prdenter_days { get; set; }
         /// <summary>
         /// 原材料入库时间/天
         /// </summary>
         [Precision(20, 8)]
+        [Description("原材料入库时间/天")]
         public decimal? mat_enter_days { get; set; }
         /// <summary>
         /// 成品发货时间/天
         /// </summary>
         [Precision(20, 8)]
+        [Description("成品发货时间/天")]
         public decimal? prd_out_days { get; set; }
 
     }

+ 40 - 0
MicroServices/Business/Bussiness.Model/MES/IC/ic_item.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.MES.IC
@@ -13,187 +14,226 @@ namespace Bussiness.Model.MES.IC
         /// 物料id
         /// </summary>
         [Key]
+        [Description("物料id")]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料编码
         /// </summary>
         [StringLength(80)]
+        [Description("物料编码")]
         public string? number { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
+        [Description("物料名称")]
         public string? name { get; set; }
         /// <summary>
         /// 规格型号
         /// </summary>
         [StringLength(200)]
+        [Description("规格型号")]
         public string? model { get; set; }
         /// <summary>
         /// 全名
         /// </summary>
         [StringLength(255)]
+        [Description("全名")]
         public string? full_name { get; set; }
         /// <summary>
         /// fms旧料号
         /// </summary>
         [StringLength(80)]
+        [Description("fms旧料号")]
         public string? fms_number { get; set; }
         /// <summary>
         /// erp旧料号
         /// </summary>
         [StringLength(80)]
+        [Description("erp旧料号")]
         public string? erp_oldnumber { get; set; }
         /// <summary>
         /// 图号
         /// </summary>
         [StringLength(80)]
+        [Description("图号")]
         public string? chart_number { get; set; }
         /// <summary>
         /// 版本号
         /// </summary>
         [StringLength(80)]
+        [Description("版本号")]
         public string? fversion { get; set; }
         /// <summary>
         /// 盒贴规格
         /// </summary>
         [StringLength(200)]
+        [Description("盒贴规格")]
         public string? box_model { get; set; }
         /// <summary>
         /// 物料属性
         /// </summary>
         [StringLength(80)]
+        [Description("物料属性")]
         public string? erp_cls { get; set; }
         /// <summary>
         /// 物料等级
         /// </summary>
         [Required]
+        [Description("物料等级")]
         public long item_level { get; set; }
         /// <summary>
         /// 环保等级
         /// </summary>
         [Required]
+        [Description("环保等级")]
         public long hb_level { get; set; }
         /// <summary>
         /// 单位标准工时_小时
         /// </summary>
         [Precision(20, 8)]
+        [Description("单位标准工时_小时")]
         public decimal? standard_manhour { get; set; }
         /// <summary>
         /// 单位材料定额_元
         /// </summary>
         [Precision(20, 8)]
+        [Description("单位材料定额_元")]
         public decimal? unititem_amount { get; set; }
         /// <summary>
         /// 来源
         /// </summary>
         [StringLength(200)]
+        [Description("来源")]
         public string? source { get; set; }
         /// <summary>
         /// 是否为设备
         /// </summary>
+        [Description("是否为设备")]
         public int is_equipment { get; set; }
         /// <summary>
         /// 单位包装数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("单位包装数量")]
         public decimal? unit_qty { get; set; }
         /// <summary>
         /// 严格进行二维码数量校验
         /// </summary>
         [StringLength(80)]
+        [Description("严格进行二维码数量校验")]
         public string? check_bybarcode { get; set; }
         /// <summary>
         /// 是否关键件
         /// </summary>
+        [Description("是否关键件")]
         public int iskeyitem { get; set; }
         /// <summary>
         /// 毛重
         /// </summary>
         [Precision(20, 8)]
+        [Description("毛重")]
         public decimal? gross_weight { get; set; }
         /// <summary>
         /// 净重
         /// </summary>
         [Precision(20, 8)]
+        [Description("净重")]
         public decimal? net_weight { get; set; }
         /// <summary>
         /// 重量单位
         /// </summary>
         [StringLength(80)]
+        [Description("重量单位")]
         public string? maund { get; set; }
         /// <summary>
         /// 长度
         /// </summary>
         [Precision(20, 8)]
+        [Description("长度")]
         public decimal? length { get; set; }
         /// <summary>
         /// 长度单位
         /// </summary>
         [StringLength(80)]
+        [Description("长度单位")]
         public string? cubic_measure { get; set; }
         /// <summary>
         /// 宽度
         /// </summary>
         [Precision(20, 8)]
+        [Description("宽度")]
         public decimal? width { get; set; }
         /// <summary>
         /// 高度
         /// </summary>
         [Precision(20, 8)]
+        [Description("高度")]
         public decimal? height { get; set; }
         /// <summary>
         /// 体积
         /// </summary>
         [Precision(20, 8)]
+        [Description("体积")]
         public decimal? size { get; set; }
         /// <summary>
         /// 物料类别
         /// </summary>
         [Required]
+        [Description("物料类别")]
         public long matatt { get; set; }
         /// <summary>
         /// 允许采购
         /// </summary>
+        [Description("允许采购")]
         public int allowpur { get; set; }
         /// <summary>
         /// 允许销售
         /// </summary>
+        [Description("允许销售")]
         public int allowsale { get; set; }
         /// <summary>
         /// 允许生产
         /// </summary>
+        [Description("允许生产")]
         public int allowmanu { get; set; }
         /// <summary>
         /// 允许委外
         /// </summary>
+        [Description("允许委外")]
         public int allowout { get; set; }
         /// <summary>
         /// 批号管理
         /// </summary>
+        [Description("批号管理")]
         public int allowbatch { get; set; }
         /// <summary>
         /// 序列号管理
         /// </summary>
+        [Description("序列号管理")]
         public int allowserial { get; set; }
         /// <summary>
         /// 图片
         /// </summary>
         [StringLength(80)]
+        [Description("图片")]
         public string? photo { get; set; }
         /// <summary>
         /// 领料类型
         /// </summary>
         [Required]
+        [Description("领料类型")]
         public long picktype { get; set; }
         /// <summary>
         /// 出库类型
         /// </summary>
         [Required]
+        [Description("出库类型")]
         public long output_type_id { get; set; }
         /// <summary>
         /// 启用预警
         /// </summary>
+        [Description("启用预警")]
         public int enable_warning { get; set; }
     }
 }

+ 9 - 0
MicroServices/Business/Bussiness.Model/MES/IC/ic_item_ie.cs

@@ -1,6 +1,7 @@
 using Business.Model;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -17,39 +18,47 @@ namespace Bussiness.Model.MES.IC
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long ic_item_ie_id { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
         [Required]
+        [Description("物料id")]
         public long icitem_id { get; set; }
         /// <summary>
         /// 是否倒冲
         /// </summary>
+        [Description("是否倒冲")]
         public int isbackflush { get; set; }
         /// <summary>
         /// 生产负责人
         /// </summary>
         [StringLength(80)]
+        [Description("生产负责人")]
         public string? product_principal { get; set; }
         /// <summary>
         /// 倒冲仓库
         /// </summary>
         [StringLength(80)]
+        [Description("倒冲仓库")]
         public string? back_flush_stock { get; set; }
         /// <summary>
         /// 倒冲仓位
         /// </summary>
         [StringLength(80)]
+        [Description("倒冲仓位")]
         public string? back_flush_sp { get; set; }
         /// <summary>
         /// 投料自动取整
         /// </summary>
+        [Description("投料自动取整")]
         public int put_integer { get; set; }
         /// <summary>
         /// ie备注
         /// </summary>
         [StringLength(1000)]
+        [Description("ie备注")]
         public string? ir_note { get; set; }
     }
 }

+ 16 - 0
MicroServices/Business/Bussiness.Model/MES/IC/ic_item_inventory.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.MES.IC
@@ -13,74 +14,89 @@ namespace Bussiness.Model.MES.IC
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long icitem_inventory_id { get; set; }
         /// <summary>
         /// 物料库存主键
         /// </summary>
         [Required]
+        [Description("物料库存主键")]
         public long icitem_stock_id { get; set; }
         /// <summary>
         /// 仓库id
         /// </summary>
         [Required]
+        [Description("仓库id")]
         public long stock_id { get; set; }
         /// <summary>
         /// 仓库名称
         /// </summary>
         [StringLength(80)]
+        [Description("仓库名称")]
         public string? stock_name { get; set; }
         /// <summary>
         /// 库位id
         /// </summary>
         [Required]
+        [Description("库位id")]
         public long stock_place_id { get; set; }
         /// <summary>
         /// 库位编码
         /// </summary>
         [StringLength(80)]
+        [Description("库位编码")]
         public string? stock_place_code { get; set; }
         /// <summary>
         /// 批次号
         /// </summary>
         [StringLength(80)]
+        [Description("批次号")]
         public string? batch_no { get; set; }
         /// <summary>
         /// 数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("数量")]
         public decimal? qty { get; set; }
         /// <summary>
         /// 金额
         /// </summary>
         [Precision(20, 8)]
+        [Description("金额")]
         public decimal? bal { get; set; }
         /// <summary>
         /// 保质期时长
         /// </summary>
         [Precision(20, 8)]
+        [Description("保质期时长")]
         public decimal? kf_period { get; set; }
         /// <summary>
         /// 保质期时间
         /// </summary>
+        [Description("保质期时间")]
         public DateTime? kf_date { get; set; }
         /// <summary>
         /// 锁定库存
         /// </summary>
         [Precision(20, 8)]
+        [Description("锁定库存")]
         public decimal? qty_lock { get; set; }
         /// <summary>
         /// 安全库存
         /// </summary>
         [Precision(20, 8)]
+        [Description("安全库存")]
         public decimal? sec_qty { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
         [StringLength(80)]
+        [Description("单位")]
         public string? unit { get; set; }
         /// <summary>
         /// 日期
         /// </summary>
+        [Description("日期")]
         public DateTime? rq { get; set; }
 
     }

+ 14 - 0
MicroServices/Business/Bussiness.Model/MES/IC/ic_item_pur.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.MES.IC
@@ -13,66 +14,79 @@ namespace Bussiness.Model.MES.IC
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long icitem_pur_id { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
         [Required]
+        [Description("物料id")]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
+        [Description("物料名称")]
         public string? icitem_name { get; set; }
         /// <summary>
         /// 采购计划id
         /// </summary>
         [Required]
+        [Description("采购计划id")]
         public long ic_plan_id { get; set; }
         /// <summary>
         /// 供应商id
         /// </summary>
         [Required]
+        [Description("供应商id")]
         public long supplier_id { get; set; }
         /// <summary>
         /// 供应商编码
         /// </summary>
         [StringLength(80)]
+        [Description("供应商编码")]
         public string? supplier_number { get; set; }
         /// <summary>
         /// 供应商名称
         /// </summary>
         [StringLength(80)]
+        [Description("供应商名称")]
         public string? supplier_name { get; set; }
         /// <summary>
         /// 采购组
         /// </summary>
         [StringLength(80)]
+        [Description("采购组")]
         public string? purchgroup { get; set; }
         /// <summary>
         /// 采购员
         /// </summary>
         [StringLength(80)]
+        [Description("采购员")]
         public string? purcher { get; set; }
         /// <summary>
         /// 采购计量单位
         /// </summary>
         [StringLength(80)]
+        [Description("采购计量单位")]
         public string? purchase_unit { get; set; }
         /// <summary>
         /// 采购净价(不含税)
         /// </summary>
         [Precision(20, 8)]
+        [Description("采购净价(不含税)")]
         public decimal? netpurchase_price { get; set; }
         /// <summary>
         /// 税率
         /// </summary>
         [Precision(20, 8)]
+        [Description("税率")]
         public decimal? taxrate { get; set; }
         /// <summary>
         /// 币种
         /// </summary>
         [Required]
+        [Description("币种")]
         public long currency_type { get; set; }
     }
 }

+ 7 - 0
MicroServices/Business/Bussiness.Model/MES/IC/ic_item_stock.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.MES.IC
@@ -13,31 +14,37 @@ namespace Bussiness.Model.MES.IC
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long icitem_stock_id { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
         [Required]
+        [Description("物料id")]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
+        [Description("物料名称")]
         public string? icitem_name { get; set; }
         /// <summary>
         /// 物料库存量
         /// </summary>
         [Precision(20, 8)]
+        [Description("物料库存量")]
         public decimal? sqty { get; set; }
         /// <summary>
         /// 调拨在途数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("调拨在途数量")]
         public decimal? quantity_in_transit { get; set; }
         /// <summary>
         /// 工厂编码
         /// </summary>
         [StringLength(80)]
+        [Description("工厂编码")]
         public string? factory_fode { get; set; }
 
     }

+ 11 - 0
MicroServices/Business/Bussiness.Model/MES/IC/ic_metering_unit.cs

@@ -1,6 +1,7 @@
 using Business.Model;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -17,50 +18,60 @@ namespace Bussiness.Model.MES.IC
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long ic_metering_unit_id { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
         [Required]
+        [Description("物料id")]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
+        [Description("物料名称")]
         public string? icitem_name { get; set; }
         /// <summary>
         /// 计量单位组
         /// </summary>
         [StringLength(80)]
+        [Description("计量单位组")]
         public string? unit_group { get; set; }
         /// <summary>
         /// 基本计量单位
         /// </summary>
         [StringLength(80)]
+        [Description("基本计量单位")]
         public string? unit { get; set; }
         /// <summary>
         /// 采购计量单位
         /// </summary>
         [StringLength(80)]
+        [Description("采购计量单位")]
         public string? order_unit { get; set; }
         /// <summary>
         /// 销售计量单位
         /// </summary>
         [StringLength(80)]
+        [Description("销售计量单位")]
         public string? sale_unit { get; set; }
         /// <summary>
         /// 生产计量单位
         /// </summary>
         [StringLength(80)]
+        [Description("生产计量单位")]
         public string? product_unit { get; set; }
         /// <summary>
         /// 库存计量单位
         /// </summary>
         [StringLength(80)]
+        [Description("库存计量单位")]
         public string? store_unit { get; set; }
         /// <summary>
         /// 数量精度
         /// </summary>
+        [Description("数量精度")]
         public int qty_decimal { get; set; }
 
     }

+ 21 - 0
MicroServices/Business/Bussiness.Model/MES/IC/ic_plan.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.MES.IC
@@ -13,96 +14,116 @@ namespace Bussiness.Model.MES.IC
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long ic_plan_id { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
         [Required]
+        [Description("物料id")]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
+        [Description("物料名称")]
         public string? icitem_name { get; set; }
         /// <summary>
         /// 计划员
         /// </summary>
         [StringLength(80)]
+        [Description("计划员")]
         public string? planner_name { get; set; }
         /// <summary>
         /// 计划员_工号
         /// </summary>
         [StringLength(80)]
+        [Description("计划员_工号")]
         public string? planner_num { get; set; }
         /// <summary>
         /// 工厂编码
         /// </summary>
         [StringLength(80)]
+        [Description("工厂编码")]
         public string? factory_code { get; set; }
         /// <summary>
         /// 固定提前期(天)
         /// </summary>
         [Precision(20, 8)]
+        [Description("固定提前期(天)")]
         public decimal? fix_leadtime { get; set; }
         /// <summary>
         /// 计划策略
         /// </summary>
+        [Description("计划策略")]
         public int plan_trategy { get; set; }
         /// <summary>
         /// 订货策略
         /// </summary>
+        [Description("订货策略")]
         public int order_trategy { get; set; }
         /// <summary>
         /// 订货间隔期_天
         /// </summary>
         [Precision(20, 8)]
+        [Description("订货间隔期_天")]
         public decimal? order_inter_val { get; set; }
         /// <summary>
         /// 变动提前期
         /// </summary>
         [Precision(20, 8)]
+        [Description("变动提前期")]
         public decimal? lead_time { get; set; }
         /// <summary>
         /// 变动提前期批量
         /// </summary>
         [Precision(20, 8)]
+        [Description("变动提前期批量")]
         public decimal? bat_change_economy { get; set; }
         /// <summary>
         /// 累计提前期
         /// </summary>
         [Precision(20, 8)]
+        [Description("累计提前期")]
         public decimal? total_tqq { get; set; }
         /// <summary>
         /// 再订货点
         /// </summary>
         [StringLength(80)]
+        [Description("再订货点")]
         public string? order_point { get; set; }
         /// <summary>
         /// 设置为固定再订货点
         /// </summary>
+        [Description("设置为固定再订货点")]
         public int isfixedreorder { get; set; }
         /// <summary>
         /// 安全库存数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("安全库存数量")]
         public decimal? secinv { get; set; }
         /// <summary>
         /// 安全库存触发采购比例
         /// </summary>
         [Precision(20, 8)]
+        [Description("安全库存触发采购比例")]
         public decimal? secinv_ratio { get; set; }
         /// <summary>
         /// 是否需要进行订补货计划的运算
         /// </summary>
+        [Description("是否需要进行订补货计划的运算")]
         public int book_plan { get; set; }
         /// <summary>
         /// 辅助属性参与计划运算
         /// </summary>
+        [Description("辅助属性参与计划运算")]
         public int aux_prop_plan { get; set; }
         /// <summary>
         /// 计划备注
         /// </summary>
         [StringLength(1000)]
+        [Description("计划备注")]
         public string? plannote { get; set; }
     }
 }

+ 15 - 0
MicroServices/Business/Bussiness.Model/MES/IC/ic_purchase.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.MES.IC
@@ -13,71 +14,85 @@ namespace Bussiness.Model.MES.IC
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long ic_purchase_id { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
         [Required]
+        [Description("物料id")]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
+        [Description("物料名称")]
         public string? icitem_name { get; set; }
         /// <summary>
         /// 计划id
         /// </summary>
         [Required]
+        [Description("计划id")]
         public long ic_plan_id { get; set; }
         /// <summary>
         /// 采购负责人
         /// </summary>
         [StringLength(80)]
+        [Description("采购负责人")]
         public string? order_rector_name { get; set; }
         /// <summary>
         /// 采购负责人_工号
         /// </summary>
         [StringLength(80)]
+        [Description("采购负责人_工号")]
         public string? order_rector_num { get; set; }
         /// <summary>
         /// 工厂编码
         /// </summary>
         [StringLength(80)]
+        [Description("工厂编码")]
         public string? factory_code { get; set; }
         /// <summary>
         /// 采购部门
         /// </summary>
         [StringLength(80)]
+        [Description("采购部门")]
         public string? order_dept { get; set; }
         /// <summary>
         /// 采购单价
         /// </summary>
         [Precision(20, 8)]
+        [Description("采购单价")]
         public decimal? order_price { get; set; }
         /// <summary>
         /// 销售单价
         /// </summary>
         [Precision(20, 8)]
+        [Description("销售单价")]
         public decimal? sale_price { get; set; }
         /// <summary>
         /// 最小订货量
         /// </summary>
         [Precision(20, 8)]
+        [Description("最小订货量")]
         public decimal? qty_min { get; set; }
         /// <summary>
         /// 批量增量
         /// </summary>
         [Precision(20, 8)]
+        [Description("批量增量")]
         public decimal? batch_append_qty { get; set; }
         /// <summary>
         /// 采购订单差异科目代码
         /// </summary>
         [Required]
+        [Description("采购订单差异科目代码")]
         public long pov_acct { get; set; }
         /// <summary>
         /// 采购发票差异科目代码
         /// </summary>
         [Required]
+        [Description("采购发票差异科目代码")]
         public long piv_acct { get; set; }
 
     }

+ 8 - 4
MicroServices/Business/Bussiness.Model/MES/IC/replace_group.cs → MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute.cs

@@ -1,6 +1,7 @@
 using Business.Model;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Security.AccessControl;
@@ -12,22 +13,25 @@ namespace Bussiness.Model.MES.IC
     /// <summary>
     /// 替代群组
     /// </summary>
-    public class replace_group : BaseEntity
+    public class ic_substitute : BaseEntity
     {
         /// <summary>
         /// 主键
         /// </summary>
         [Key]
-        public long group_id { get; set; }
+        [Description("主键")]
+        public long substitute_id { get; set; }
         /// <summary>
         /// 群组代码
         /// </summary>
         [StringLength(20)]
-        public string? group_code { get; set; }
+        [Description("群组代码")]
+        public string? substitute_code { get; set; }
         /// <summary>
         /// 替代类型
         /// </summary>
-        public int replace_type { get; set; }
+        [Description("替代类型")]
+        public int substitute_type { get; set; }
 
     }
 }

+ 14 - 4
MicroServices/Business/Bussiness.Model/MES/IC/replace_group_all.cs → MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute_all.cs

@@ -1,6 +1,7 @@
 using Business.Model;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -11,51 +12,60 @@ namespace Bussiness.Model.MES.IC
     /// <summary>
     /// 物料替代多群组
     /// </summary>
-    public class replace_group_all : BaseEntity
+    public class ic_substitute_all : BaseEntity
     {
         /// <summary>
         /// 替代群组主键
         /// </summary>
         [Key]
-        public long group_allid { get; set; }
+        [Description("主键")]
+        public long substitute_allid { get; set; }
         /// <summary>
         /// 群组主键
         /// </summary>
         [Required]
-        public long group_id { get; set; }
+        [Description("群组主键")]
+        public long substitute_id { get; set; }
         /// <summary>
         /// 群组代码
         /// </summary>
         [StringLength(20)]
-        public string? group_code { get; set; }
+        [Description("群组代码")]
+        public string? substitute_code { get; set; }
         /// <summary>
         /// 替代关系
         /// </summary>
         [StringLength(2000)]
+        [Description("替代关系")]
         public string? replace_relation { get; set; }
         /// <summary>
         /// 替代名称
         /// </summary>
         [StringLength(50)]
+        [Description("替代名称")]
         public string? replace_name { get; set; }
         /// <summary>
         /// 替代方式
         /// </summary>
         [StringLength(50)]
+        [Description("替代方式")]
         public string? replace_way { get; set; }
         /// <summary>
         /// 产品线
         /// </summary>
         [StringLength(50)]
+        [Description("产品线")]
         public string? product_line { get; set; }
         /// <summary>
         /// 使用机型
         /// </summary>
         [StringLength(5000)]
+        [Description("使用机型")]
         public string? use_model { get; set; }
         /// <summary>
         /// 排序
         /// </summary>
+        [Description("排序")]
         public int order_num { get; set; }
 
     }

+ 10 - 4
MicroServices/Business/Bussiness.Model/MES/IC/replace_group_all_dtl.cs → MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute_all_dtl.cs

@@ -1,6 +1,7 @@
 using Business.Model;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -11,31 +12,36 @@ namespace Bussiness.Model.MES.IC
     /// <summary>
     /// 物料替代多群组明细
     /// </summary>
-    public class replace_group_all_dtl : BaseEntity
+    public class ic_substitute_all_dtl : BaseEntity
     {
         /// <summary>
         /// 明细主键
         /// </summary>
         [Key]
-        public long group_dtlid { get; set; }
+        [Description("主键")]
+        public long substitute_dtlid { get; set; }
         /// <summary>
         /// 替代多群组主键
         /// </summary>
         [Required]
-        public long group_allid { get; set; }
+        [Description("替代多群组主键")]
+        public long substitute_allid { get; set; }
         /// <summary>
         /// 群组代码
         /// </summary>
         [StringLength(20)]
-        public string? group_code { get; set; }
+        [Description("群组代码")]
+        public string? substitute_code { get; set; }
         /// <summary>
         /// 物料主键
         /// </summary>
         [Required]
+        [Description("物料主键")]
         public long icitem_id { get; set; }
         /// <summary>
         /// 主/替
         /// </summary>
+        [Description("主/替")]
         public int ismain { get; set; }
 
     }

+ 32 - 0
MicroServices/Business/Bussiness.Model/MES/PO/po_list.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.MES.PO
@@ -13,151 +14,182 @@ namespace Bussiness.Model.MES.PO
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long polist_id { get; set; }
         /// <summary>
         /// po单id
         /// </summary>
         [Required]
+        [Description("po单id")]
         public long po_id { get; set; }
         /// <summary>
         /// po单号
         /// </summary>
         [StringLength(80)]
+        [Description("po单号")]
         public string? po_billno { get; set; }
         /// <summary>
         /// 行号
         /// </summary>
+        [Description("行号")]
         public int polist_row { get; set; }
         /// <summary>
         /// pr申请单id
         /// </summary>
         [Required]
+        [Description("pr申请单id")]
         public long pr_id { get; set; }
         /// <summary>
         /// pr申请单号
         /// </summary>
         [StringLength(80)]
+        [Description("pr申请单号")]
         public string? pr_billno { get; set; }
         /// <summary>
         /// 关联工单号
         /// </summary>
         [StringLength(80)]
+        [Description("关联工单号")]
         public string? po_mono { get; set; }
         /// <summary>
         /// 供应商id
         /// </summary>
         [Required]
+        [Description("供应商id")]
         public long pr_purchase_id { get; set; }
         /// <summary>
         /// 供应商名称
         /// </summary>
         [StringLength(80)]
+        [Description("供应商名称")]
         public string? pr_purchase_name { get; set; }
         /// <summary>
         /// 收货仓库id
         /// </summary>
         [Required]
+        [Description("收货仓库id")]
         public long stock_id { get; set; }
         /// <summary>
         /// 收货仓库名称
         /// </summary>
         [StringLength(80)]
+        [Description("收货仓库名称")]
         public string? stock_name { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
         [Required]
+        [Description("物料id")]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(100)]
+        [Description("物料名称")]
         public string? icitem_name { get; set; }
         /// <summary>
         /// 订单数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("订单数量")]
         public decimal? qty { get; set; }
         /// <summary>
         /// 净价
         /// </summary>
         [Precision(20, 8)]
+        [Description("净价")]
         public decimal? netprice { get; set; }
         /// <summary>
         /// 税率
         /// </summary>
         [Precision(20, 8)]
+        [Description("税率")]
         public decimal? rate { get; set; }
         /// <summary>
         /// 含税单价
         /// </summary>
         [Precision(20, 8)]
+        [Description("含税单价")]
         public decimal? price { get; set; }
         /// <summary>
         /// 总价
         /// </summary>
         [Precision(20, 8)]
+        [Description("总价")]
         public decimal? total_price { get; set; }
         /// <summary>
         /// 计划数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("计划数量")]
         public decimal? plan_qty { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
         [Required]
+        [Description("单位")]
         public long unit { get; set; }
         /// <summary>
         /// 数据状态标识 0停用 1启用
         /// </summary>
+        [Description("数据状态标识")]
         public int state { get; set; }
         /// <summary>
         /// 需求到货日期
         /// </summary>
+        [Description("需求到货日期")]
         public DateTime? rarrdate { get; set; }
         /// <summary>
         /// 评审状态(0-待评审、1-评审通过、2-评审未通过)
         /// </summary>
+        [Description("评审状态")]
         public int rstate { get; set; }
         /// <summary>
         /// 评审次数
         /// </summary>
+        [Description("评审次数")]
         public int rnumber { get; set; }
         /// <summary>
         /// 已收货数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("已收货数量")]
         public decimal? rqty { get; set; }
         /// <summary>
         /// 已入库数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("已入库数量")]
         public decimal? esqty { get; set; }
         /// <summary>
         /// 采购到货日期
         /// </summary>
         [Precision(20, 8)]
+        [Description("采购到货日期")]
         public decimal? procurement_rarr_date { get; set; }
         /// <summary>
         /// 再计划到货日期
         /// </summary>
         [Precision(20, 8)]
+        [Description("再计划到货日期")]
         public decimal? rparrive_date { get; set; }
         /// <summary>
         /// 供应商交期
         /// </summary>
         [Precision(20, 8)]
+        [Description("供应商交期")]
         public decimal? purchase_date { get; set; }
         /// <summary>
         /// 采购确认到货日期
         /// </summary>
         [Precision(20, 8)]
+        [Description("采购确认到货日期")]
         public decimal? pur_affirmdate { get; set; }
         /// <summary>
         /// 币别
         /// </summary>
         [Required]
+        [Description("币别")]
         public long currencytype { get; set; }
 
     }

+ 28 - 9
MicroServices/Business/Bussiness.Model/MES/PO/po_main.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.MES.PO
@@ -13,91 +14,109 @@ namespace Bussiness.Model.MES.PO
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long po_Id { get; set; }
 
         /// <summary>
         /// PO单号
         /// </summary>
-        [Required]
         [StringLength(80)]
-        public string po_billno { get; set; }
+        [Description("PO单号")]
+        public string? po_billno { get; set; }
         /// <summary>
         /// 采购员
         /// </summary>
         [StringLength(80)]
-        public string po_purchaser { get; set; }
+        [Description("采购员")]
+        public string? po_purchaser { get; set; }
         /// <summary>
         /// 采购员工号
         /// </summary>
         [StringLength(80)]
-        public string po_purchaser_no { get; set; }
+        [Description("采购员工号")]
+        public string? po_purchaser_no { get; set; }
         /// <summary>
         /// 供应商id
         /// </summary>
         [Required]
+        [Description("供应商id")]
         public long po_purchase_id { get; set; }
         /// <summary>
         /// 供应商名称
         /// </summary>
         [StringLength(80)]
-        public string po_purchase_name { get; set; }
+        [Description("供应商名称")]
+        public string? po_purchase_name { get; set; }
         /// <summary>
         /// 下单日期
         /// </summary>
+        [Description("下单日期")]
         public DateTime? po_ssend_date { get; set; }
         /// <summary>
         /// 订单总价
         /// </summary>
         [Precision(20, 8)]
-        public decimal po_total { get; set; }
+        [Description("订单总价")]
+        public decimal? po_total { get; set; }
         /// <summary>
         /// 交货方式
         /// </summary>
         [Required]
+        [Description("交货方式")]
         public long po_delivery { get; set; }
         /// <summary>
         /// 税率
         /// </summary>
         [Precision(20, 8)]
-        public decimal po_tax_rate { get; set; }
+        [Description("税率")]
+        public decimal? po_tax_rate { get; set; }
         /// <summary>
         /// 是否加急
         /// </summary>
+        [Description("是否加急")]
         public int po_express { get; set; }
         /// <summary>
         /// 数据状态(0-新增、1-通过、2-完成、3-关闭、4-未通过)
         /// </summary>
+        [Description("数据状态")]
         public int state { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
         [StringLength(1000)]
-        public string po_note { get; set; }
+        [Description("备注")]
+        public string? po_note { get; set; }
         /// <summary>
         /// 评审状态
         /// </summary>
+        [Description("评审状态")]
         public int rstate { get; set; }
         /// <summary>
         /// 评审次数
         /// </summary>
         [Precision(20, 8)]
-        public decimal rnumber { get; set; }
+        [Description("评审次数")]
+        public decimal? rnumber { get; set; }
         /// <summary>
         /// 评审通过时间
         /// </summary>
+        [Description("评审通过时间")]
         public DateTime? review_rtime { get; set; }
         /// <summary>
         /// 单据类型
         /// </summary>
+        [Description("单据类型")]
         public int po_order_type { get; set; }
         /// <summary>
         /// 币别
         /// </summary>
         [Required]
+        [Description("币别")]
         public long currency { get; set; }
         /// <summary>
         /// 金蝶单据类型值(标准采购订单、标准委外订单)
         /// </summary>
+        [Description("金蝶单据类型值")]
         public int bill_type { get; set; }
     }
 }

+ 15 - 0
MicroServices/Business/Bussiness.Model/MES/PO/po_occupy.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.MES.PO
@@ -13,65 +14,79 @@ namespace Bussiness.Model.MES.PO
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long pooccupy_id { get; set; }
         /// <summary>
         /// 采购订单id
         /// </summary>
         [Required]
+        [Description("采购订单id")]
         public long polist_id { get; set; }
         /// <summary>
         /// 采购订单行号
         /// </summary>
+        [Description("采购订单行号")]
         public int polist_row { get; set; }
         /// <summary>
         /// 客户订单行id
         /// </summary>
         [Required]
+        [Description("客户订单行id")]
         public long eid { get; set; }
         /// <summary>
         /// 客户订单id
         /// </summary>
         [Required]
+        [Description("客户订单id")]
         public long bill_no { get; set; }
         /// <summary>
         /// 类型
         /// </summary>
         [StringLength(80)]
+        [Description("类型")]
         public string? type { get; set; }
         /// <summary>
         /// 行号
         /// </summary>
+        [Description("行号")]
         public int entry_id { get; set; }
         /// <summary>
         /// 占用量
         /// </summary>
         [Precision(20, 8)]
+        [Description("占用量")]
         public decimal? qty { get; set; }
         /// <summary>
         /// 开始时间
         /// </summary>
+        [Description("开始时间")]
         public DateTime? stime { get; set; }
         /// <summary>
         /// 结束时间
         /// </summary>
+        [Description("结束时间")]
         public DateTime? etime { get; set; }
         /// <summary>
         /// 占用状态
         /// </summary>
+        [Description("占用状态")]
         public int state { get; set; }
         /// <summary>
         /// 变更人
         /// </summary>
         [StringLength(80)]
+        [Description("变更人")]
         public string? cby { get; set; }
         /// <summary>
         /// 变更原因
         /// </summary>
         [StringLength(1000)]
+        [Description("变更原因")]
         public string? creason { get; set; }
         /// <summary>
         /// 变更时间
         /// </summary>
+        [Description("变更时间")]
         public DateTime? ctime { get; set; }
 
     }

+ 37 - 0
MicroServices/Business/Bussiness.Model/MES/PO/pr_main.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.MES.PO
@@ -13,168 +14,204 @@ namespace Bussiness.Model.MES.PO
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long pr_id { get; set; }
         /// <summary>
         /// pr单号
         /// </summary>
         [StringLength(80)]
+        [Description("pr单号")]
         public string? pr_billno { get; set; }
         /// <summary>
         /// 关联工单号
         /// </summary>
         [StringLength(80)]
+        [Description("关联工单号")]
         public string? pr_mono { get; set; }
         /// <summary>
         /// 工单行号
         /// </summary>
+        [Description("工单行号")]
         public int entity_id { get; set; }
         /// <summary>
         /// 供应商id
         /// </summary>
         [Required]
+        [Description("供应商id")]
         public long pr_purchaseid { get; set; }
         /// <summary>
         /// 供应商编码
         /// </summary>
         [StringLength(80)]
+        [Description("供应商编码")]
         public string? pr_purchasenumber { get; set; }
         /// <summary>
         /// 供应商名称
         /// </summary>
         [StringLength(80)]
+        [Description("供应商名称")]
         public string? pr_purchasename { get; set; }
         /// <summary>
         /// 采购员
         /// </summary>
         [StringLength(80)]
+        [Description("采购员")]
         public string? pr_purchaser { get; set; }
         /// <summary>
         /// 采购员工号(采购信息表)
         /// </summary>
         [StringLength(80)]
+        [Description("采购员工号")]
         public string? pr_purchaser_num { get; set; }
         /// <summary>
         /// 需求数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("需求数量")]
         public decimal? pr_rqty { get; set; }
         /// <summary>
         /// 申请数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("申请数量")]
         public decimal? pr_aqty { get; set; }
         /// <summary>
         /// 建议数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("建议数量")]
         public decimal? pr_sqty { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
         [Required]
+        [Description("物料id")]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
+        [Description("物料名称")]
         public string? icitem_name { get; set; }
         /// <summary>
         /// 单据类型
         /// </summary>
+        [Description("单据类型")]
         public int pr_order_type { get; set; }
         /// <summary>
         /// 系统建议下单日期
         /// </summary>
+        [Description("系统建议下单日期")]
         public DateTime? pr_ssend_date { get; set; }
         /// <summary>
         /// 系统建议到达日期(建议到货日期)
         /// </summary>
+        [Description("系统建议到达日期")]
         public DateTime? pr_sarrive_date { get; set; }
         /// <summary>
         /// 采购员建议到货日期
         /// </summary>
+        [Description("采购员建议到货日期")]
         public DateTime? pr_bsarrive_date { get; set; }
         /// <summary>
         /// 订单到货日期
         /// </summary>
+        [Description("订单到货日期")]
         public DateTime? pr_oarrive_date { get; set; }
         /// <summary>
         /// 计划下单日期
         /// </summary>
+        [Description("计划下单日期")]
         public DateTime? pr_psend_date { get; set; }
         /// <summary>
         /// 计划到达日期
         /// </summary>
+        [Description("计划到达日期")]
         public DateTime? pr_parrive_date { get; set; }
         /// <summary>
         /// 需求到货日期
         /// </summary>
+        [Description("需求到货日期")]
         public DateTime? pr_rarrive_date { get; set; }
         /// <summary>
         /// 再计划到货日期
         /// </summary>
+        [Description("再计划到货日期")]
         public DateTime? pr_rparrive_date { get; set; }
         /// <summary>
         /// 采购确认到货日期
         /// </summary>
+        [Description("采购确认到货日期")]
         public DateTime? pr_pur_affirm_date { get; set; }
         /// <summary>
         /// 系统价格(含税)
         /// </summary>
         [Precision(20, 8)]
+        [Description("系统价格(含税)")]
         public decimal? pr_sysprice { get; set; }
         /// <summary>
         /// 订单价格(含税)
         /// </summary>
         [Precision(20, 8)]
+        [Description("订单价格(含税)")]
         public decimal? pr_orderprice { get; set; }
         /// <summary>
         /// 采购净价(不含税)
         /// </summary>
         [Precision(20, 8)]
+        [Description("采购净价(不含税)")]
         public decimal? pr_price { get; set; }
         /// <summary>
         /// 税率
         /// </summary>
         [Precision(20, 8)]
+        [Description("税率")]
         public decimal? pr_rate { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
         [StringLength(20)]
+        [Description("单位")]
         public string? pr_unit { get; set; }
         /// <summary>
         /// 状态
         /// </summary>
+        [Description("状态")]
         public int state { get; set; }
         /// <summary>
         /// 已申请数量
         /// </summary>
         [Precision(20, 8)]
+        [Description("已申请数量")]
         public decimal? old_apply_aqty { get; set; }
         /// <summary>
         /// 申请类型
         /// </summary>
+        [Description("申请类型")]
         public int pr_type { get; set; }
         /// <summary>
         /// 币种
         /// </summary>
         [Required]
+        [Description("币种")]
         public long currencytype { get; set; }
         /// <summary>
         /// 安全库存触发采购比例
         /// </summary>
         [Precision(20, 8)]
+        [Description("安全库存触发采购比例")]
         public decimal? secInv_ratio { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
         [StringLength(1000)]
+        [Description("备注")]
         public string? remark { get; set; }
         /// <summary>
         /// 拒绝原因
         /// </summary>
         [StringLength(1000)]
+        [Description("拒绝原因")]
         public string? pr_rreason { get; set; }
 
     }

+ 7 - 0
MicroServices/Business/Bussiness.Model/Tech/mes_process.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using System.Linq;
@@ -17,6 +18,7 @@ namespace Bussiness.Model.Tech
         /// 工序主键
         /// </summary>
         [Key]
+        [Description("工序主键")]
         public long proc_id { get; set; }
 
         /// <summary>
@@ -24,30 +26,35 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [StringLength(100)]
+        [Description("工序名称")]
         public string proc_name { get; set; }
 
         /// <summary>
         /// 是否需要排产:1-是;0-否
         /// </summary>
         [Required]
+        [Description("是否需要排产:1-是;0-否")]
         public int is_schedule { get; set; }
 
         /// <summary>
         /// 简述
         /// </summary>
         [StringLength(500)]
+        [Description("简述")]
         public string? short_desc { get; set; }
 
         /// <summary>
         /// 详细描述
         /// </summary>
         [StringLength(2000)]
+        [Description("详细描述")]
         public string? long_desc { get; set; }
 
         /// <summary>
         /// 组合工序id
         /// </summary>
         [StringLength(2000)]
+        [Description("组合工序id")]
         public string? subids { get; set; }
 
     }

+ 6 - 0
MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_accessory.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -12,18 +13,21 @@ namespace Bussiness.Model.Tech
         /// 治具主键
         /// </summary>
         [Key]
+        [Description("治具主键")]
         public long tech_proc_acc_id { get; set; }
 
         /// <summary>
         /// 工艺工序主键
         /// </summary>
         [Required]
+        [Description("工艺工序主键")]
         public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 工装id
         /// </summary>
         [Required]
+        [Description("工装id")]
         public long equip_id { get; set; }
 
         /// <summary>
@@ -31,12 +35,14 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [StringLength(100)]
+        [Description("工装编号")]
         public string equip_no { get; set; }
 
         /// <summary>
         /// 数量
         /// </summary>
         [Required]
+        [Description("数量")]
         public int qty { get; set; }
     }
 }

+ 5 - 0
MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_document.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -12,24 +13,28 @@ namespace Bussiness.Model.Tech
         /// 工序作业指导书主键
         /// </summary>
         [Key]
+        [Description("工序作业指导书主键")]
         public long tech_proc_doc_id { get; set; }
 
         /// <summary>
         /// 工艺工序主键
         /// </summary>
         [Required]
+        [Description("工艺工序主键")]
         public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 作业指导书主键
         /// </summary>
         [Required]
+        [Description("作业指导书主键")]
         public long upload_id { get; set; }
 
         /// <summary>
         /// 作业指导书名称
         /// </summary>
         [StringLength(100)]
+        [Description("作业指导书名称")]
         public string? name { get; set; }
     }
 }

+ 5 - 0
MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -12,23 +13,27 @@ namespace Bussiness.Model.Tech
         /// 工位表主键
         /// </summary>
         [Key]
+        [Description("工位表主键")]
         public long tech_proc_workshop_id { get; set; }
 
         /// <summary>
         /// 工艺工序id
         /// </summary>
         [Required]
+        [Description("工艺工序id")]
         public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 工位id
         /// </summary>
         [Required]
+        [Description("工位id")]
         public long workshop_id { get; set; }
 
         /// <summary>
         /// 序列号
         /// </summary>
+        [Description("序列号")]
         public int? serialno { get; set; }
     }
 }

+ 6 - 0
MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop_equipment.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -12,29 +13,34 @@ namespace Bussiness.Model.Tech
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long tech_proc_workshop_equip_id { get; set; }
 
         /// <summary>
         /// 设备id
         /// </summary>
         [Required]
+        [Description("设备id")]
         public long equip_id { get; set; }
 
         /// <summary>
         /// 设备名称
         /// </summary>
         [StringLength(100)]
+        [Description("设备名称")]
         public string? equip_name { get; set; }
 
         /// <summary>
         /// 工艺工位id
         /// </summary>
         [Required]
+        [Description("工艺工位id")]
         public long tech_proc_workshop_id { get; set; }
 
         /// <summary>
         /// 工作日历id
         /// </summary>
+        [Description("工作日历id")]
         public long? work_calendar_id { get; set; }
     }
 }

+ 5 - 0
MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop_icitem.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -12,24 +13,28 @@ namespace Bussiness.Model.Tech
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long tech_proc_workshop_icitem_id { get; set; }
 
         /// <summary>
         /// 工序工位id
         /// </summary>
         [Required]
+        [Description("工序工位id")]
         public long tech_proc_workshop_id { get; set; }
 
         /// <summary>
         /// 物料id
         /// </summary>
         [Required]
+        [Description("物料id")]
         public long icitem_id { get; set; }
 
         /// <summary>
         /// 数量
         /// </summary>
         [Required]
+        [Description("数量")]
         public int qty { get; set; }
     }
 }

+ 5 - 0
MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop_staff.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -12,24 +13,28 @@ namespace Bussiness.Model.Tech
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long tech_proc_workshop_equip_id { get; set; }
 
         /// <summary>
         /// 工艺工位id
         /// </summary>
         [Required]
+        [Description("工艺工位id")]
         public long tech_proc_workshop_id { get; set; }
 
         /// <summary>
         /// 员工id
         /// </summary>
         [Required]
+        [Description("员工id")]
         public long staff_id { get; set; }
 
         /// <summary>
         /// 员工姓名
         /// </summary>
         [StringLength(100)]
+        [Description("员工姓名")]
         public string? staff_name { get; set; }
     }
 }

+ 15 - 0
MicroServices/Business/Bussiness.Model/Tech/mes_tech_process.cs

@@ -1,5 +1,6 @@
 using Business.Model;
 using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -13,79 +14,93 @@ namespace Bussiness.Model.Tech
         /// 工艺工序主键
         /// </summary>
         [Key]
+        [Description("工艺工序主键")]
         public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 工艺主键
         /// </summary>
         [Required]
+        [Description("工艺主键")]
         public long tech_id { get; set; }
 
         /// <summary>
         /// 工序主键
         /// </summary>
         [Required]
+        [Description("工序主键")]
         public long proc_id { get; set; }
 
         /// <summary>
         /// 组合层级
         /// </summary>
         [Required]
+        [Description("组合层级")]
         public int level { get; set; }
 
         /// <summary>
         /// 前置准备时间
         /// </summary>
         [Precision(20,8)]
+        [Description("前置准备时间")]
         public decimal? readytime { get; set; }
 
         /// <summary>
         /// 效率计算类型 1-节拍时间;2-UPH
         /// </summary>
         [Required]
+        [Description("效率计算类型 1-节拍时间;2-UPH")]
         public int type { get; set; }
 
         /// <summary>
         /// UPH
         /// </summary>
         [Precision(20, 8)]
+        [Description("UPH")]
         public decimal? uph { get; set; }
 
         /// <summary>
         /// 节拍时间
         /// </summary>
         [Precision(20, 8)]
+        [Description("节拍时间")]
         public decimal? ct { get; set; }
 
         /// <summary>
         /// 效率系数
         /// </summary>
         [Precision(10, 4)]
+        [Description("效率系数")]
         public decimal? effect_ratio { get; set; }
 
         /// <summary>
         /// 是否需要跟踪工序
         /// </summary>
+        [Description("是否需要跟踪工序")]
         public int? mototrack { get; set; }
 
         /// <summary>
         /// 下一工序id
         /// </summary>
+        [Description("下一工序id")]
         public long? nextprocid { get; set; }
 
         /// <summary>
         /// 父级工序id
         /// </summary>
+        [Description("父级工序id")]
         public long? parentprocid { get; set; }
 
         /// <summary>
         /// 是否需要质检
         /// </summary>
+        [Description("是否需要质检")]
         public int? needqc { get; set; }
 
         /// <summary>
         /// 最大并行工位数
         /// </summary>
+        [Description("最大并行工位数")]
         public int? maxworkshop { get; set; }
     }
 }

+ 7 - 0
MicroServices/Business/Bussiness.Model/Tech/mes_technique.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -12,6 +13,7 @@ namespace Bussiness.Model.Tech
         /// 工艺路径主键
         /// </summary>
         [Key]
+        [Description("工艺路径主键")]
         public long tech_id { get; set; }
 
         /// <summary>
@@ -19,30 +21,35 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [StringLength(100)]
+        [Description("工艺路径名称")]
         public string tech_name { get; set; }
 
         /// <summary>
         /// 效率计算层级
         /// </summary>
         [Required]
+        [Description("效率计算层级")]
         public int level { get; set; }
 
         /// <summary>
         /// 产品
         /// </summary>
         [StringLength(100)]
+        [Description("产品")]
         public string? bom { get; set; }
 
         /// <summary>
         /// 产品版本
         /// </summary>
         [StringLength(100)]
+        [Description("产品版本")]
         public string? bomver { get; set; }
 
         /// <summary>
         /// 描述
         /// </summary>
         [StringLength(100)]
+        [Description("描述")]
         public string? desc { get; set; }
     }
 }

+ 9 - 0
MicroServices/Business/Bussiness.Model/Tech/mes_workshop.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -12,47 +13,55 @@ namespace Bussiness.Model.Tech
         /// 工位表主键
         /// </summary>
         [Key]
+        [Description("工位表主键")]
         public long workshop_id { get; set; }
 
         /// <summary>
         /// 工位名称
         /// </summary>
         [StringLength(100)]
+        [Description("工位名称")]
         public string? name { get; set; }
 
         /// <summary>
         /// 组合工位ids
         /// </summary>
         [StringLength(2000)]
+        [Description("组合工位ids")]
         public string? subids { get; set; }
 
         /// <summary>
         /// 坐标
         /// </summary>
         [StringLength(100)]
+        [Description("坐标")]
         public string? geoinfo { get; set; }
 
         /// <summary>
         /// 楼栋
         /// </summary>
         [StringLength(100)]
+        [Description("楼栋")]
         public string? building { get; set; }
 
         /// <summary>
         /// 楼层
         /// </summary>
         [StringLength(100)]
+        [Description("楼层")]
         public string? floor { get; set; }
 
         /// <summary>
         /// 区域
         /// </summary>
         [StringLength(100)]
+        [Description("区域")]
         public string? zone { get; set; }
 
         /// <summary>
         /// 工作日历id
         /// </summary>
+        [Description("工作日历id")]
         public long? work_calendar_id { get; set; }
     }
 }

+ 6 - 0
MicroServices/Business/Bussiness.Model/Tech/mes_workshop_shelf.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -12,29 +13,34 @@ namespace Bussiness.Model.Tech
         /// 主键
         /// </summary>
         [Key]
+        [Description("主键")]
         public long workshop_shelf_id { get; set; }
 
         /// <summary>
         /// 工位id
         /// </summary>
         [Required]
+        [Description("工位id")]
         public long workshop_id { get; set; }
 
         /// <summary>
         /// 线边仓序列号
         /// </summary>
+        [Description("线边仓序列号")]
         public int? serialno { get; set; }
 
         /// <summary>
         /// 仓库编号
         /// </summary>
         [StringLength(100)]
+        [Description("仓库编号")]
         public string? sheifno { get; set; }
 
         /// <summary>
         /// 坐标
         /// </summary>
         [StringLength(100)]
+        [Description("坐标")]
         public string? geoinfo { get; set; }
     }
 }

+ 17 - 0
MicroServices/Business/Bussiness.Model/Tech/work_calendar.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -12,83 +13,99 @@ namespace Bussiness.Model.Tech
         /// 工作日历主键
         /// </summary>
         [Key]
+        [Description("工作日历主键")]
         public long work_calendar_id { get; set; }
 
         /// <summary>
         /// 工作日历编码
         /// </summary>
         [StringLength(100)]
+        [Description("工作日历编码")]
         public string? work_calendar_no { get; set; }
 
         /// <summary>
         /// 工作日历名称
         /// </summary>
         [StringLength(100)]
+        [Description("工作日历名称")]
         public string? work_calendar_name { get; set; }
 
         /// <summary>
         /// 班制id
         /// </summary>
+        [Description("班制id")]
         public long? shift_id { get; set; }
 
         /// <summary>
         /// 开始时间
         /// </summary>
+        [Description("开始时间")]
         public DateTime? start_time { get; set; }
 
         /// <summary>
         /// 结束时间
         /// </summary>
+        [Description("结束时间")]
         public DateTime? end_time { get; set; }
 
         /// <summary>
         /// 标准周期
         /// </summary>
+        [Description("标准周期")]
         public int? standard_period { get; set; }
 
         /// <summary>
         /// 工作周期
         /// </summary>
+        [Description("工作周期")]
         public int? work_period { get; set; }
 
         /// <summary>
         /// 休息周期
         /// </summary>
+        [Description("休息周期")]
         public int? rest_period { get; set; }
 
         /// <summary>
         /// 周1
         /// </summary>
+        [Description("周1")]
         public int? calendar1 { get; set; }
 
         /// <summary>
         /// 周2
         /// </summary>
+        [Description("周2")]
         public int? calendar2 { get; set; }
 
         /// <summary>
         /// 周3
         /// </summary>
+        [Description("周3")]
         public int? calendar3 { get; set; }
 
         /// <summary>
         /// 周4
         /// </summary>
+        [Description("周4")]
         public int? calendar4 { get; set; }
 
         /// <summary>
         /// 周5
         /// </summary>
+        [Description("周5")]
         public int? calendar5 { get; set; }
 
         /// <summary>
         /// 周6
         /// </summary>
+        [Description("周6")]
         public int? calendar6 { get; set; }
 
         /// <summary>
         /// 周7
         /// </summary>
+        [Description("周7")]
         public int? calendar7 { get; set; }
 
 

+ 7 - 0
MicroServices/Business/Bussiness.Model/Tech/work_calendar_list.cs

@@ -1,4 +1,5 @@
 using Business.Model;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bussiness.Model.Tech
@@ -12,32 +13,38 @@ namespace Bussiness.Model.Tech
         /// 工作日历明细主键
         /// </summary>
         [Key]
+        [Description("工作日历明细主键")]
         public long work_cal_list_id { get; set; }
 
         /// <summary>
         /// 工作日历id
         /// </summary>
         [Required]
+        [Description("工作日历id")]
         public long work_calendar_id { get; set; }
 
         /// <summary>
         /// 日期
         /// </summary>
+        [Description("日期")]
         public DateTime? work_cal_list_date { get; set; }
 
         /// <summary>
         /// 类型:1-工作日;0-休息日
         /// </summary>
+        [Description("类型:1-工作日;0-休息日")]
         public int? work_cal_list_type { get; set; }
 
         /// <summary>
         /// 工作时长(分钟)
         /// </summary>
+        [Description("工作时长(分钟)")]
         public int? work_cal_list_times { get; set; }
 
         /// <summary>
         /// 班次数
         /// </summary>
+        [Description("班次数")]
         public int? work_cal_list_num { get; set; }
     }
 }