修改ebom相关名称

BasicData/Tnb.BasicData.Entitys/Dto/ParentMaterial/EbomTreeOutput.cs

@@ -0,0 +1,84 @@
+namespace Tnb.BasicData.Entitys.Dto
+{
+    public class EbomTreeOutput
+    {
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string material_id { get; set; }
+        /// <summary>
+        /// 规格描述
+        /// </summary>
+        public string material_id_extras { get; set; }
+        /// <summary>
+        /// 物料id
+        /// </summary>
+        public string material_id_id { get; set; }
+        /// <summary>
+        /// 最小包装
+        /// </summary>
+        public decimal? material_id_minpacking { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string material_id_remark { get; set; }
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public string material_id_unitid { get; set; }
+        /// <summary>
+        /// 是否有下级
+        /// </summary>
+        public bool hasChildren { get; set; }
+        
+        /// <summary>
+        /// Desc:投料管控
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string feeding_control {get;set;}
+        
+        /// <summary>
+        /// Desc:损耗率
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string loss_rate {get;set;}
+        
+        /// <summary>
+        /// Desc:数量
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string quantity {get;set;}
+        
+        /// <summary>
+        /// Desc:需要称量
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string require_weight {get;set;}
+        
+        /// <summary>
+        /// Desc:替代物料
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string substitute_material {get;set;}
+        
+        /// <summary>
+        /// Desc:工艺路线
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string routing {get;set;}
+        
+        /// <summary>
+        /// Desc:版本号
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string version {get;set;}
+        
+    }
+}

BasicData/Tnb.BasicData.Entitys/Dto/ParentMaterial/EbomTreeQueryInput.cs

@@ -1,11 +1,11 @@
 namespace Tnb.BasicData.Entitys.Dto
 {
-    public class ParentMaterialTreeQueryInput
+    public class EbomTreeQueryInput
     {
         /// <summary>
         /// 物料清单id
         /// </summary>
-        public string parentMaterialId { get; set; }
+        public string ebomId { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>

BasicData/Tnb.BasicData.Entitys/Dto/ParentMaterial/ParentMaterialTreeOutput.cs

@@ -1,37 +0,0 @@
-namespace Tnb.BasicData.Entitys.Dto
-{
-    public class ParentMaterialTreeOutput
-    {
-        /// <summary>
-        /// 物料名称
-        /// </summary>
-        public string material_id { get; set; }
-        /// <summary>
-        /// 规格描述
-        /// </summary>
-        public string material_id_extras { get; set; }
-        /// <summary>
-        /// 物料id
-        /// </summary>
-        public string material_id_id { get; set; }
-        /// <summary>
-        /// 最小包装
-        /// </summary>
-        public decimal? material_id_minpacking { get; set; }
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string material_id_remark { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public string material_id_unitid { get; set; }
-        /// <summary>
-        /// 是否有下级
-        /// </summary>
-        public bool hasChildren { get; set; }
-        
-        
-        
-    }
-}

BasicData/Tnb.BasicData.Entitys/Entity/BasEbomD.cs

@@ -6,10 +6,10 @@ namespace Tnb.BasicData.Entitys.Entity
     ///<summary>
     ///物料清单子表
     ///</summary>
-    [SugarTable("bas_parent_material_items")]
-    public class BasParentMaterialItems : BaseEntity<string>
+    [SugarTable("bas_ebom_d")]
+    public class BasEbomD : BaseEntity<string>
     {
-       public BasParentMaterialItems(){
+       public BasEbomD(){
 
 
        }
@@ -34,8 +34,8 @@ namespace Tnb.BasicData.Entitys.Entity
        /// Default:NULL::character varying
        /// Nullable:True
        /// </summary>           
-       [SugarColumn(ColumnName="parent_material_id")]
-       public string ParentMaterialId {get;set;}
+       [SugarColumn(ColumnName="ebom_id")]
+       public string EbomId {get;set;}
 
        /// <summary>
        /// Desc:物料编号/名称

BasicData/Tnb.BasicData.Entitys/Entity/BasEbomH.cs

@@ -6,10 +6,10 @@ namespace Tnb.BasicData.Entitys.Entity
     ///<summary>
     ///物料清单父表
     ///</summary>
-    [SugarTable("bas_parent_material")]
-    public  class BasParentMaterial : BaseEntity<string>
+    [SugarTable("bas_ebom_h")]
+    public  class BasEbomH : BaseEntity<string>
     {
-       public BasParentMaterial(){
+       public BasEbomH(){
 
 
        }

BasicData/Tnb.BasicData.Entitys/Entity/BasRoute.cs

@@ -7,82 +7,119 @@ using Tnb.Common.Contracts;
 
 namespace Tnb.BasicData.Entitys.Entity
 {
-    /// <summary>
-    /// 工艺路线资料
+    ///<summary>
+    ///工艺路线
     ///</summary>
     [SugarTable("bas_route")]
     public class BasRoute : BaseEntity<string>
     {
-        /// <summary>
-        /// 工艺路线代码 
-        ///</summary>
-        [SugarColumn(ColumnName = "route_code")]
-        public string RouteCode { get; set; }
-        /// <summary>
-        /// 工艺路线名称 
-        ///</summary>
-        [SugarColumn(ColumnName = "route_name")]
-        public string RouteName { get; set; }
-        /// <summary>
-        /// 工艺路线版本 
-        ///</summary>
-        [SugarColumn(ColumnName = "version")]
-        public string Version { get; set; }
-        /// <summary>
-        /// 工艺路线类型： 标准途程：Standard 返工途程：Rework 试制途程：Trial 返修途程：RMA 
-        ///</summary>
-        [SugarColumn(ColumnName = "route_type")]
-        public string RouteType { get; set; }
-        /// <summary>
-        /// 创建时间 
-        ///</summary>
-        [SugarColumn(ColumnName = "create_time")]
-        public DateTime CreateTime { get; set; }
-        /// <summary>
-        /// 修改时间 
-        ///</summary>
-        [SugarColumn(ColumnName = "modify_time")]
-        public DateTime? ModifyTime { get; set; }
-        /// <summary>
-        /// 扩展字段 
-        ///</summary>
-        [SugarColumn(ColumnName = "extras")]
-        public string? Extras { get; set; }
-        /// <summary>
-        /// 租户ID 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "tenant_id")]
-        public string? TenantId { get; set; }
-        /// <summary>
-        /// 所属组织ID 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "org_id")]
-        public string? OrgId { get; set; }
-        /// <summary>
-        /// 备注 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "remark")]
-        public string? Remark { get; set; }
-        /// <summary>
-        /// 时间戳(用于并发控制) 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "timestamp")]
-        public string? Timestamp { get; set; }
-        /// <summary>
-        /// 创建用户 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "create_id")]
-        public string? CreateId { get; set; }
-        /// <summary>
-        /// 修改用户 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "modify_id")]
-        public string? ModifyId { get; set; }
+       public BasRoute(){
+
+
+       }
+       /// <summary>
+       /// Desc:主键
+       /// Default:
+       /// Nullable:False
+       /// </summary>           
+       [SugarColumn(IsPrimaryKey=true,ColumnName="id")]
+       public string Id {get;set;}
+
+       /// <summary>
+       /// Desc:编号
+       /// Default:
+       /// Nullable:False
+       /// </summary>           
+       [SugarColumn(ColumnName="code")]
+       public string Code {get;set;}
+
+       /// <summary>
+       /// Desc:名称
+       /// Default:
+       /// Nullable:False
+       /// </summary>           
+       [SugarColumn(ColumnName="name")]
+       public string Name {get;set;}
+
+       /// <summary>
+       /// Desc:有效开始时间
+       /// Default:
+       /// Nullable:True
+       /// </summary>           
+       [SugarColumn(ColumnName="start_time")]
+       public DateTime? StartTime {get;set;}
+
+       /// <summary>
+       /// Desc:有效结束时间
+       /// Default:
+       /// Nullable:True
+       /// </summary>           
+       [SugarColumn(ColumnName="end_time")]
+       public DateTime? EndTime {get;set;}
+
+       /// <summary>
+       /// Desc:0 未发布 1 已发布
+       /// Default:
+       /// Nullable:False
+       /// </summary>           
+       [SugarColumn(ColumnName="status")]
+       public string Status {get;set;}
+
+       /// <summary>
+       /// Desc:创建时间
+       /// Default:
+       /// Nullable:True
+       /// </summary>           
+       [SugarColumn(ColumnName="create_time")]
+       public DateTime? CreateTime {get;set;}
+
+       /// <summary>
+       /// Desc:修改时间
+       /// Default:
+       /// Nullable:True
+       /// </summary>           
+       [SugarColumn(ColumnName="modify_time")]
+       public DateTime? ModifyTime {get;set;}
+
+       /// <summary>
+       /// Desc:是否永远有效
+       /// Default:
+       /// Nullable:False
+       /// </summary>           
+       [SugarColumn(ColumnName="is_always_valid")]
+       public int IsAlwaysValid {get;set;}
+
+       /// <summary>
+       /// Desc:所属组织ID
+       /// Default:NULL::character varying
+       /// Nullable:True
+       /// </summary>           
+       [SugarColumn(ColumnName="org_id")]
+       public string OrgId {get;set;}
+
+       /// <summary>
+       /// Desc:创建用户
+       /// Default:NULL::character varying
+       /// Nullable:True
+       /// </summary>           
+       [SugarColumn(ColumnName="create_id")]
+       public string CreateId {get;set;}
+
+       /// <summary>
+       /// Desc:修改用户
+       /// Default:NULL::character varying
+       /// Nullable:True
+       /// </summary>           
+       [SugarColumn(ColumnName="modify_id")]
+       public string ModifyId {get;set;}
+
+       /// <summary>
+       /// Desc:备注
+       /// Default:NULL::character varying
+       /// Nullable:True
+       /// </summary>           
+       [SugarColumn(ColumnName="remark")]
+       public string Remark {get;set;}
+
     }
 }