Browse Source

增加Description属性。

zhengly 3 years ago
parent
commit
803ebf9d22
20 changed files with 680 additions and 169 deletions
  1. 0 1
      MicroServices/Business/Business.Host/EntityFrameworkCore/BusinessMigrationDbContext.cs
  2. 15 0
      MicroServices/Business/Bussiness.Model/Production/mes_moentry.cs
  3. 36 5
      MicroServices/Business/Bussiness.Model/Production/mes_mooccupy.cs
  4. 107 29
      MicroServices/Business/Bussiness.Model/Production/mes_morder.cs
  5. 41 3
      MicroServices/Business/Bussiness.Model/Production/mes_morder_loss_time.cs
  6. 100 36
      MicroServices/Business/Bussiness.Model/Production/mes_oorder.cs
  7. 18 4
      MicroServices/Business/Bussiness.Model/Production/mes_schedule_occupy.cs
  8. 47 15
      MicroServices/Business/Bussiness.Model/Production/mes_stockoccupy.cs
  9. 24 11
      MicroServices/Business/Bussiness.Model/ProductionProcess/mes_loss_time_record.cs
  10. 19 5
      MicroServices/Business/Bussiness.Model/ProductionProcess/mes_meaction.cs
  11. 21 4
      MicroServices/Business/Bussiness.Model/ProductionProcess/mes_mebycard.cs
  12. 11 0
      MicroServices/Business/Bussiness.Model/ProductionProcess/mes_merecheck.cs
  13. 16 0
      MicroServices/Business/Bussiness.Model/ProductionProcess/mes_mereport.cs
  14. 42 7
      MicroServices/Business/Bussiness.Model/ProductionProcess/mes_prd_sendmat.cs
  15. 70 22
      MicroServices/Business/Bussiness.Model/ProductionProcess/mes_prd_sendmat_list.cs
  16. 20 5
      MicroServices/Business/Bussiness.Model/ProductionProcess/mes_prdlog.cs
  17. 14 5
      MicroServices/Business/Bussiness.Model/ProductionProcess/mes_product_work_time.cs
  18. 22 5
      MicroServices/Business/Bussiness.Model/ProductionProcess/mes_stock_enter.cs
  19. 36 8
      MicroServices/Business/Bussiness.Model/ProductionProcess/mes_stock_out.cs
  20. 21 4
      MicroServices/Business/Bussiness.Model/ProductionProcess/mes_swipe_card.cs

+ 0 - 1
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;

+ 15 - 0
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; }
 
     }

+ 36 - 5
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; }
 
     }
 }

+ 107 - 29
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; }
     }
 }

+ 41 - 3
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; }
         
     }
 }

+ 100 - 36
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; }
 
     }
 }

+ 18 - 4
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; }
     }
 }

+ 47 - 15
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; } 
     }
 }

+ 24 - 11
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; }
     }
 }

+ 19 - 5
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; }
     }
 }

+ 21 - 4
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; }
     }
 }

+ 11 - 0
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; }
     }
 }

+ 16 - 0
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; }
 
     }

+ 42 - 7
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; }
     }
 }

+ 70 - 22
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; }
     }
 }

+ 20 - 5
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; }
      
     }
 }

+ 14 - 5
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; }
     }
 }

+ 22 - 5
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; }
     }
 }

+ 36 - 8
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; }
     }
 }

+ 21 - 4
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; }
     }