生产管理新增，同组工单下发，取消同组工单

ProductionMgr/Tnb.ProductionMgr.Entitys/Consts/DictionaryConstants.cs

@@ -12,8 +12,11 @@ namespace Tnb.ProductionMgr.Entitys.新文件夹
         /// 生产任务状态TypeId
         /// </summary>
         public const string PrdTaskStatusTypeId = "25572555259157";
+        /// <summary>
+        /// 工单状态 已下发字典Id
+        /// </summary>
+        public const string IssueId = "25019232867093";
 
-        
     }
     /// <summary>
     /// 工单状态
@@ -29,4 +32,6 @@ namespace Tnb.ProductionMgr.Entitys.新文件夹
         /// </summary>
         public const string WaitProductId = "25019244276501";
     }
+
+    
 }

ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tnb.ProductionMgr.Entitys.Entity;
+
+namespace Tnb.ProductionMgr.Entitys.Dto.PrdManage
+{
+    /// <summary>
+    /// 设备列表输出参数
+    /// </summary>
+    public class EquipmentListOutput : EqpEquipment
+    {
+        /// <summary>
+        /// 任务单数量
+        /// </summary>
+        public int task_list_qty { get; set; }
+        /// <summary>
+        /// 吨位
+        /// </summary>
+        public double tonnage { get; set; }
+        /// <summary>
+        /// 最早开始时间 
+        /// </summary>
+        public DateTime? first_date { get; set; }
+
+
+
+    }
+}

ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/EqpEquipment.cs

@@ -0,0 +1,223 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace Tnb.ProductionMgr.Entitys.Entity
+{
+    ///<summary>
+    ///设备登记
+    ///</summary>
+    [SugarTable("eqp_equipment")]
+    public partial class EqpEquipment
+    {
+           public EqpEquipment(){
+
+
+           }
+           /// <summary>
+           /// Desc:自增ID
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public string id {get;set;}
+
+           /// <summary>
+           /// Desc:设备代码
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string eqp_code {get;set;}
+
+           /// <summary>
+           /// Desc:设备名称
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string eqp_name {get;set;}
+
+           /// <summary>
+           /// Desc:设备类型代码
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string eqp_type_code {get;set;}
+
+           /// <summary>
+           /// Desc:验收状态（合格：Qualified/不合格：Unqualified）
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string accept_status {get;set;}
+
+           /// <summary>
+           /// Desc:使用部门代码
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string use_department_code {get;set;}
+
+           /// <summary>
+           /// Desc:安装日期
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string install_date {get;set;}
+
+           /// <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:扩展字段
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string extras {get;set;}
+
+           /// <summary>
+           /// Desc:模具Id
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string mold_id {get;set;}
+
+           /// <summary>
+           /// Desc:所属组织ID
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string org_id {get;set;}
+
+           /// <summary>
+           /// Desc:设备类型ID，EQP_EQUIPMENTTYPE.ID
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string eqp_type_id {get;set;}
+
+           /// <summary>
+           /// Desc:设备生产日期
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string product_date {get;set;}
+
+           /// <summary>
+           /// Desc:设备生产厂家
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string supplier_code {get;set;}
+
+           /// <summary>
+           /// Desc:正式使用日期
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string use_date {get;set;}
+
+           /// <summary>
+           /// Desc:验收日期
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string accept_date {get;set;}
+
+           /// <summary>
+           /// Desc:管理部门
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string manage_department_code {get;set;}
+
+           /// <summary>
+           /// Desc:工段（车间）代码
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string segment_code {get;set;}
+
+           /// <summary>
+           /// Desc:工位代码
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string station_code {get;set;}
+
+           /// <summary>
+           /// Desc:质检代码，良率计算
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string quality_station_code {get;set;}
+
+           /// <summary>
+           /// Desc:生产节拍
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string process_time {get;set;}
+
+           /// <summary>
+           /// Desc:时间单位： 秒：s 分钟：m 小时：h
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string time_unit {get;set;}
+
+           /// <summary>
+           /// Desc:设备当前状态，状态代码
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string current_status {get;set;}
+
+           /// <summary>
+           /// Desc:技术性能
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string techno_logy {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;}
+
+    }
+}

ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdMo.cs

@@ -30,10 +30,13 @@ namespace Tnb.ProductionMgr.Entitys.Entity
         /// Nullable:False
         /// </summary>           
         public string mo_code { get; set; }
+
         /// <summary>
         /// 产品ID
         /// </summary>
-        //public string item_id { get; set; }
+        public string item_id { get; set; }
+
+
 
         /// <summary>
         /// Desc:产品代码， BAS_MATERIA.MATERIALCODE BAS_ITEM.ITEMCODE
@@ -320,7 +323,7 @@ namespace Tnb.ProductionMgr.Entitys.Entity
         /// Default:NULL::character varying
         /// Nullable:True
         /// </summary>           
-        public string mo_group_no { get; set; }
+        public string mo_task_no { get; set; }
 
     }
 }

ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdTask.cs

@@ -120,7 +120,7 @@ namespace Tnb.ProductionMgr.Entitys.Entity
         /// Default:
         /// Nullable:True
         /// </summary>           
-        public decimal? tonnage { get; set; }
+        public double tonnage { get; set; }
 
         /// <summary>
         /// Desc:已排产数