工艺路径相关表属性调整

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