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

MicroServices/Business/Bussiness.Model/MES/IC/ic_bom.cs

@@ -46,7 +46,8 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 工艺主键
         /// </summary>
-        public long? tech_id { get; set; }
+        [Required]
+        public long tech_id { get; set; }
         /// <summary>
         /// 工艺名称
         /// </summary>

MicroServices/Business/Bussiness.Model/MES/IC/ic_bom_child.cs

@@ -17,35 +17,38 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// bom主键
         /// </summary>
+        [Required]
         public long bom_id { get; set; }
         /// <summary>
         /// bom单编号
         /// </summary>
         [StringLength(20)]
-        public string bom_number { get; set; }
+        public string? bom_number { get; set; }
         /// <summary>
         /// 父级id
         /// </summary>
+        [Required]
         public long parent_child_id { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
+        [Required]
         public long icitem_id { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
         [StringLength(20)]
-        public string unit { get; set; }
+        public string? unit { get; set; }
         /// <summary>
         /// 用量
         /// </summary>
         [Precision(20, 8)]
-        public decimal qty { get; set; }
+        public decimal? qty { get; set; }
         /// <summary>
         /// 损耗率
         /// </summary>
         [Precision(20, 8)]
-        public decimal scrap { get; set; }
+        public decimal? scrap { get; set; }
         /// <summary>
         /// 是否倒冲
         /// </summary>
@@ -62,7 +65,7 @@ namespace Bussiness.Model.MES.IC
         /// 群组代码
         /// </summary>
         [StringLength(20)]
-        public string group_code { get; set; }
+        public string? group_code { get; set; }
         /// <summary>
         /// 是否群组替代
         /// </summary>
@@ -71,12 +74,12 @@ namespace Bussiness.Model.MES.IC
         /// 组合模式
         /// </summary>
         [StringLength(2000)]
-        public string icitem_ids { get; set; }
+        public string? icitem_ids { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
         [StringLength(1000)]
-        public string note { get; set; }
+        public string? note { get; set; }
         /// <summary>
         /// 顺序号
         /// </summary>

MicroServices/Business/Bussiness.Model/MES/IC/ic_factory_details.cs

@@ -17,30 +17,32 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 物料id
         /// </summary>
+        [Required]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
-        public string icitem_name { get; set; }
+        public string? icitem_name { get; set; }
         /// <summary>
         /// 工厂编码
         /// </summary>
         [StringLength(80)]
-        public string factory_fode { get; set; }
+        public string? factory_fode { get; set; }
         /// <summary>
         /// 特殊备注
         /// </summary>
         [StringLength(1000)]
-        public string note { get; set; }
+        public string? note { get; set; }
         /// <summary>
         /// 产品线
         /// </summary>
         [StringLength(80)]
-        public string product_line { get; set; }
+        public string? product_line { get; set; }
         /// <summary>
         /// 领料类型
         /// </summary>
+        [Required]
         public long pick_type { get; set; }
         /// <summary>
         /// 是否采用业务批次管理
@@ -54,12 +56,12 @@ namespace Bussiness.Model.MES.IC
         /// 盘点周期单位
         /// </summary>
         [StringLength(80)]
-        public string check_cycunit { get; set; }
+        public string? check_cycunit { get; set; }
         /// <summary>
         /// 盘点周期
         /// </summary>
         [Precision(20, 8)]
-        public decimal check_cycle { get; set; }
+        public decimal? check_cycle { get; set; }
         /// <summary>
         /// 每周_月第天
         /// </summary>
@@ -71,95 +73,103 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 默认待检仓库
         /// </summary>
+        [Required]
         public long default_chkloc { get; set; }
         /// <summary>
         /// 默认待检仓位
         /// </summary>
+        [Required]
         public long default_chksp { get; set; }
         /// <summary>
         /// 默认仓库
         /// </summary>
+        [Required]
         public long default_loc { get; set; }
         /// <summary>
         /// 默认仓位
         /// </summary>
+        [Required]
         public long default_sp { get; set; }
         /// <summary>
         /// 货架信息
         /// </summary>
         [StringLength(80)]
-        public string item_shelve { get; set; }
+        public string? item_shelve { get; set; }
         /// <summary>
         /// 默认仓管员
         /// </summary>
         [StringLength(80)]
-        public string default_manager { get; set; }
+        public string? default_manager { get; set; }
         /// <summary>
         /// 最低存量
         /// </summary>
         [Precision(20, 8)]
-        public decimal low_limit { get; set; }
+        public decimal? low_limit { get; set; }
         /// <summary>
         /// 最高存量
         /// </summary>
         [Precision(20, 8)]
-        public decimal high_limit { get; set; }
+        public decimal? high_limit { get; set; }
         /// <summary>
         /// 最大订货量
         /// </summary>
         [Precision(20, 8)]
-        public decimal qty_max { get; set; }
+        public decimal? qty_max { get; set; }
         /// <summary>
         /// 日消耗量
         /// </summary>
         [Precision(20, 8)]
-        public decimal daily_consume { get; set; }
+        public decimal? daily_consume { get; set; }
         /// <summary>
         /// 材料成本差异科目代码
         /// </summary>
+        [Required]
         public long mcv_acct { get; set; }
         /// <summary>
         /// 加工费差异科目代码
         /// </summary>
+        [Required]
         public long pcv_acct { get; set; }
         /// <summary>
         /// 废品损失科目代码
         /// </summary>
+        [Required]
         public long sl_acct { get; set; }
         /// <summary>
         /// 标准成本调整差异科目代码
         /// </summary>
+        [Required]
         public long cav_acct { get; set; }
         /// <summary>
         /// 库存备注
         /// </summary>
         [StringLength(1000)]
-        public string warehouse_note { get; set; }
+        public string? warehouse_note { get; set; }
         /// <summary>
         /// 工单发料时间/天
         /// </summary>
         [Precision(20, 8)]
-        public decimal ordissu_days { get; set; }
+        public decimal? ordissu_days { get; set; }
         /// <summary>
         /// 原材料收货处理时间/天
         /// </summary>
         [Precision(20, 8)]
-        public decimal raw_matreceiv_days { get; set; }
+        public decimal? raw_matreceiv_days { get; set; }
         /// <summary>
         /// 成品入库时间/天
         /// </summary>
         [Precision(20, 8)]
-        public decimal prdenter_days { get; set; }
+        public decimal? prdenter_days { get; set; }
         /// <summary>
         /// 原材料入库时间/天
         /// </summary>
         [Precision(20, 8)]
-        public decimal mat_enter_days { get; set; }
+        public decimal? mat_enter_days { get; set; }
         /// <summary>
         /// 成品发货时间/天
         /// </summary>
         [Precision(20, 8)]
-        public decimal prd_out_days { get; set; }
+        public decimal? prd_out_days { get; set; }
 
     }
 }

MicroServices/Business/Bussiness.Model/MES/IC/ic_item.cs

@@ -18,75 +18,77 @@ namespace Bussiness.Model.MES.IC
         /// 物料编码
         /// </summary>
         [StringLength(80)]
-        public string number { get; set; }
+        public string? number { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
-        public string name { get; set; }
+        public string? name { get; set; }
         /// <summary>
         /// 规格型号
         /// </summary>
         [StringLength(200)]
-        public string model { get; set; }
+        public string? model { get; set; }
         /// <summary>
         /// 全名
         /// </summary>
         [StringLength(255)]
-        public string full_name { get; set; }
+        public string? full_name { get; set; }
         /// <summary>
         /// fms旧料号
         /// </summary>
         [StringLength(80)]
-        public string fms_number { get; set; }
+        public string? fms_number { get; set; }
         /// <summary>
         /// erp旧料号
         /// </summary>
         [StringLength(80)]
-        public string erp_oldnumber { get; set; }
+        public string? erp_oldnumber { get; set; }
         /// <summary>
         /// 图号
         /// </summary>
         [StringLength(80)]
-        public string chart_number { get; set; }
+        public string? chart_number { get; set; }
         /// <summary>
         /// 版本号
         /// </summary>
         [StringLength(80)]
-        public string fversion { get; set; }
+        public string? fversion { get; set; }
         /// <summary>
         /// 盒贴规格
         /// </summary>
         [StringLength(200)]
-        public string box_model { get; set; }
+        public string? box_model { get; set; }
         /// <summary>
         /// 物料属性
         /// </summary>
         [StringLength(80)]
-        public string erp_cls { get; set; }
+        public string? erp_cls { get; set; }
         /// <summary>
         /// 物料等级
         /// </summary>
+        [Required]
         public long item_level { get; set; }
         /// <summary>
         /// 环保等级
         /// </summary>
+        [Required]
         public long hb_level { get; set; }
         /// <summary>
         /// 单位标准工时_小时
         /// </summary>
         [Precision(20, 8)]
-        public decimal standard_manhour { get; set; }
+        public decimal? standard_manhour { get; set; }
         /// <summary>
         /// 单位材料定额_元
         /// </summary>
         [Precision(20, 8)]
-        public decimal unititem_amount { get; set; }
+        public decimal? unititem_amount { get; set; }
         /// <summary>
         /// 来源
         /// </summary>
         [StringLength(200)]
-        public string source { get; set; }
+        public string? source { get; set; }
         /// <summary>
         /// 是否为设备
         /// </summary>
@@ -95,12 +97,12 @@ namespace Bussiness.Model.MES.IC
         /// 单位包装数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal unit_qty { get; set; }
+        public decimal? unit_qty { get; set; }
         /// <summary>
         /// 严格进行二维码数量校验
         /// </summary>
         [StringLength(80)]
-        public string check_bybarcode { get; set; }
+        public string? check_bybarcode { get; set; }
         /// <summary>
         /// 是否关键件
         /// </summary>
@@ -109,45 +111,46 @@ namespace Bussiness.Model.MES.IC
         /// 毛重
         /// </summary>
         [Precision(20, 8)]
-        public decimal gross_weight { get; set; }
+        public decimal? gross_weight { get; set; }
         /// <summary>
         /// 净重
         /// </summary>
         [Precision(20, 8)]
-        public decimal net_weight { get; set; }
+        public decimal? net_weight { get; set; }
         /// <summary>
         /// 重量单位
         /// </summary>
         [StringLength(80)]
-        public string maund { get; set; }
+        public string? maund { get; set; }
         /// <summary>
         /// 长度
         /// </summary>
         [Precision(20, 8)]
-        public decimal length { get; set; }
+        public decimal? length { get; set; }
         /// <summary>
         /// 长度单位
         /// </summary>
         [StringLength(80)]
-        public string cubic_measure { get; set; }
+        public string? cubic_measure { get; set; }
         /// <summary>
         /// 宽度
         /// </summary>
         [Precision(20, 8)]
-        public decimal width { get; set; }
+        public decimal? width { get; set; }
         /// <summary>
         /// 高度
         /// </summary>
         [Precision(20, 8)]
-        public decimal height { get; set; }
+        public decimal? height { get; set; }
         /// <summary>
         /// 体积
         /// </summary>
         [Precision(20, 8)]
-        public decimal size { get; set; }
+        public decimal? size { get; set; }
         /// <summary>
         /// 物料类别
         /// </summary>
+        [Required]
         public long matatt { get; set; }
         /// <summary>
         /// 允许采购
@@ -177,14 +180,16 @@ namespace Bussiness.Model.MES.IC
         /// 图片
         /// </summary>
         [StringLength(80)]
-        public string photo { get; set; }
+        public string? photo { get; set; }
         /// <summary>
         /// 领料类型
         /// </summary>
+        [Required]
         public long picktype { get; set; }
         /// <summary>
         /// 出库类型
         /// </summary>
+        [Required]
         public long output_type_id { get; set; }
         /// <summary>
         /// 启用预警

MicroServices/Business/Bussiness.Model/MES/IC/ic_item_ie.cs

@@ -21,6 +21,7 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 物料id
         /// </summary>
+        [Required]
         public long icitem_id { get; set; }
         /// <summary>
         /// 是否倒冲
@@ -30,17 +31,17 @@ namespace Bussiness.Model.MES.IC
         /// 生产负责人
         /// </summary>
         [StringLength(80)]
-        public string product_principal { get; set; }
+        public string? product_principal { get; set; }
         /// <summary>
         /// 倒冲仓库
         /// </summary>
         [StringLength(80)]
-        public string back_flush_stock { get; set; }
+        public string? back_flush_stock { get; set; }
         /// <summary>
         /// 倒冲仓位
         /// </summary>
         [StringLength(80)]
-        public string back_flush_sp { get; set; }
+        public string? back_flush_sp { get; set; }
         /// <summary>
         /// 投料自动取整
         /// </summary>
@@ -49,6 +50,6 @@ namespace Bussiness.Model.MES.IC
         /// ie备注
         /// </summary>
         [StringLength(1000)]
-        public string ir_note { get; set; }
+        public string? ir_note { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/MES/IC/ic_item_inventory.cs

@@ -17,45 +17,48 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 物料库存主键
         /// </summary>
+        [Required]
         public long icitem_stock_id { get; set; }
         /// <summary>
         /// 仓库id
         /// </summary>
+        [Required]
         public long stock_id { get; set; }
         /// <summary>
         /// 仓库名称
         /// </summary>
         [StringLength(80)]
-        public string stock_name { get; set; }
+        public string? stock_name { get; set; }
         /// <summary>
         /// 库位id
         /// </summary>
+        [Required]
         public long stock_place_id { get; set; }
         /// <summary>
         /// 库位编码
         /// </summary>
         [StringLength(80)]
-        public string stock_place_code { get; set; }
+        public string? stock_place_code { get; set; }
         /// <summary>
         /// 批次号
         /// </summary>
         [StringLength(80)]
-        public string batch_no { get; set; }
+        public string? batch_no { get; set; }
         /// <summary>
         /// 数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal qty { get; set; }
+        public decimal? qty { get; set; }
         /// <summary>
         /// 金额
         /// </summary>
         [Precision(20, 8)]
-        public decimal bal { get; set; }
+        public decimal? bal { get; set; }
         /// <summary>
         /// 保质期时长
         /// </summary>
         [Precision(20, 8)]
-        public decimal kf_period { get; set; }
+        public decimal? kf_period { get; set; }
         /// <summary>
         /// 保质期时间
         /// </summary>
@@ -64,17 +67,17 @@ namespace Bussiness.Model.MES.IC
         /// 锁定库存
         /// </summary>
         [Precision(20, 8)]
-        public decimal qty_lock { get; set; }
+        public decimal? qty_lock { get; set; }
         /// <summary>
         /// 安全库存
         /// </summary>
         [Precision(20, 8)]
-        public decimal sec_qty { get; set; }
+        public decimal? sec_qty { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
         [StringLength(80)]
-        public string unit { get; set; }
+        public string? unit { get; set; }
         /// <summary>
         /// 日期
         /// </summary>

MicroServices/Business/Bussiness.Model/MES/IC/ic_item_pur.cs

@@ -17,58 +17,62 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 物料id
         /// </summary>
+        [Required]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
-        public string icitem_name { get; set; }
+        public string? icitem_name { get; set; }
         /// <summary>
         /// 采购计划id
         /// </summary>
+        [Required]
         public long ic_plan_id { get; set; }
         /// <summary>
         /// 供应商id
         /// </summary>
+        [Required]
         public long supplier_id { get; set; }
         /// <summary>
         /// 供应商编码
         /// </summary>
         [StringLength(80)]
-        public long supplier_number { get; set; }
+        public string? supplier_number { get; set; }
         /// <summary>
         /// 供应商名称
         /// </summary>
         [StringLength(80)]
-        public string supplier_name { get; set; }
+        public string? supplier_name { get; set; }
         /// <summary>
         /// 采购组
         /// </summary>
         [StringLength(80)]
-        public string purchgroup { get; set; }
+        public string? purchgroup { get; set; }
         /// <summary>
         /// 采购员
         /// </summary>
         [StringLength(80)]
-        public string purcher { get; set; }
+        public string? purcher { get; set; }
         /// <summary>
         /// 采购计量单位
         /// </summary>
         [StringLength(80)]
-        public string purchase_unit { get; set; }
+        public string? purchase_unit { get; set; }
         /// <summary>
         /// 采购净价（不含税）
         /// </summary>
         [Precision(20, 8)]
-        public decimal netpurchase_price { get; set; }
+        public decimal? netpurchase_price { get; set; }
         /// <summary>
         /// 税率
         /// </summary>
         [Precision(20, 8)]
-        public decimal taxrate { get; set; }
+        public decimal? taxrate { get; set; }
         /// <summary>
         /// 币种
         /// </summary>
+        [Required]
         public long currency_type { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/MES/IC/ic_item_stock.cs

@@ -17,27 +17,28 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 物料id
         /// </summary>
+        [Required]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
-        public string icitem_name { get; set; }
+        public string? icitem_name { get; set; }
         /// <summary>
         /// 物料库存量
         /// </summary>
         [Precision(20, 8)]
-        public decimal sqty { get; set; }
+        public decimal? sqty { get; set; }
         /// <summary>
         /// 调拨在途数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal quantity_in_transit { get; set; }
+        public decimal? quantity_in_transit { get; set; }
         /// <summary>
         /// 工厂编码
         /// </summary>
         [StringLength(80)]
-        public string factory_fode { get; set; }
+        public string? factory_fode { get; set; }
 
     }
 }

MicroServices/Business/Bussiness.Model/MES/IC/ic_metering_unit.cs

@@ -21,42 +21,43 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 物料id
         /// </summary>
+        [Required]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
-        public string icitem_name { get; set; }
+        public string? icitem_name { get; set; }
         /// <summary>
         /// 计量单位组
         /// </summary>
         [StringLength(80)]
-        public string unit_group { get; set; }
+        public string? unit_group { get; set; }
         /// <summary>
         /// 基本计量单位
         /// </summary>
         [StringLength(80)]
-        public string unit { get; set; }
+        public string? unit { get; set; }
         /// <summary>
         /// 采购计量单位
         /// </summary>
         [StringLength(80)]
-        public string order_unit { get; set; }
+        public string? order_unit { get; set; }
         /// <summary>
         /// 销售计量单位
         /// </summary>
         [StringLength(80)]
-        public string sale_unit { get; set; }
+        public string? sale_unit { get; set; }
         /// <summary>
         /// 生产计量单位
         /// </summary>
         [StringLength(80)]
-        public string product_unit { get; set; }
+        public string? product_unit { get; set; }
         /// <summary>
         /// 库存计量单位
         /// </summary>
         [StringLength(80)]
-        public string store_unit { get; set; }
+        public string? store_unit { get; set; }
         /// <summary>
         /// 数量精度
         /// </summary>

MicroServices/Business/Bussiness.Model/MES/IC/ic_plan.cs

@@ -17,32 +17,33 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 物料id
         /// </summary>
+        [Required]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
-        public string icitem_name { get; set; }
+        public string? icitem_name { get; set; }
         /// <summary>
         /// 计划员
         /// </summary>
         [StringLength(80)]
-        public string planner_name { get; set; }
+        public string? planner_name { get; set; }
         /// <summary>
         /// 计划员_工号
         /// </summary>
         [StringLength(80)]
-        public long planner_num { get; set; }
+        public string? planner_num { get; set; }
         /// <summary>
         /// 工厂编码
         /// </summary>
         [StringLength(80)]
-        public long factory_code { get; set; }
+        public string? factory_code { get; set; }
         /// <summary>
         /// 固定提前期(天)
         /// </summary>
         [Precision(20, 8)]
-        public decimal fix_leadtime { get; set; }
+        public decimal? fix_leadtime { get; set; }
         /// <summary>
         /// 计划策略
         /// </summary>
@@ -55,27 +56,27 @@ namespace Bussiness.Model.MES.IC
         /// 订货间隔期_天
         /// </summary>
         [Precision(20, 8)]
-        public decimal order_inter_val { get; set; }
+        public decimal? order_inter_val { get; set; }
         /// <summary>
         /// 变动提前期
         /// </summary>
         [Precision(20, 8)]
-        public decimal lead_time { get; set; }
+        public decimal? lead_time { get; set; }
         /// <summary>
         /// 变动提前期批量
         /// </summary>
         [Precision(20, 8)]
-        public decimal bat_change_economy { get; set; }
+        public decimal? bat_change_economy { get; set; }
         /// <summary>
         /// 累计提前期
         /// </summary>
         [Precision(20, 8)]
-        public decimal total_tqq { get; set; }
+        public decimal? total_tqq { get; set; }
         /// <summary>
         /// 再订货点
         /// </summary>
         [StringLength(80)]
-        public string order_point { get; set; }
+        public string? order_point { get; set; }
         /// <summary>
         /// 设置为固定再订货点
         /// </summary>
@@ -84,12 +85,12 @@ namespace Bussiness.Model.MES.IC
         /// 安全库存数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal secinv { get; set; }
+        public decimal? secinv { get; set; }
         /// <summary>
         /// 安全库存触发采购比例
         /// </summary>
         [Precision(20, 8)]
-        public decimal secinv_ratio { get; set; }
+        public decimal? secinv_ratio { get; set; }
         /// <summary>
         /// 是否需要进行订补货计划的运算
         /// </summary>
@@ -102,6 +103,6 @@ namespace Bussiness.Model.MES.IC
         /// 计划备注
         /// </summary>
         [StringLength(1000)]
-        public long plannote { get; set; }
+        public string? plannote { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/MES/IC/ic_purchase.cs

@@ -17,63 +17,67 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 物料id
         /// </summary>
+        [Required]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
-        public string icitem_name { get; set; }
+        public string? icitem_name { get; set; }
         /// <summary>
         /// 计划id
         /// </summary>
+        [Required]
         public long ic_plan_id { get; set; }
         /// <summary>
         /// 采购负责人
         /// </summary>
         [StringLength(80)]
-        public string order_rector_name { get; set; }
+        public string? order_rector_name { get; set; }
         /// <summary>
         /// 采购负责人_工号
         /// </summary>
         [StringLength(80)]
-        public string order_rector_num { get; set; }
+        public string? order_rector_num { get; set; }
         /// <summary>
         /// 工厂编码
         /// </summary>
         [StringLength(80)]
-        public string factory_code { get; set; }
+        public string? factory_code { get; set; }
         /// <summary>
         /// 采购部门
         /// </summary>
         [StringLength(80)]
-        public string order_dept { get; set; }
+        public string? order_dept { get; set; }
         /// <summary>
         /// 采购单价
         /// </summary>
         [Precision(20, 8)]
-        public decimal order_price { get; set; }
+        public decimal? order_price { get; set; }
         /// <summary>
         /// 销售单价
         /// </summary>
         [Precision(20, 8)]
-        public decimal sale_price { get; set; }
+        public decimal? sale_price { get; set; }
         /// <summary>
         /// 最小订货量
         /// </summary>
         [Precision(20, 8)]
-        public decimal qty_min { get; set; }
+        public decimal? qty_min { get; set; }
         /// <summary>
         /// 批量增量
         /// </summary>
         [Precision(20, 8)]
-        public decimal batch_append_qty { get; set; }
+        public decimal? batch_append_qty { get; set; }
         /// <summary>
         /// 采购订单差异科目代码
         /// </summary>
+        [Required]
         public long pov_acct { get; set; }
         /// <summary>
         /// 采购发票差异科目代码
         /// </summary>
+        [Required]
         public long piv_acct { get; set; }
 
     }

MicroServices/Business/Bussiness.Model/MES/IC/replace_group.cs

@@ -23,7 +23,7 @@ namespace Bussiness.Model.MES.IC
         /// 群组代码
         /// </summary>
         [StringLength(20)]
-        public string group_code { get; set; }
+        public string? group_code { get; set; }
         /// <summary>
         /// 替代类型
         /// </summary>

MicroServices/Business/Bussiness.Model/MES/IC/replace_group_all.cs

@@ -21,37 +21,38 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 群组主键
         /// </summary>
+        [Required]
         public long group_id { get; set; }
         /// <summary>
         /// 群组代码
         /// </summary>
         [StringLength(20)]
-        public string group_code { get; set; }
+        public string? group_code { get; set; }
         /// <summary>
         /// 替代关系
         /// </summary>
         [StringLength(2000)]
-        public string replace_relation { get; set; }
+        public string? replace_relation { get; set; }
         /// <summary>
         /// 替代名称
         /// </summary>
         [StringLength(50)]
-        public string replace_name { get; set; }
+        public string? replace_name { get; set; }
         /// <summary>
         /// 替代方式
         /// </summary>
         [StringLength(50)]
-        public string replace_way { get; set; }
+        public string? replace_way { get; set; }
         /// <summary>
         /// 产品线
         /// </summary>
         [StringLength(50)]
-        public string product_line { get; set; }
+        public string? product_line { get; set; }
         /// <summary>
         /// 使用机型
         /// </summary>
         [StringLength(5000)]
-        public string use_model { get; set; }
+        public string? use_model { get; set; }
         /// <summary>
         /// 排序
         /// </summary>

MicroServices/Business/Bussiness.Model/MES/IC/replace_group_all_dtl.cs

@@ -21,15 +21,17 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 替代多群组主键
         /// </summary>
+        [Required]
         public long group_allid { get; set; }
         /// <summary>
         /// 群组代码
         /// </summary>
         [StringLength(20)]
-        public string group_code { get; set; }
+        public string? group_code { get; set; }
         /// <summary>
         /// 物料主键
         /// </summary>
+        [Required]
         public long icitem_id { get; set; }
         /// <summary>
         /// 主/替

MicroServices/Business/Bussiness.Model/MES/PO/po_list.cs

@@ -17,12 +17,13 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// po单id
         /// </summary>
+        [Required]
         public long po_id { get; set; }
         /// <summary>
         /// po单号
         /// </summary>
         [StringLength(80)]
-        public string po_billno { get; set; }
+        public string? po_billno { get; set; }
         /// <summary>
         /// 行号
         /// </summary>
@@ -30,77 +31,82 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// pr申请单id
         /// </summary>
+        [Required]
         public long pr_id { get; set; }
         /// <summary>
         /// pr申请单号
         /// </summary>
         [StringLength(80)]
-        public string pr_billno { get; set; }
+        public string? pr_billno { get; set; }
         /// <summary>
         /// 关联工单号
         /// </summary>
         [StringLength(80)]
-        public string po_mono { get; set; }
+        public string? po_mono { get; set; }
         /// <summary>
         /// 供应商id
         /// </summary>
+        [Required]
         public long pr_purchase_id { get; set; }
         /// <summary>
         /// 供应商名称
         /// </summary>
         [StringLength(80)]
-        public string pr_purchase_name { get; set; }
+        public string? pr_purchase_name { get; set; }
         /// <summary>
         /// 收货仓库id
         /// </summary>
+        [Required]
         public long stock_id { get; set; }
         /// <summary>
         /// 收货仓库名称
         /// </summary>
         [StringLength(80)]
-        public string stock_name { get; set; }
+        public string? stock_name { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
+        [Required]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(100)]
-        public string icitem_name { get; set; }
+        public string? icitem_name { get; set; }
         /// <summary>
         /// 订单数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal qty { get; set; }
+        public decimal? qty { get; set; }
         /// <summary>
         /// 净价
         /// </summary>
         [Precision(20, 8)]
-        public decimal netprice { get; set; }
+        public decimal? netprice { get; set; }
         /// <summary>
         /// 税率
         /// </summary>
         [Precision(20, 8)]
-        public decimal rate { get; set; }
+        public decimal? rate { get; set; }
         /// <summary>
         /// 含税单价
         /// </summary>
         [Precision(20, 8)]
-        public decimal price { get; set; }
+        public decimal? price { get; set; }
         /// <summary>
         /// 总价
         /// </summary>
         [Precision(20, 8)]
-        public decimal total_price { get; set; }
+        public decimal? total_price { get; set; }
         /// <summary>
         /// 计划数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal plan_qty { get; set; }
+        public decimal? plan_qty { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
+        [Required]
         public long unit { get; set; }
         /// <summary>
         /// 数据状态标识 0停用 1启用
@@ -122,35 +128,36 @@ namespace Bussiness.Model.MES.PO
         /// 已收货数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal rqty { get; set; }
+        public decimal? rqty { get; set; }
         /// <summary>
         /// 已入库数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal esqty { get; set; }
+        public decimal? esqty { get; set; }
         /// <summary>
         /// 采购到货日期
         /// </summary>
         [Precision(20, 8)]
-        public decimal procurement_rarr_date { get; set; }
+        public decimal? procurement_rarr_date { get; set; }
         /// <summary>
         /// 再计划到货日期
         /// </summary>
         [Precision(20, 8)]
-        public decimal rparrive_date { get; set; }
+        public decimal? rparrive_date { get; set; }
         /// <summary>
         /// 供应商交期
         /// </summary>
         [Precision(20, 8)]
-        public decimal purchase_date { get; set; }
+        public decimal? purchase_date { get; set; }
         /// <summary>
         /// 采购确认到货日期
         /// </summary>
         [Precision(20, 8)]
-        public decimal pur_affirmdate { get; set; }
+        public decimal? pur_affirmdate { get; set; }
         /// <summary>
         /// 币别
         /// </summary>
+        [Required]
         public long currencytype { get; set; }
 
     }

MicroServices/Business/Bussiness.Model/MES/PO/po_main.cs

@@ -25,7 +25,7 @@ namespace Bussiness.Model.MES.PO
         /// 采购员
         /// </summary>
         [StringLength(80)]
-        public long po_purchaser { get; set; }
+        public string po_purchaser { get; set; }
         /// <summary>
         /// 采购员工号
         /// </summary>
@@ -34,6 +34,7 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 供应商id
         /// </summary>
+        [Required]
         public long po_purchase_id { get; set; }
         /// <summary>
         /// 供应商名称
@@ -52,6 +53,7 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 交货方式
         /// </summary>
+        [Required]
         public long po_delivery { get; set; }
         /// <summary>
         /// 税率
@@ -91,6 +93,7 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 币别
         /// </summary>
+        [Required]
         public long currency { get; set; }
         /// <summary>
         /// 金蝶单据类型值（标准采购订单、标准委外订单）

MicroServices/Business/Bussiness.Model/MES/PO/po_occupy.cs

@@ -17,6 +17,7 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 采购订单id
         /// </summary>
+        [Required]
         public long polist_id { get; set; }
         /// <summary>
         /// 采购订单行号
@@ -25,16 +26,18 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 客户订单行id
         /// </summary>
+        [Required]
         public long eid { get; set; }
         /// <summary>
         /// 客户订单id
         /// </summary>
+        [Required]
         public long bill_no { get; set; }
         /// <summary>
         /// 类型
         /// </summary>
         [StringLength(80)]
-        public string type { get; set; }
+        public string? type { get; set; }
         /// <summary>
         /// 行号
         /// </summary>
@@ -43,7 +46,7 @@ namespace Bussiness.Model.MES.PO
         /// 占用量
         /// </summary>
         [Precision(20, 8)]
-        public decimal qty { get; set; }
+        public decimal? qty { get; set; }
         /// <summary>
         /// 开始时间
         /// </summary>
@@ -60,12 +63,12 @@ namespace Bussiness.Model.MES.PO
         /// 变更人
         /// </summary>
         [StringLength(80)]
-        public string cby { get; set; }
+        public string? cby { get; set; }
         /// <summary>
         /// 变更原因
         /// </summary>
         [StringLength(1000)]
-        public string creason { get; set; }
+        public string? creason { get; set; }
         /// <summary>
         /// 变更时间
         /// </summary>

MicroServices/Business/Bussiness.Model/MES/PO/pr_main.cs

@@ -18,12 +18,12 @@ namespace Bussiness.Model.MES.PO
         /// pr单号
         /// </summary>
         [StringLength(80)]
-        public string pr_billno { get; set; }
+        public string? pr_billno { get; set; }
         /// <summary>
         /// 关联工单号
         /// </summary>
         [StringLength(80)]
-        public string pr_mono { get; set; }
+        public string? pr_mono { get; set; }
         /// <summary>
         /// 工单行号
         /// </summary>
@@ -31,51 +31,53 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 供应商id
         /// </summary>
+        [Required]
         public long pr_purchaseid { get; set; }
         /// <summary>
         /// 供应商编码
         /// </summary>
         [StringLength(80)]
-        public string pr_purchasenumber { get; set; }
+        public string? pr_purchasenumber { get; set; }
         /// <summary>
         /// 供应商名称
         /// </summary>
         [StringLength(80)]
-        public string pr_purchasename { get; set; }
+        public string? pr_purchasename { get; set; }
         /// <summary>
         /// 采购员
         /// </summary>
         [StringLength(80)]
-        public string pr_purchaser { get; set; }
+        public string? pr_purchaser { get; set; }
         /// <summary>
         /// 采购员工号（采购信息表）
         /// </summary>
         [StringLength(80)]
-        public string pr_purchaser_num { get; set; }
+        public string? pr_purchaser_num { get; set; }
         /// <summary>
         /// 需求数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal pr_rqty { get; set; }
+        public decimal? pr_rqty { get; set; }
         /// <summary>
         /// 申请数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal pr_aqty { get; set; }
+        public decimal? pr_aqty { get; set; }
         /// <summary>
         /// 建议数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal pr_sqty { get; set; }
+        public decimal? pr_sqty { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
+        [Required]
         public long icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
         [StringLength(80)]
-        public string icitem_name { get; set; }
+        public string? icitem_name { get; set; }
         /// <summary>
         /// 单据类型
         /// </summary>
@@ -120,26 +122,27 @@ namespace Bussiness.Model.MES.PO
         /// 系统价格（含税）
         /// </summary>
         [Precision(20, 8)]
-        public decimal pr_sysprice { get; set; }
+        public decimal? pr_sysprice { get; set; }
         /// <summary>
         /// 订单价格（含税）
         /// </summary>
         [Precision(20, 8)]
-        public decimal pr_orderprice { get; set; }
+        public decimal? pr_orderprice { get; set; }
         /// <summary>
         /// 采购净价（不含税）
         /// </summary>
         [Precision(20, 8)]
-        public decimal pr_price { get; set; }
+        public decimal? pr_price { get; set; }
         /// <summary>
         /// 税率
         /// </summary>
         [Precision(20, 8)]
-        public decimal pr_rate { get; set; }
+        public decimal? pr_rate { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
-        public long pr_unit { get; set; }
+        [StringLength(20)]
+        public string? pr_unit { get; set; }
         /// <summary>
         /// 状态
         /// </summary>
@@ -148,7 +151,7 @@ namespace Bussiness.Model.MES.PO
         /// 已申请数量
         /// </summary>
         [Precision(20, 8)]
-        public decimal old_apply_aqty { get; set; }
+        public decimal? old_apply_aqty { get; set; }
         /// <summary>
         /// 申请类型
         /// </summary>
@@ -156,22 +159,23 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 币种
         /// </summary>
+        [Required]
         public long currencytype { get; set; }
         /// <summary>
         /// 安全库存触发采购比例
         /// </summary>
         [Precision(20, 8)]
-        public decimal secInv_ratio { get; set; }
+        public decimal? secInv_ratio { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
         [StringLength(1000)]
-        public string remark { get; set; }
+        public string? remark { get; set; }
         /// <summary>
         /// 拒绝原因
         /// </summary>
         [StringLength(1000)]
-        public string pr_rreason { get; set; }
+        public string? pr_rreason { get; set; }
 
     }
 }

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

@@ -22,31 +22,33 @@ namespace Bussiness.Model.Tech
         /// <summary>
         /// 工序名称
         /// </summary>
+        [Required]
         [StringLength(100)]
         public string proc_name { get; set; }
 
         /// <summary>
-        /// 是否需要排产
+        /// 是否需要排产:1-是;0-否
         /// </summary>
+        [Required]
         public int is_schedule { get; set; }
 
         /// <summary>
         /// 简述
         /// </summary>
         [StringLength(500)]
-        public string short_desc { get; set; }
+        public string? short_desc { get; set; }
 
         /// <summary>
         /// 详细描述
         /// </summary>
         [StringLength(2000)]
-        public string long_desc { get; set; }
+        public string? long_desc { get; set; }
 
         /// <summary>
         /// 组合工序id
         /// </summary>
         [StringLength(2000)]
-        public string subids { get; set; }
+        public string? subids { get; set; }
 
     }
 }

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

@@ -17,22 +17,26 @@ namespace Bussiness.Model.Tech
         /// <summary>
         /// 工艺工序主键
         /// </summary>
+        [Required]
         public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 工装id
         /// </summary>
+        [Required]
         public long equip_id { get; set; }
 
         /// <summary>
         /// 工装编号
         /// </summary>
+        [Required]
         [StringLength(100)]
         public string equip_no { get; set; }
 
         /// <summary>
         /// 数量
         /// </summary>
+        [Required]
         public int qty { get; set; }
     }
 }

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

@@ -17,17 +17,19 @@ namespace Bussiness.Model.Tech
         /// <summary>
         /// 工艺工序主键
         /// </summary>
+        [Required]
         public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 作业指导书主键
         /// </summary>
+        [Required]
         public long upload_id { get; set; }
 
         /// <summary>
         /// 作业指导书名称
         /// </summary>
         [StringLength(100)]
-        public string name { get; set; }
+        public string? name { get; set; }
     }
 }

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

@@ -17,16 +17,18 @@ namespace Bussiness.Model.Tech
         /// <summary>
         /// 工艺工序id
         /// </summary>
+        [Required]
         public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 工位id
         /// </summary>
+        [Required]
         public long workshop_id { get; set; }
 
         /// <summary>
         /// 序列号
         /// </summary>
-        public int serialno { get; set; }
+        public int? serialno { get; set; }
     }
 }

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

@@ -17,22 +17,24 @@ namespace Bussiness.Model.Tech
         /// <summary>
         /// 设备id
         /// </summary>
+        [Required]
         public long equip_id { get; set; }
 
         /// <summary>
         /// 设备名称
         /// </summary>
         [StringLength(100)]
-        public string equip_name { get; set; }
+        public string? equip_name { get; set; }
 
         /// <summary>
         /// 工艺工位id
         /// </summary>
+        [Required]
         public long tech_proc_workshop_id { get; set; }
 
         /// <summary>
         /// 工作日历id
         /// </summary>
-        public long work_calendar_id { get; set; }
+        public long? work_calendar_id { get; set; }
     }
 }

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

@@ -17,16 +17,19 @@ namespace Bussiness.Model.Tech
         /// <summary>
         /// 工序工位id
         /// </summary>
+        [Required]
         public long tech_proc_workshop_id { get; set; }
 
         /// <summary>
         /// 物料id
         /// </summary>
+        [Required]
         public long icitem_id { get; set; }
 
         /// <summary>
         /// 数量
         /// </summary>
+        [Required]
         public int qty { get; set; }
     }
 }

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

@@ -17,17 +17,19 @@ namespace Bussiness.Model.Tech
         /// <summary>
         /// 工艺工位id
         /// </summary>
+        [Required]
         public long tech_proc_workshop_id { get; set; }
 
         /// <summary>
         /// 员工id
         /// </summary>
+        [Required]
         public long staff_id { get; set; }
 
         /// <summary>
         /// 员工姓名
         /// </summary>
         [StringLength(100)]
-        public string staff_name { get; set; }
+        public string? staff_name { get; set; }
     }
 }

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

@@ -30,60 +30,62 @@ namespace Bussiness.Model.Tech
         /// <summary>
         /// 组合层级
         /// </summary>
+        [Required]
         public int level { get; set; }
 
         /// <summary>
         /// 前置准备时间
         /// </summary>
         [Precision(20,8)]
-        public decimal readytime { get; set; }
+        public decimal? readytime { get; set; }
 
         /// <summary>
         /// 效率计算类型 1-节拍时间；2-UPH
         /// </summary>
+        [Required]
         public int type { get; set; }
 
         /// <summary>
         /// UPH
         /// </summary>
         [Precision(20, 8)]
-        public decimal uph { get; set; }
+        public decimal? uph { get; set; }
 
         /// <summary>
         /// 节拍时间
         /// </summary>
         [Precision(20, 8)]
-        public decimal ct { get; set; }
+        public decimal? ct { get; set; }
 
         /// <summary>
         /// 效率系数
         /// </summary>
         [Precision(10, 4)]
-        public decimal effect_ratio { get; set; }
+        public decimal? effect_ratio { get; set; }
 
         /// <summary>
         /// 是否需要跟踪工序
         /// </summary>
-        public int mototrack { get; set; }
+        public int? mototrack { get; set; }
 
         /// <summary>
         /// 下一工序id
         /// </summary>
-        public long nextprocid { get; set; }
+        public long? nextprocid { get; set; }
 
         /// <summary>
         /// 父级工序id
         /// </summary>
-        public long parentprocid { get; set; }
+        public long? parentprocid { get; set; }
 
         /// <summary>
         /// 是否需要质检
         /// </summary>
-        public int needqc { get; set; }
+        public int? needqc { get; set; }
 
         /// <summary>
         /// 最大并行工位数
         /// </summary>
-        public int maxworkshop { get; set; }
+        public int? maxworkshop { get; set; }
     }
 }

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

@@ -24,24 +24,25 @@ namespace Bussiness.Model.Tech
         /// <summary>
         /// 效率计算层级
         /// </summary>
+        [Required]
         public int level { get; set; }
 
         /// <summary>
         /// 产品
         /// </summary>
         [StringLength(100)]
-        public string bom { get; set; }
+        public string? bom { get; set; }
 
         /// <summary>
         /// 产品版本
         /// </summary>
         [StringLength(100)]
-        public string bomver { get; set; }
+        public string? bomver { get; set; }
 
         /// <summary>
         /// 描述
         /// </summary>
         [StringLength(100)]
-        public string desc { get; set; }
+        public string? desc { get; set; }
     }
 }

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

@@ -18,41 +18,41 @@ namespace Bussiness.Model.Tech
         /// 工位名称
         /// </summary>
         [StringLength(100)]
-        public string name { get; set; }
+        public string? name { get; set; }
 
         /// <summary>
         /// 组合工位ids
         /// </summary>
         [StringLength(2000)]
-        public string subids { get; set; }
+        public string? subids { get; set; }
 
         /// <summary>
         /// 坐标
         /// </summary>
         [StringLength(100)]
-        public string geoinfo { get; set; }
+        public string? geoinfo { get; set; }
 
         /// <summary>
         /// 楼栋
         /// </summary>
         [StringLength(100)]
-        public string building { get; set; }
+        public string? building { get; set; }
 
         /// <summary>
         /// 楼层
         /// </summary>
         [StringLength(100)]
-        public string floor { get; set; }
+        public string? floor { get; set; }
 
         /// <summary>
         /// 区域
         /// </summary>
         [StringLength(100)]
-        public string zone { get; set; }
+        public string? zone { get; set; }
 
         /// <summary>
         /// 工作日历id
         /// </summary>
-        public long work_calendar_id { get; set; }
+        public long? work_calendar_id { get; set; }
     }
 }

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

@@ -17,23 +17,24 @@ namespace Bussiness.Model.Tech
         /// <summary>
         /// 工位id
         /// </summary>
+        [Required]
         public long workshop_id { get; set; }
 
         /// <summary>
         /// 线边仓序列号
         /// </summary>
-        public int serialno { get; set; }
+        public int? serialno { get; set; }
 
         /// <summary>
         /// 仓库编号
         /// </summary>
         [StringLength(100)]
-        public string sheifno { get; set; }
+        public string? sheifno { get; set; }
 
         /// <summary>
         /// 坐标
         /// </summary>
         [StringLength(100)]
-        public string geoinfo { get; set; }
+        public string? geoinfo { get; set; }
     }
 }

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

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

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

@@ -17,26 +17,27 @@ namespace Bussiness.Model.Tech
         /// <summary>
         /// 工作日历id
         /// </summary>
+        [Required]
         public long work_calendar_id { get; set; }
 
         /// <summary>
         /// 日期
         /// </summary>
-        public DateTime work_cal_list_date { get; set; }
+        public DateTime? work_cal_list_date { get; set; }
 
         /// <summary>
         /// 类型:1-工作日;0-休息日
         /// </summary>
-        public int work_cal_list_type { get; set; }
+        public int? work_cal_list_type { get; set; }
 
         /// <summary>
         /// 工作时长(分钟)
         /// </summary>
-        public int work_cal_list_times { get; set; }
+        public int? work_cal_list_times { get; set; }
 
         /// <summary>
         /// 班次数
         /// </summary>
-        public int work_cal_list_num { get; set; }
+        public int? work_cal_list_num { get; set; }
     }
 }