工序工位存入bas_process_station

BasicData/Tnb.BasicData.Entitys/Dto/BasProcess/ProcessStationInput.cs

@@ -0,0 +1,15 @@
+namespace Tnb.BasicData.Entities.Dto
+{
+    public class ProcessStationInput
+    {
+        /// <summary>
+        /// 工序id
+        /// </summary>
+        public string process_id { get; set; }
+        
+        /// <summary>
+        /// 工位id集合
+        /// </summary>
+        public List<string> stationIds { get; set; }
+    }
+}

BasicData/Tnb.BasicData.Entitys/Entity/BasMaterialUnit.cs

@@ -7,100 +7,38 @@ namespace Tnb.BasicData.Entities
     ///物料单位
     ///</summary>
     [SugarTable("bas_material_unit")]
-    public  class BasMaterialUnit : BaseEntity<string>
+    public class BasMaterialUnit : BaseEntity<string>
     {
-       public BasMaterialUnit(){
+        public BasMaterialUnit()
+        {
+        }
 
+        /// <summary>
+        /// Desc:辅助单位
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string auxiliary_unit_id { get; set; }
 
-       }
+        /// <summary>
+        /// Desc:关联物料id
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string material_id { get; set; }
 
-       /// <summary>
-       /// Desc:物料ID，BAS_MATERIAL.ID
-       /// Default:
-       /// Nullable:False
-       /// </summary>           
-       [SugarColumn(ColumnName="material_id")]
-       public string MaterialId {get;set;}
-
-       /// <summary>
-       /// Desc:单位ID,BAS_UNIT.ID
-       /// Default:
-       /// Nullable:False
-       /// </summary>           
-       [SugarColumn(ColumnName="unit_id")]
-       public string UnitId {get;set;}
-
-       /// <summary>
-       /// Desc:比例
-       /// Default:
-       /// Nullable:False
-       /// </summary>           
-       [SugarColumn(ColumnName="relation_qty")]
-       public decimal RelationQty {get;set;}
-
-       /// <summary>
-       /// Desc:创建时间
-       /// Default:
-       /// Nullable:False
-       /// </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:True
-       /// </summary>           
-       [SugarColumn(ColumnName="extras")]
-       public string Extras {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="bar_code")]
-       public string BarCode {get;set;}
-
-       /// <summary>
-       /// Desc:时间戳(用于并发控制)
-       /// Default:NULL::character varying
-       /// Nullable:True
-       /// </summary>           
-       [SugarColumn(ColumnName="timestamp")]
-       public string Timestamp {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>           
+        public string number_of_primary_unit { get; set; }
 
+        /// <summary>
+        /// Desc:辅助单位数量
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string number_of_auxiliary_unit { get; set; }
     }
 }

BasicData/Tnb.BasicData.Entitys/Entity/BasProcess.cs

@@ -0,0 +1,212 @@
+using SqlSugar;
+using Tnb.Common.Contracts;
+
+namespace Tnb.BasicData.Entities
+{
+    ///<summary>
+    ///工序资料
+    ///</summary>
+    [SugarTable("bas_process")]
+    public class BasProcess : BaseEntity<string>
+    {
+        public BasProcess()
+        {
+        }
+
+        /// <summary>
+        /// Desc:创建时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// Desc:修改时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? modify_time { get; set; }
+
+        /// <summary>
+        /// Desc:所属组织ID
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string org_id { get; set; }
+
+        /// <summary>
+        /// Desc:工序代码
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string process_code { get; set; }
+
+        /// <summary>
+        /// Desc:工序名称
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string process_name { get; set; }
+
+        /// <summary>
+        /// Desc:数据收集方式
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string process_collection { get; set; }
+
+        /// <summary>
+        /// Desc:工序类型
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string process_type { get; set; }
+
+        /// <summary>
+        /// Desc:工序属性
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string process_attribute { get; set; }
+
+        /// <summary>
+        /// Desc:必过工序
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string must_pass { get; set; }
+
+        /// <summary>
+        /// Desc:处理时间
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string process_time { get; set; }
+
+        /// <summary>
+        /// Desc:时间单位
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string time_unit { get; set; }
+
+        /// <summary>
+        /// Desc:备注
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string remark { get; set; }
+
+        /// <summary>
+        /// Desc:时间戳(用于并发控制)
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string timestamp { get; set; }
+
+        /// <summary>
+        /// Desc:创建用户
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string create_id { get; set; }
+
+        /// <summary>
+        /// Desc:修改用户
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string modify_id { get; set; }
+
+        /// <summary>
+        /// Desc:扩展字段
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string extras { get; set; }
+
+        /// <summary>
+        /// Desc:状态
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string status { get; set; }
+
+        /// <summary>
+        /// Desc:单次扫码
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string single_scan_type { get; set; }
+
+        /// <summary>
+        /// Desc:工位
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string station { get; set; }
+
+        /// <summary>
+        /// Desc:一码到底
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string only_scan_type { get; set; }
+
+        /// <summary>
+        /// Desc:次品项列表
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string defective_items { get; set; }
+
+        /// <summary>
+        /// Desc:用料追溯关系
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string material_traced_back_relationship { get; set; }
+
+        /// <summary>
+        /// Desc:不合格品投产
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string defective_products_put_into_production { get; set; }
+
+        /// <summary>
+        /// Desc:报告模板
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string report_template { get; set; }
+
+        /// <summary>
+        /// Desc:生产描述
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string descrip { get; set; }
+
+        /// <summary>
+        /// Desc:附件
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string attachment { get; set; }
+
+        /// <summary>
+        /// Desc:扩展字段2
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string extras2 { get; set; }
+
+        /// <summary>
+        /// Desc:扩展字段3
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string extras3 { get; set; }
+    }
+}

BasicData/Tnb.BasicData.Entitys/Entity/BasProcessStation.cs

@@ -0,0 +1,109 @@
+using SqlSugar;
+using Tnb.Common.Contracts;
+
+
+namespace Tnb.BasicData.Entities
+{
+    ///<summary>
+    ///工序与工位的关联信息
+    ///</summary>
+    [SugarTable("bas_process_station")]
+    public class BasProcessStation : BaseEntity<string>
+    {
+        public BasProcessStation()
+        {
+        }
+
+        /// <summary>
+        /// Desc:主键
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [SugarColumn(IsPrimaryKey = true)]
+        public string id { get; set; }
+
+        /// <summary>
+        /// Desc:工序ID，BAS_PROCESS.ID
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string process_id { get; set; }
+
+        // /// <summary>
+        // /// Desc:工序代码
+        // /// Default:
+        // /// Nullable:False
+        // /// </summary>           
+        // public string process_code { get; set; }
+
+        /// <summary>
+        /// Desc:工位ID，BAS_STATION.ID
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string station_id { get; set; }
+
+        // /// <summary>
+        // /// Desc:工位代码
+        // /// Default:
+        // /// Nullable:False
+        // /// </summary>           
+        // public string station_code { get; set; }
+
+        /// <summary>
+        /// Desc:创建时间
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public DateTime create_time { get; set; }
+
+        /// <summary>
+        /// Desc:修改时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? modify_time { get; set; }
+
+        /// <summary>
+        /// Desc:扩展字段
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string extras { get; set; }
+
+        /// <summary>
+        /// Desc:所属组织ID
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string org_id { get; set; }
+
+        /// <summary>
+        /// Desc:备注
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string remark { get; set; }
+
+        /// <summary>
+        /// Desc:时间戳(用于并发控制)
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string timestamp { get; set; }
+
+        /// <summary>
+        /// Desc:创建用户
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string create_id { get; set; }
+
+        /// <summary>
+        /// Desc:修改用户
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string modify_id { get; set; }
+    }
+}