生产管理

DOAN.Model/MES/Base/BaseCustom.cs

@@ -0,0 +1,96 @@
+
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 客户信息
+    /// </summary>
+    [SugarTable("base_custom")]
+    [Tenant("0")]
+    public class BaseCustom
+    {
+        /// <summary>
+        /// 主键 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 客户代码 
+        /// </summary>
+        [SugarColumn(ColumnName = "custom_no")]
+        public string CustomNo { get; set; }
+
+        /// <summary>
+        /// 客户名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "custom_name")]
+        public string CustomName { get; set; }
+
+        
+
+
+        /// <summary>
+        /// 客户简称 
+        /// </summary>
+        [SugarColumn(ColumnName = "custom_add_name")]
+        public string CustomAddName { get; set; }
+
+        /// <summary>
+        /// 客户地址 
+        /// </summary>
+        [SugarColumn(ColumnName = "custom_address")]
+        public string CustomAddress { get; set; }
+
+        /// <summary>
+        /// 客户联系人 
+        /// </summary>
+        [SugarColumn(ColumnName = "custom_liaison")]
+        public string CustomLiaison { get; set; }
+
+        /// <summary>
+        /// 客户手机号 
+        /// </summary>
+        [SugarColumn(ColumnName = "custom_phone")]
+        public string CustomPhone { get; set; }
+
+        /// <summary>
+        /// 类别 
+        /// </summary>
+        public int? Type { get; set; }
+
+        /// <summary>
+        /// 状态 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/BaseDevice.cs

@@ -0,0 +1,87 @@
+
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 设备信息
+    /// </summary>
+    [SugarTable("base_device")]
+    public class BaseDevice
+    {
+        /// <summary>
+        /// 主键 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 工位 
+        /// </summary>
+        [SugarColumn(ColumnName = "fk_work_station")]
+        public int? FkWorkStation { get; set; }
+
+        /// <summary>
+        /// 设备编号 
+        /// </summary>
+        [SugarColumn(ColumnName = "device_code")]
+        public string DeviceCode { get; set; }
+
+        /// <summary>
+        /// 设备名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "device_name")]
+        public string DeviceName { get; set; }
+
+        /// <summary>
+        /// 设备规格 
+        /// </summary>
+        [SugarColumn(ColumnName = "device_specification")]
+        public string DeviceSpecification { get; set; }
+
+        /// <summary>
+        /// 购买日期 
+        /// </summary>
+        [SugarColumn(ColumnName = "purchase_time")]
+        public DateTime? PurchaseTime { get; set; }
+
+        /// <summary>
+        /// 供应商 
+        /// </summary>
+        [SugarColumn(ColumnName = "device_supplier")]
+        public string DeviceSupplier { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 状态 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/BaseGroup.cs

@@ -0,0 +1,62 @@
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 组
+    /// </summary>
+    [SugarTable("base_group")]
+    public class BaseGroup
+    {
+        /// <summary>
+        /// id 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 组代码 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "group_code")]
+        public string GroupCode { get; set; }
+
+        /// <summary>
+        /// 组名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "group_name")]
+        public string GroupName { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 状态 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/BaseMaterialBom.cs

@@ -0,0 +1,83 @@
+
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarTable("base_material_bom")]
+    public class BaseMaterialBom
+    {
+        /// <summary>
+        /// 雪花id
+        /// </summary>
+        [SugarColumn(ColumnName = "Id" ,IsPrimaryKey =true) ]
+        public string Id { get; set; }
+        /// <summary>
+        /// 母件编码
+        /// </summary>
+        [SugarColumn(ColumnName = "InvCode")]
+        public string InvCode { get; set; }
+
+        /// <summary>
+        /// 母件名称
+        /// </summary>
+        [SugarColumn(ColumnName = "InvName")]
+        public string InvName { get; set; }
+
+        /// <summary>
+        /// 子件编码
+        /// </summary>
+        [SugarColumn(ColumnName = "subInvCode")]
+        public string SubInvCode { get; set; }
+
+        /// <summary>
+        /// 子件名称
+        /// </summary>
+        [SugarColumn(ColumnName = "subInvName")]
+        public string SubInvName { get; set; }
+
+        /// <summary>
+        /// 使用数量
+        /// </summary>
+        [SugarColumn(ColumnName = "iusequantity")]
+        public string Iusequantity { get; set; }
+
+        /// <summary>
+        /// BOM版本号
+        /// </summary>
+        [SugarColumn(ColumnName = "BOMVersion")]
+        public string BOMVersion { get; set; }
+
+
+        /// <summary>
+        /// CreatedBy 
+        /// </summary>
+        [SugarColumn(ColumnName = "created_by")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// CreatedTime 
+        /// </summary>
+        [SugarColumn(ColumnName = "created_time")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// UpdatedBy 
+        /// </summary>
+        [SugarColumn(ColumnName = "updated_by")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// UpdatedTime 
+        /// </summary>
+        [SugarColumn(ColumnName = "updated_time")]
+        public DateTime? UpdatedTime { get; set; }
+
+        /// <summary>
+        /// 子节点
+        /// </summary>
+        //[Navigate(NavigateType.OneToMany, nameof(BaseMaterialBom.SubInvCode), nameof(BaseMaterialBom.InvCode))]
+        //public List<BaseMaterialBom> Child { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/BaseMaterialBom1.cs

@@ -0,0 +1,52 @@
+
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarTable("base_material_bom")]
+    public class BaseMaterialBom1
+    {
+        /// <summary>
+        /// FkId 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_id")]
+        public string FkId { get; set; }
+
+        /// <summary>
+        /// FkParentId 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_parent_id")]
+        public string FkParentId { get; set; }
+
+        /// <summary>
+        /// Sort 
+        /// </summary>
+        public int? Sort { get; set; }
+
+        /// <summary>
+        /// CreatedBy 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// CreatedTime 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// UpdatedBy 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// UpdatedTime 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/BaseMaterialList.cs

@@ -0,0 +1,151 @@
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 物料清单
+    /// </summary>
+    [SugarTable("base_material_list")]
+    public class BaseMaterialList
+    {
+        /// <summary>
+        /// 雪花id 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public string Id { get; set; }
+
+        ///// <summary>
+        ///// 物料类别外键id 
+        ///// </summary>
+        //[SugarColumn(ColumnName = "fk_type_id")]
+        //public int? FkTypeId { get; set; }
+
+        
+
+        /// <summary>
+        /// 物料编码 
+        /// </summary>
+        [SugarColumn(ColumnName = "fk_material_type_code")]
+        public string FkMaterialTypeCode { get; set; }
+
+
+        /// <summary>
+        /// 物料名称 
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 物料编码 
+        /// </summary>
+        public string Code { get; set; }
+        /// <summary>
+        /// 物料代码
+        /// </summary>
+        [SugarColumn(ColumnName = "addcode")]
+        public string ADDCode { get; set; }
+
+        /// <summary>
+        /// 客户编码  customer_ code
+        /// </summary>
+        [SugarColumn(ColumnName = "customer_code")]
+
+        public string CustomerCode { get; set; }
+
+        /// <summary>
+        /// 颜色 
+        /// </summary>
+        public string Color { get; set; }
+
+        /// <summary>
+        /// 规格型号 
+        /// </summary>
+        public string Specification { get; set; }
+
+        /// <summary>
+        /// 计量单位 
+        /// </summary>
+        public string Unit { get; set; }
+
+        /// <summary>
+        /// 描述 
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// 供应商外键id 
+        /// </summary>
+        [SugarColumn(ColumnName = "fk_supplier_id")]
+        public int? FkSupplierId { get; set; }
+
+        /// <summary>
+        /// 保质期单位 
+        /// </summary>
+        [SugarColumn(ColumnName = "expiration_unit")]
+        public string ExpirationUnit { get; set; }
+
+        /// <summary>
+        /// 保质期 
+        /// </summary>
+        [SugarColumn(ColumnName = "expiration_date")]
+        public decimal ExpirationDate { get; set; }
+
+        /// <summary>
+        /// 保质期预警天数 
+        /// </summary>
+        [SugarColumn(ColumnName = "shelf_life_warning_days")]
+        public int? ShelfLifeWarningDays { get; set; }
+
+        /// <summary>
+        /// 是否有效期管理 
+        /// </summary>
+        [SugarColumn(ColumnName = "is_shelf_life")]
+        public int? IsShelfLife { get; set; }
+
+        /// <summary>
+        /// 启用日期 
+        /// </summary>
+        [SugarColumn(ColumnName = "start_time")]
+        public DateTime? StartTime { get; set; }
+
+        /// <summary>
+        /// 停用日期 
+        /// </summary>
+        [SugarColumn(ColumnName = "stop_time")]
+        public DateTime? StopTime { get; set; }
+
+        /// <summary>
+        /// 对应条码 
+        /// </summary>
+        [SugarColumn(ColumnName = "bar_code")]
+        public string BarCode { get; set; }
+
+        /// <summary>
+        /// 是否启用批次管理 
+        /// </summary>
+        [SugarColumn(ColumnName = "is_batch")]
+        public int? IsBatch { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/BaseMaterialType.cs

@@ -0,0 +1,74 @@
+
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 物料类别
+    /// </summary>
+    [SugarTable("base_material_type")]
+    public class BaseMaterialType
+    {
+        /// <summary>
+        /// id 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        ///// <summary>
+        ///// 父id 
+        ///// </summary>
+        //[SugarColumn(ColumnName = "parent_id")]
+        //public int ParentId { get; set; }
+
+        /// <summary>
+        /// 名称 
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 类别编码 
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 父类别编码 
+        /// </summary>
+        /// 
+        [SugarColumn(ColumnName = "parent_code")]
+        public string ParentCode { get; set; }
+
+        /// <summary>
+        /// 状态 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/BaseRelWorkRouteProcesses.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 工艺路线与工序绑定表
+    /// </summary>
+    [SugarTable("base_rel_work_route_processes")]
+    public class BaseRelWorkRouteProcesses
+    {
+        /// <summary>
+        /// 工艺路线主键 
+        /// </summary>
+        [SugarColumn(ColumnName = "fk_work_route")]
+        public int FkWorkRoute { get; set; }
+
+        /// <summary>
+        /// 生产工序主键 
+        /// </summary>
+        [SugarColumn(ColumnName = "fk_work_processes")]
+        public int FkWorkProcesses { get; set; }
+
+        /// <summary>
+        /// 排序 
+        /// </summary>
+        public int Sort { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/BaseSupplier.cs

@@ -0,0 +1,94 @@
+
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 供应商信息
+    /// </summary>
+    [SugarTable("base_supplier")]
+    public class BaseSupplier
+    {
+        /// <summary>
+        /// 主键 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 供应商代码 
+        /// </summary>
+        [SugarColumn(ColumnName = "supplier_no")]
+        public string SupplierNo { get; set; }
+
+        /// <summary>
+        /// 供应商名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "supplier_name")]
+        public string SupplierName { get; set; }
+
+
+        
+        /// <summary>
+        /// 供应商简称
+        /// </summary>
+        [SugarColumn(ColumnName = "supplier_add_name")]
+        public string SupplierAddName { get; set; }
+
+        /// <summary>
+        /// 供应商地址 
+        /// </summary>
+        [SugarColumn(ColumnName = "supplier_address")]
+        public string SupplierAddress { get; set; }
+
+        /// <summary>
+        /// 供应商联系人 
+        /// </summary>
+        [SugarColumn(ColumnName = "supplier_liaison")]
+        public string SupplierLiaison { get; set; }
+
+        /// <summary>
+        /// 供应商手机号 
+        /// </summary>
+        [SugarColumn(ColumnName = "supplier_phone")]
+        public string SupplierPhone { get; set; }
+
+        /// <summary>
+        /// 类别 
+        /// </summary>
+        public int? Type { get; set; }
+
+        /// <summary>
+        /// 状态 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/BaseUnit.cs

@@ -0,0 +1,64 @@
+
+
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 单位信息
+    /// </summary>
+    [SugarTable("base_unit")]
+    public class BaseUnit
+    {
+        /// <summary>
+        /// 自增 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 单位名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "unit_name")]
+        public string UnitName { get; set; }
+
+        /// <summary>
+        /// 单位代码 
+        /// </summary>
+        [SugarColumn(ColumnName = "unit_code")]
+        public string UnitCode { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 状态 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/BaseWorkProcesses.cs

@@ -0,0 +1,65 @@
+
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 生产工序
+    /// </summary>
+    [SugarTable("base_work_processes")]
+    public class BaseWorkProcesses
+    {
+        /// <summary>
+        /// 主键 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int? Id { get; set; }
+
+        /// <summary>
+        /// 工序类别 
+        /// </summary>
+        [SugarColumn(ColumnName = "dict_work_type")]
+        public string DictWorkType { get; set; }
+
+        /// <summary>
+        /// 工序名称 
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 状态 
+        /// </summary>
+        public int? Status { get; set; }
+
+        [Navigate(NavigateType.OneToMany, nameof(BaseWorkStation.FkWorkProcesses))]
+        public List<BaseWorkStation> BindedWorkStationArray { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/BaseWorkRoute.cs

@@ -0,0 +1,70 @@
+using DOAN.Model.MES.base_.Dto;
+
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 工艺路线
+    /// </summary>
+    [SugarTable("base_work_route")]
+    public class BaseWorkRoute
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public string Code { get; set; }
+
+        [SugarColumn(IsIgnore =true)]
+        public List<BaseWorkProcessesDto3> BaseWorkProcessesList { get; set; }
+
+        /// <summary>
+        /// 工艺流程图原始json数据，用来进行复现
+        /// </summary>
+        [SugarColumn(ColumnName = "logic_flow_data")]
+        public string LogicFlowData { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+    }
+}

DOAN.Model/MES/Base/BaseWorkStation.cs

@@ -0,0 +1,74 @@
+
+namespace DOAN.Model.MES.base_
+{
+    /// <summary>
+    /// 工位
+    /// </summary>
+    [SugarTable("base_work_station")]
+    public class BaseWorkStation
+    {
+        /// <summary>
+        /// 主键 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 所属工序 
+        /// </summary>
+        [SugarColumn(ColumnName = "fk_work_processes")]
+        public int? FkWorkProcesses { get; set; }
+
+        /// <summary>
+        /// 工序类别（与工序统一） 
+        /// </summary>
+        [SugarColumn(ColumnName = "dict_work_type")]
+        public string DictWorkType { get; set; }
+
+        /// <summary>
+        /// 工位描述 
+        /// </summary>
+        [SugarColumn(ColumnName = "work_station_description")]
+        public string WorkStationDescription { get; set; }
+
+
+
+        [Navigate(NavigateType.OneToMany, nameof(BaseDevice.FkWorkStation))]
+        public List<BaseDevice>  BindedDeviceArray { get; set; }
+
+        /// <summary>
+        /// 状态 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/Dto/BaseBomTreeDto.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.MES.base_.Dto
+{
+    public class BaseBomTreeDto
+    {
+        /// <summary>
+        /// 雪花id
+        /// </summary>
+
+        public string Id { get; set; }
+        /// <summary>
+        /// 母件编码
+        /// </summary>
+
+        public string InvCode { get; set; }
+
+        /// <summary>
+        /// 母件名称
+        /// </summary>
+
+        public string InvName { get; set; }
+
+        /// <summary>
+        /// 子件编码
+        /// </summary>
+
+        public string SubInvCode { get; set; }
+
+        /// <summary>
+        /// 子件名称
+        /// </summary>
+
+        public string SubInvName { get; set; }
+
+        /// <summary>
+        /// 使用数量
+        /// </summary>
+
+        public string Iusequantity { get; set; }
+
+        /// <summary>
+        /// BOM版本号
+        /// </summary>
+
+        public string BOMVersion { get; set; }
+
+
+        /// <summary>
+        /// CreatedBy 
+        /// </summary>
+
+        public string CreatedBy { get; set; }
+        /// <summary>
+        /// CreatedTime 
+        /// </summary>
+
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// UpdatedBy 
+        /// </summary>
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// UpdatedTime 
+        /// </summary>
+        public DateTime? UpdatedTime { get; set; }
+
+
+        public  List<BaseBomTreeDto> Child { get; set; }=new  List<BaseBomTreeDto>();
+    }
+}

DOAN.Model/MES/Base/Dto/BaseCustomDto.cs

@@ -0,0 +1,67 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.base_.Dto
+{
+    /// <summary>
+    /// 客户信息查询对象
+    /// </summary>
+    public class BaseCustomQueryDto : PagerInfo 
+    {
+        public string CustomNo { get; set; }
+
+        public string CustomName { get; set; }
+
+        public int? Type { get; set; }
+
+        public int? Status { get; set; }
+    }
+
+    public class BaseCustomQueryDto2
+    {
+        public string CustomNo { get; set; }
+
+    
+    }
+
+    /// <summary>
+    /// 客户信息输入输出对象
+    /// </summary>
+    public class BaseCustomDto
+    {
+        [Required(ErrorMessage = "主键不能为空")]
+        public int Id { get; set; }
+
+        public string CustomNo { get; set; }
+
+        public string CustomName { get; set; }
+
+
+        /// <summary>
+        /// 客户简称 
+        /// </summary>
+        public string CustomAddName { get; set; }
+
+        public string CustomAddress { get; set; }
+
+        public string CustomLiaison { get; set; }
+
+        public string CustomPhone { get; set; }
+
+        public int? Type { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

DOAN.Model/MES/Base/Dto/BaseDeviceDto.cs

@@ -0,0 +1,60 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.base_.Dto
+{
+    /// <summary>
+    /// 设备信息查询对象
+    /// </summary>
+    public class BaseDeviceQueryDto : PagerInfo 
+    {
+        public int? FkWorkStation { get; set; }
+
+        public string DeviceCode { get; set; }
+
+        public string DeviceName { get; set; }
+
+        public string DeviceSpecification { get; set; }
+
+        public DateTime? PurchaseTime { get; set; }
+
+        public string DeviceSupplier { get; set; }
+
+        public int? Status { get; set; }
+    }
+
+    /// <summary>
+    /// 设备信息输入输出对象
+    /// </summary>
+    public class BaseDeviceDto
+    {
+        [Required(ErrorMessage = "主键不能为空")]
+        public int Id { get; set; }
+
+        public int? FkWorkStation { get; set; }
+
+        public string DeviceCode { get; set; }
+
+        public string DeviceName { get; set; }
+
+        public string DeviceSpecification { get; set; }
+
+        public DateTime? PurchaseTime { get; set; }
+
+        public string DeviceSupplier { get; set; }
+
+        public string Remark { get; set; }
+
+        public int? Status { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

DOAN.Model/MES/Base/Dto/BaseGroupDto.cs

@@ -0,0 +1,45 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.base_.Dto
+{
+    /// <summary>
+    /// 组查询对象
+    /// </summary>
+    public class BaseGroupQueryDto : PagerInfo 
+    {
+        public string GroupCode { get; set; }
+
+        public string GroupName { get; set; }
+
+        public int? Status { get; set; }
+    }
+
+    /// <summary>
+    /// 组输入输出对象
+    /// </summary>
+    public class BaseGroupDto
+    {
+        [Required(ErrorMessage = "id不能为空")]
+        public int Id { get; set; }
+
+        [Required(ErrorMessage = "组代码不能为空")]
+        public string GroupCode { get; set; }
+
+        public string GroupName { get; set; }
+
+        public string Remark { get; set; }
+
+        public int? Status { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

DOAN.Model/MES/Base/Dto/BaseMaterialBomDto.cs

@@ -0,0 +1,63 @@
+using System.ComponentModel.DataAnnotations;
+namespace DOAN.Model.MES.base_.Dto
+{
+    /// <summary>
+    /// 查询对象
+    /// </summary>
+    public class BaseMaterialBomQueryDto : PagerInfo
+    {
+        public string InvCode { get; set; }
+        public string SubInvCode { get; set; }
+    }
+
+    /// <summary>
+    /// 输入输出对象
+    /// </summary>
+    public class BaseMaterialBomDto
+    {
+        [Required(ErrorMessage = "雪花id不能为空")]
+        public string Id { get; set; }
+
+        [Required(ErrorMessage = "母件code不能为空")]
+        public string InvCode { get; set; }
+
+        public string InvName { get; set; }
+
+        [Required(ErrorMessage = "子件编码不能为空")]
+        public string SubInvCode { get; set; }
+
+        public string SubInvName { get; set; }
+
+      
+
+        public string Iusequantity { get; set; }
+
+        public string BOMVersion { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+        //   public List<BaseMaterialBom> Child { get; set; }
+
+
+
+    }
+
+    //增加 规格和单位
+    public class BaseMaterialBomDto2 : BaseMaterialBomDto
+    {
+
+        public string Specification { get; set; }
+
+        public string Unit { get; set; }
+
+
+
+    }
+
+}

DOAN.Model/MES/Base/Dto/BaseMaterialListDto.cs

@@ -0,0 +1,274 @@
+using System.ComponentModel.DataAnnotations;
+namespace DOAN.Model.MES.base_.Dto
+{
+    /// <summary>
+    /// 物料清单查询对象
+    /// </summary>
+    public class BaseMaterialListQueryDto : PagerInfo
+    {
+
+
+        /// <summary>
+        /// 物料编码 
+        /// </summary>
+
+        public string FkMaterialTypeCode { get; set; }
+
+
+        /// <summary>
+        /// 物料名称 
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 物料编码 
+        /// </summary>
+        public string Code { get; set; }
+
+        public DateTime[] TimeRange { get; set; }
+    }
+    public class BaseMaterialListQueryDto5
+    {
+
+        /// <summary>
+        /// 物料名称   物料编码 
+        /// </summary>
+        public string Name_or_Code { get; set; }
+
+
+
+
+    }
+
+
+    public class BaseMaterialListQueryDto2 : PagerInfo
+    {
+        public string Name { get; set; }
+
+        public int Type { get; set; }
+
+        public int? FkTypeId { get; set; }
+
+        public string Code { get; set; }
+
+        public string CustomerCode { get; set; }
+
+
+        public string Description { get; set; }
+
+
+
+        public DateTime[] TimeRange { get; set; }
+    }
+
+    public class BaseMaterialListQueryDto3 : PagerInfo
+    {
+        /// <summary>
+        /// 成品id
+        /// </summary>
+        public string Id { get; set; }
+
+        public string Name { get; set; }
+
+        public string Code { get; set; }
+
+        public string CustomerCode { get; set; }
+
+    }
+
+    /// <summary>
+    /// 物料清单输入输出对象
+    /// </summary>
+    public class BaseMaterialListDto
+    {
+
+        public string Id { get; set; }
+
+        public int? FkTypeId { get; set; }
+
+        public string Name { get; set; }
+
+        public string Code { get; set; }
+
+        public string CustomerCode { get; set; }
+
+        public string Color { get; set; }
+
+        public string Specification { get; set; }
+
+        public string Unit { get; set; }
+
+        public string Description { get; set; }
+
+        public int? FkSupplierId { get; set; }
+
+        public string ExpirationUnit { get; set; }
+
+        public decimal ExpirationDate { get; set; }
+
+        public int? ShelfLifeWarningDays { get; set; }
+
+        public int? IsShelfLife { get; set; }
+
+        public DateTime? StartTime { get; set; }
+
+        public DateTime? StopTime { get; set; }
+
+        public string BarCode { get; set; }
+
+        public int? IsBatch { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+    public class BaseMaterialListDto2
+    {
+
+        public string FkMaterialTypeCode { get; set; }
+        public string FkMaterialTypeName { get; set; }
+
+
+
+
+        /// <summary>
+        /// 雪花id 
+        /// </summary>
+
+        public string Id { get; set; }
+
+
+
+
+
+
+
+
+        /// <summary>
+        /// 物料名称 
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 物料编码 
+        /// </summary>
+        public string Code { get; set; }
+        /// <summary>
+        /// 物料代码
+        /// </summary>
+
+        public string ADDCode { get; set; }
+
+        /// <summary>
+        /// 客户编码  customer_ code
+        /// </summary>
+
+
+        public string CustomerCode { get; set; }
+
+        /// <summary>
+        /// 颜色 
+        /// </summary>
+        public string Color { get; set; }
+
+        /// <summary>
+        /// 规格型号 
+        /// </summary>
+        public string Specification { get; set; }
+
+        /// <summary>
+        /// 计量单位 
+        /// </summary>
+        public string Unit { get; set; }
+
+        /// <summary>
+        /// 描述 
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// 供应商外键id 
+        /// </summary>
+
+        public int? FkSupplierId { get; set; }
+
+        /// <summary>
+        /// 保质期单位 
+        /// </summary>
+        [SugarColumn(ColumnName = "expiration_unit")]
+        public string ExpirationUnit { get; set; }
+
+        /// <summary>
+        /// 保质期 
+        /// </summary>
+
+        public decimal ExpirationDate { get; set; }
+
+        /// <summary>
+        /// 保质期预警天数 
+        /// </summary>
+
+        public int? ShelfLifeWarningDays { get; set; }
+
+        /// <summary>
+        /// 是否有效期管理 
+        /// </summary>
+
+        public int? IsShelfLife { get; set; }
+
+        /// <summary>
+        /// 启用日期 
+        /// </summary>
+
+        public DateTime? StartTime { get; set; }
+
+        /// <summary>
+        /// 停用日期 
+        /// </summary>
+
+        public DateTime? StopTime { get; set; }
+
+        /// <summary>
+        /// 对应条码 
+        /// </summary>
+
+        public string BarCode { get; set; }
+
+        /// <summary>
+        /// 是否启用批次管理 
+        /// </summary>
+
+        public int? IsBatch { get; set; }
+
+        /// <summary>
+        /// 创建人 
+
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Base/Dto/BaseMaterialTypeDto.cs

@@ -0,0 +1,54 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.base_.Dto
+{
+    /// <summary>
+    /// 物料类别查询对象
+    /// </summary>
+    public class BaseMaterialTypeQueryDto : PagerInfo
+    {
+        public string Name { get; set; }
+
+        public string Code { get; set; }
+
+        public int? Status { get; set; }
+    }
+
+    /// <summary>
+    /// 物料类别输入输出对象
+    /// </summary>
+    public class BaseMaterialTypeDto
+    {
+        [Required(ErrorMessage = "id不能为空")]
+        public int Id { get; set; }
+
+        //[Required(ErrorMessage = "父id不能为空")]
+        //public int ParentId { get; set; }
+
+        public string Name { get; set; }
+
+        public string Code { get; set; }
+
+
+        /// <summary>
+        /// 父类别编码 
+        /// </summary>
+        public string ParentCode { get; set; }
+
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

DOAN.Model/MES/Base/Dto/BaseParseNode.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.MES.base_.Dto
+{
+
+    public class BaseParseNodeDto
+    {
+        public int FkRouteCode { get; set; } //工艺路线id
+
+        public string LogicFlowData { get; set; }
+    }
+
+    /// <summary>
+    /// 流程图节点解析
+    /// </summary>
+    public class BaseParseNode
+    {
+        
+        public Nodes__[] nodes { get; set; }
+
+        public Edges__[] edges {  get; set; }
+    }
+
+    public class Nodes__
+    {
+        public string id { get; set; }
+
+        public string type { get; set; }
+
+        public int x { get; set; }
+        public int y { get; set; }
+        public Properties_ properties { get; set; }
+
+        public Text_  text { get; set; }
+
+    }
+    public class Properties_
+    {
+        public int processesId { get; set; }
+    }
+
+    public class Text_
+    {
+        public int x { get; set; }
+        public int y { get; set; }
+
+        public string value { get; set; }
+
+    }
+
+    public class Edges__
+    { 
+        public  string Id { get; set; }
+        public  string type { get; set; }
+        public  string sourceNodeId { get; set; }
+        public  string targetNodeId { get; set; }
+        public Point startPoint { get; set; }
+        public Point endPoint { get; set; }
+        public Properties_ properties { get; set; }
+        public Point[] pointsList { get; set; }
+    }
+
+    public class Point
+    { 
+        public int x { get; set; } 
+        public int y { get; set; }
+    }
+
+
+}

DOAN.Model/MES/Base/Dto/BaseSupplierDto.cs

@@ -0,0 +1,57 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.base_.Dto
+{
+    /// <summary>
+    /// 供应商信息查询对象
+    /// </summary>
+    public class BaseSupplierQueryDto : PagerInfo 
+    {
+        public string SupplierNo { get; set; }
+
+        public string SupplierName { get; set; }
+        public int? Type { get; set; }
+        public int? Status { get; set; }
+    }
+
+    /// <summary>
+    /// 供应商信息输入输出对象
+    /// </summary>
+    public class BaseSupplierDto
+    {
+        [Required(ErrorMessage = "主键不能为空")]
+        public int Id { get; set; }
+
+        public string SupplierNo { get; set; }
+
+        public string SupplierName { get; set; }
+
+        public string SupplierAddress { get; set; }
+
+        /// <summary>
+        /// 供应商简称
+        /// </summary>
+        public string SupplierAddName { get; set; }
+
+        public string SupplierLiaison { get; set; }
+
+        public string SupplierPhone { get; set; }
+
+        public int? Type { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

DOAN.Model/MES/Base/Dto/BaseUnitDto.cs

@@ -0,0 +1,45 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.base_.Dto
+{
+    /// <summary>
+    /// 单位信息查询对象
+    /// </summary>
+    public class BaseUnitQueryDto : PagerInfo 
+    {
+        public string UnitName { get; set; }
+
+        public string UnitCode { get; set; }
+
+
+        public int Status { get; set; }
+    }
+
+    /// <summary>
+    /// 单位信息输入输出对象
+    /// </summary>
+    public class BaseUnitDto
+    {
+        [Required(ErrorMessage = "自增不能为空")]
+        public int Id { get; set; }
+
+        public string UnitName { get; set; }
+
+        public string UnitCode { get; set; }
+
+        public string Remark { get; set; }
+
+        public int? Status { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

DOAN.Model/MES/Base/Dto/BaseWorkProcessesDto.cs

@@ -0,0 +1,111 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.base_.Dto
+{
+    /// <summary>
+    /// 生产工序查询对象
+    /// </summary>
+    public class BaseWorkProcessesQueryDto : PagerInfo 
+    {
+        public string Name { get; set; }
+
+        public int? Status { get; set; }
+        public string DictWorkType { get; set; }
+    }
+    public class BaseWorkProcessesQueryDto2 : PagerInfo
+    {
+        public string Name { get; set; }
+
+        public int? Status { get; set; }
+        public string DictWorkType { get; set; }
+
+
+        public int FkRouteCode { get; set; }
+    }
+
+    /// <summary>
+    /// 生产工序输入输出对象
+    /// </summary>
+    public class BaseWorkProcessesDto
+    {
+        public int? Id { get; set; }
+
+        public string DictWorkType { get; set; }
+
+        public string Name { get; set; }
+
+        public List<BaseWorkStation> BindedWorkStationArray { get; set; }
+
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+
+    /// <summary>
+    /// 生产工序输入输出对象
+    /// </summary>
+    public class BaseWorkProcessesDto2
+    {
+        public int? Id { get; set; }
+
+        public string DictWorkType { get; set; }
+
+        public string Name { get; set; }
+
+        public int? Status { get; set; }
+
+        public int[] BindedWorkStationArray  { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+
+    public class BaseWorkProcessesDto3
+    {
+        public int? Id { get; set; }
+
+        public string DictWorkType { get; set; }
+
+        public string Name { get; set; }
+
+        public int fk_id { get; set; }
+
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

DOAN.Model/MES/Base/Dto/BaseWorkRouteDto.cs

@@ -0,0 +1,71 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.base_.Dto
+{
+    /// <summary>
+    /// 工艺路线查询对象
+    /// </summary>
+    public class BaseWorkRouteQueryDto : PagerInfo
+    {
+        public string Name { get; set; }
+
+        public string Code { get; set; }
+
+        public int? Status { get; set; }
+    }
+
+    /// <summary>
+    /// 工艺路线输入输出对象
+    /// </summary>
+    public class BaseWorkRouteDto
+    {
+        [Required(ErrorMessage = "主键不能为空")]
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+
+        public string Code { get; set; }
+
+        public string LogicFlowData { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+    }
+
+    /// <summary>
+    /// 工艺路线输入输出对象  带工序的
+    /// </summary>
+    public class BaseWorkRouteDto_bind_process
+    {
+        [Required(ErrorMessage = "主键不能为空")]
+        public int Id { get; set; }
+
+        public  List<BaseWorkProcessesDto3> BaseWorkProcessesList { get; set; }
+        public string Name { get; set; }
+
+        public string Code { get; set; }
+
+        public string LogicFlowData { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+    }
+}

DOAN.Model/MES/Base/Dto/BaseWorkStationDto.cs

@@ -0,0 +1,109 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.base_.Dto
+{
+    /// <summary>
+    /// 工位查询对象
+    /// </summary>
+    public class BaseWorkStationQueryDto : PagerInfo 
+    {
+        public string WorkStationDescription { get; set; }
+        public int? Status { get; set; }
+
+    }
+
+    public class BaseWorkStationQueryDto2 : PagerInfo
+    {
+       public  int route_id { get; set; }
+
+    }
+
+    /// <summary>
+    /// 工位输入输出对象
+    /// </summary>
+    public class BaseWorkStationDto
+    {
+        [Required(ErrorMessage = "主键不能为空")]
+        public int Id { get; set; }
+
+        public int? FkWorkProcesses { get; set; }
+
+        public string DictWorkType { get; set; }
+
+        public string WorkStationDescription { get; set; }
+
+        public List<BaseDevice>  BindedDeviceArray { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+
+    public class BaseWorkStationDto3
+    {
+        /// <summary>
+        /// 1  被选中  0 未选中
+        /// </summary>
+        public int flag { get; set; }
+       
+        public int Id { get; set; }
+
+        public int? FkWorkProcesses { get; set; }
+
+        public string DictWorkType { get; set; }
+
+        public string WorkStationDescription { get; set; }
+
+      
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+
+
+
+    }
+    /// <summary>
+    /// 添加工位和修改工位使用
+    /// </summary>
+    public class BaseWorkStationDto2
+    {
+        [Required(ErrorMessage = "主键不能为空")]
+        public int Id { get; set; }
+
+        public int? FkWorkProcesses { get; set; }
+
+        public string DictWorkType { get; set; }
+
+        public string WorkStationDescription { get; set; }
+
+        public int[] BindedDeviceArray { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

DOAN.Model/MES/Base/Dto/RouteANDprocess.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.MES.base_.Dto
+{
+    /// <summary>
+    /// 工艺路线与工序父子表
+    /// </summary>
+    public class RouteANDprocess
+    {
+        /// <summary>
+        /// 工艺路线id
+        /// </summary>
+        public int parentId { get; set; }
+        /// <summary>
+        /// 工序id
+        /// </summary>
+        public int   Id { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+
+    }
+}