组织管理代码调整

Tnb.ProductionPlanMgr.Entitys/Class1.cs

@@ -1,7 +0,0 @@
-namespace Tnb.ProductionPlanMgr.Entitys
-{
-    public class Class1
-    {
-
-    }
-}

Tnb.ProductionPlanMgr.Entitys/Dto/WorkOrder/ProductionSchedulingCrInput.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.ProductionMgr.Entitys.Dto.WorkOrder
+{
+    /// <summary>
+    /// 生产工单排产输入参数
+    /// </summary>
+    public class ProductionSchedulingCrInput
+    {
+        /// <summary>
+        /// 生产任务主键Id
+        /// </summary>
+        public string? Id { get; set; }
+        /// <summary>
+        /// 工单类型 1、注塑/挤出 2、组装/包装
+        /// </summary>
+        public int MoType { get; set; }
+        /// <summary>
+        /// 工单Id
+        /// </summary>
+        public int MoId { get; set; }
+        /// <summary>
+        /// 产品编号
+        /// </summary>
+        public string ItemId { get; set; }
+        /// <summary>
+        /// 产品名称    
+        /// </summary>
+        public string ItemName { get; set; }
+
+        #region 注塑工单
+        /// <summary>
+        /// 模具Id
+        /// </summary>
+        public string MoldId { get; set; }
+        /// <summary>
+        /// 模具名称
+        /// </summary>
+        public string MoldName { get; set; }
+        /// <summary>
+        /// 设备Id
+        /// </summary>
+        public string EqpId { get; set; }
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        public string EqpName { get; set; }
+        #endregion
+
+        #region 组装包装工单
+        /// <summary>
+        /// 产线编号
+        /// </summary>
+        public string LineId { get; set; }
+        /// <summary>
+        /// 产线名称
+        /// </summary>
+        public string LineName { get; set; } 
+        #endregion
+
+
+    }
+    
+}

Tnb.ProductionPlanMgr.Entitys/Entity/MoldsEntity.cs

@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+using Tnb.Common.Contracts;
+
+namespace Tnb.ProductionMgr.Entitys.Entity
+{
+    /// <summary>
+    /// 模具信息表
+    ///</summary>
+    [SugarTable("tool_molds")]
+    public class MoldsEntity : BaseEntity<string>
+    {
+        ///// <summary>
+        ///// 主键 
+        /////</summary>
+        // [SugarColumn(ColumnName="id" ,IsPrimaryKey = true   )]
+        // public string Id { get; set; }
+        /// <summary>
+        /// 磨具编号 
+        /// 默认值: NULL::character varying
+        ///</summary>
+        [SugarColumn(ColumnName = "mold_code")]
+        public string MoldCode { get; set; }
+        /// <summary>
+        /// 磨具名称 
+        /// 默认值: NULL::character varying
+        ///</summary>
+        [SugarColumn(ColumnName = "mold_name")]
+        public string MoldName { get; set; }
+        /// <summary>
+        /// 产品代码 
+        /// 默认值: NULL::character varying
+        ///</summary>
+        [SugarColumn(ColumnName = "item_id")]
+        public string ItemId { get; set; }
+        /// <summary>
+        /// 设备Id 
+        /// 默认值: NULL::character varying
+        ///</summary>
+        [SugarColumn(ColumnName = "eqp_id")]
+        public string EqpId { get; set; }
+        /// <summary>
+        /// 设备代码 
+        /// 默认值: NULL::character varying
+        ///</summary>
+        [SugarColumn(ColumnName = "eqp_code")]
+        public string EqpCode { get; set; }
+        /// <summary>
+        /// 生产模数 
+        ///</summary>
+        [SugarColumn(ColumnName = "production_modulus")]
+        public int? ProductionModulus { get; set; }
+        /// <summary>
+        /// 保养模次 
+        ///</summary>
+        [SugarColumn(ColumnName = "maintain_num")]
+        public int? MaintainNum { get; set; }
+        /// <summary>
+        /// 磨具使用状态 
+        /// 默认值: NULL::character varying
+        ///</summary>
+        [SugarColumn(ColumnName = "mold_status")]
+        public string MoldStatus { get; set; }
+        /// <summary>
+        /// 日定额 
+        ///</summary>
+        [SugarColumn(ColumnName = "daily_rate")]
+        public decimal? DailyRate { get; set; }
+        /// <summary>
+        /// 工时定额（H/PCS） 
+        ///</summary>
+        [SugarColumn(ColumnName = "hour_norm")]
+        public decimal? HourNorm { get; set; }
+        /// <summary>
+        /// 成长周期 
+        ///</summary>
+        [SugarColumn(ColumnName = "growth_cycle")]
+        public int? GrowthCycle { get; set; }
+        /// <summary>
+        /// 型腔数 
+        ///</summary>
+        [SugarColumn(ColumnName = "cavity_num")]
+        public int? CavityNum { get; set; }
+        /// <summary>
+        /// 模具寿命 
+        ///</summary>
+        [SugarColumn(ColumnName = "mold_life")]
+        public int? MoldLife { get; set; }
+        /// <summary>
+        /// 模具剩余寿命 
+        /// 默认值: NULL::character varying
+        ///</summary>
+        [SugarColumn(ColumnName = "mold_remaining_life")]
+        public string MoldRemainingLife { get; set; }
+        /// <summary>
+        /// 库房编号 
+        /// 默认值: NULL::character varying
+        ///</summary>
+        [SugarColumn(ColumnName = "warehosue_id")]
+        public string WarehosueId { get; set; }
+        /// <summary>
+        /// 库位编号 
+        /// 默认值: NULL::character varying
+        ///</summary>
+        [SugarColumn(ColumnName = "location_id")]
+        public string LocationId { get; set; }
+        /// <summary>
+        /// 备注 
+        ///</summary>
+        [SugarColumn(ColumnName = "remark")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 创建用户 
+        /// 默认值: NULL::character varying
+        ///</summary>
+        [SugarColumn(ColumnName = "create_id")]
+        public string CreateId { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+        [SugarColumn(ColumnName = "create_time")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改用户 
+        /// 默认值: NULL::character varying
+        ///</summary>
+        [SugarColumn(ColumnName = "modify_id")]
+        public string ModifyId { get; set; }
+        /// <summary>
+        /// 修改时间 
+        ///</summary>
+        [SugarColumn(ColumnName = "modify_time")]
+        public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 扩展字段 
+        ///</summary>
+        [SugarColumn(ColumnName = "extras")]
+        public string Extras { get; set; }
+    }
+}

Tnb.ProductionPlanMgr.Entitys/Entity/PrdMoEntity.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using SqlSugar;
 using Tnb.Common.Contracts;
 
-namespace Tnb.ProductionPlanMgr.Entitys.Entity
+namespace Tnb.ProductionMgr.Entitys.Entity
 {
     /// <summary>
     /// MES生产工单

Tnb.ProductionPlanMgr.Entitys/Entity/PrdTask.cs

@@ -0,0 +1,203 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace Tnb.ProductionMgr.Entitys.Entity
+{
+    ///<summary>
+    ///生产任务信息
+    ///</summary>
+    [SugarTable("prd_task")]
+    public partial class PrdTask
+    {
+           public PrdTask(){
+
+
+           }
+           /// <summary>
+           /// Desc:主键
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true,ColumnName="id")]
+           public string Id {get;set;}
+
+           /// <summary>
+           /// Desc:工单类型 1、注塑/挤出工单 2、组装/包装工单
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="mo_type")]
+           public int? MoType {get;set;}
+
+           /// <summary>
+           /// Desc:计划开始时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="plan_start_date")]
+           public DateTime? PlanStartDate {get;set;}
+
+           /// <summary>
+           /// Desc:计划结束时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="plan_end_date")]
+           public DateTime? PlanEndDate {get;set;}
+
+           /// <summary>
+           /// Desc:预计开始时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="estimated_start_date")]
+           public DateTime? EstimatedStartDate {get;set;}
+
+           /// <summary>
+           /// Desc:预计结束时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="estimated_end_date")]
+           public DateTime? EstimatedEndDate {get;set;}
+
+           /// <summary>
+           /// Desc:实际开工时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="start_date")]
+           public DateTime? StartDate {get;set;}
+
+           /// <summary>
+           /// Desc:实际完工时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="end_date")]
+           public DateTime? EndDate {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:True
+           /// </summary>           
+           [SugarColumn(ColumnName="extras")]
+           public string Extras {get;set;}
+
+           /// <summary>
+           /// Desc:工单Id
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="mo_id")]
+           public string MoId {get;set;}
+
+           /// <summary>
+           /// Desc:工单代码
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="mo_code")]
+           public string MoCode {get;set;}
+
+           /// <summary>
+           /// Desc:模具Id
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="mold_id")]
+           public string MoldId {get;set;}
+
+           /// <summary>
+           /// Desc:模具名称
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="mold_name")]
+           public string MoldName {get;set;}
+
+           /// <summary>
+           /// Desc:设备Id
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="eqp_id")]
+           public string EqpId {get;set;}
+
+           /// <summary>
+           /// Desc:设备名称
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="eqp_name")]
+           public string EqpName {get;set;}
+
+           /// <summary>
+           /// Desc:产线编号
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="line_id")]
+           public string LineId {get;set;}
+
+           /// <summary>
+           /// Desc:产线名称
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="line_name")]
+           public string LineName {get;set;}
+
+           /// <summary>
+           /// Desc:产品Id
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="item_id")]
+           public string ItemId {get;set;}
+
+           /// <summary>
+           /// Desc:产品名称
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="item_name")]
+           public string ItemName {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;}
+
+    }
+}

Tnb.ProductionPlanMgr.Entitys/Mapper/Mapper.cs

@@ -0,0 +1,14 @@
+using Mapster;
+using Tnb.ProductionMgr.Entitys.Dto.WorkOrder;
+using Tnb.ProductionMgr.Entitys.Entity;
+
+namespace Tnb.ProductionMgr.Entitys.Mapper
+{
+    public class Mapper : IRegister
+    {
+        public void Register(TypeAdapterConfig config)
+        {
+            config.ForType<ProductionSchedulingCrInput, PrdTask>();
+        }
+    }
+}