品质模块

QcMgr/Tnb.QcMgr.Entities/Dto/CheckItems.cs

@@ -8,18 +8,23 @@ namespace Tnb.QcMgr.Entities.Dto
 {
     public class CheckItemsInput
     {
+        public string id { get; set; }
         public string name { get; set; }
         public string status { get; set; }
-        public List<CheckType> checktypoes { get; set; }
+        public List<CheckTypeInput> checktypes { get; set; }
     }
-    public class CheckType 
+    public class CheckTypeInput
     {
         public string id { get; set; }
-        public List<Item> items { get; set; }
+        public List<ItemInput> items { get; set; }
     }
-    public class Item
+    public class ItemInput
     {
         public string itemid { get; set; }
+        public string code { get; set; }
+        public string name { get; set; }
+        public string itemdid { get; set; }
+
         public string extype { get; set; }
         public string excontent { get; set; }
         public string check { get; set; }
@@ -28,5 +33,56 @@ namespace Tnb.QcMgr.Entities.Dto
         public string remark { get; set; }
         public string attachment { get; set; }
         public string isexec { get; set; }
+        public string customer { get; set; }
+    }
+    public class CheckItemsOut
+    {
+        public string id { get; set; }
+        public string name { get; set; }
+        public string status { get; set; }
+        public List<CheckTypeOut> checktypes { get; set; }
+    }
+    public class CheckTypeOut
+    {
+        public string checktypeid { get; set; }
+        public string checktypename { get; set; }
+        public List<ItemOut> items { get; set; }
+    }
+    public class ItemOut
+    {
+        public string itemid { get; set; }
+        public string code { get; set; }
+        public string name { get; set; }
+        public string itemdid { get; set; }
+        public Show setShow { get; set; }
+        public Data setData { get; set; }
+        
+    }
+    public class Show {
+        public bool extype { get; set; }
+        public bool excontent { get; set; }
+        public bool check { get; set; }
+        public bool errorcause { get; set; }
+        public bool errorlevel { get; set; }
+        public bool remark { get; set; }
+        public bool attachment { get; set; }
+        public bool customer { get; set; }
+        public bool isexec { get; set; }
+    }
+    public class Data {
+        public string extype { get; set; }
+        public string excontent { get; set; }
+        public string check { get; set; }
+        public string[] errorcause { get; set; }
+        public string errorlevel { get; set; }
+        public string remark { get; set; }
+        public string attachment { get; set; }
+        public string customer { get; set; }
+        public Isexec isexec { get; set; }
+    }
+    public class Isexec
+    {
+        public bool remark { get; set; }
+        public bool attachment { get; set; }
     }
 }

QcMgr/Tnb.QcMgr.Entities/Dto/CheckPlan.cs

@@ -3,31 +3,90 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tnb.QcMgr.Entities.Dto;
 
 namespace Tnb.QcMgr.Entities
 {
     public class CheckPlanInput
     {
-        public string name { get; set; }
-
-        public string status { get; set; }
-
-        public string checktype { get; set; }
-
-        public string numtype { get; set; }
-
-        public string pagetype { get; set; }
-
-        public string writerule { get; set; }
-
-        public string remind { get; set; }
-
-        public string attachment { get; set; }
-
-        public string isaddmul { get; set; }
-
+        public string mainid { get; set; }
+        public string addid { get; set; }
         public string triggertype { get; set; }
-
         public string content { get; set; }
+        public List<CheckPlanTypeInput> checktypes { get; set; }
+    }
+    public class CheckPlanTypeInput
+    {
+        public string id { get; set; }
+        public List<PlanItemInput> items { get; set; }
+    }
+    public class PlanItemInput
+    {
+        public string itemid { get; set; }
+        public string extype { get; set; }
+        public string excontent { get; set; }
+        public string check { get; set; }
+        public string errorcause { get; set; }
+        public string errorlevel { get; set; }
+        public string remark { get; set; }
+        public string attachment { get; set; }
+        public string isexec { get; set; }
+        public string customer { get; set; }
+    }
+
+    public class CheckPlansOut
+    {
+        public string id { get; set; }
+        public bool hasadd { get; set; }
+        public bool hasitem{ get; set; }
+        public string addid { get; set; }
+        public string triggertype { get; set; }
+        public string content { get; set; }
+        public List<CheckPlanTypeOut> checktypes { get; set; }
+    }
+    public class CheckPlanTypeOut
+    {
+        public string checktypeid { get; set; }
+        public string checktypename { get; set; }
+        public List<PlanItemOut> items { get; set; }
+    }
+    public class PlanItemOut
+    {
+        public string itemid { get; set; }
+        public string code { get; set; }
+        public string name { get; set; }
+        public string itemdid { get; set; }
+        public PlanItemShow setShow { get; set; }
+        public PlanItemData setData { get; set; }
+
+    }
+    public class PlanItemShow
+    {
+        public bool extype { get; set; }
+        public bool excontent { get; set; }
+        public bool check { get; set; }
+        public bool errorcause { get; set; }
+        public bool errorlevel { get; set; }
+        public bool remark { get; set; }
+        public bool attachment { get; set; }
+        public bool customer { get; set; }
+        public bool isexec { get; set; }
+    }
+    public class PlanItemData
+    {
+        public string extype { get; set; }
+        public string excontent { get; set; }
+        public string check { get; set; }
+        public string[] errorcause { get; set; }
+        public string errorlevel { get; set; }
+        public string remark { get; set; }
+        public string attachment { get; set; }
+        public string customer { get; set; }
+        public IsexecP isexec { get; set; }
+    }
+    public class IsexecP
+    {
+        public bool remark { get; set; }
+        public bool attachment { get; set; }
     }
 }

QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.QcMgr.Entities.Dto
+{
+    public class Trigger
+    {
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckItemsD.cs

@@ -60,7 +60,12 @@ namespace Tnb.QcMgr.Entities
         /// 执行时操作
         /// </summary>
         public string? isexec { get; set; }
-       
+
+        /// <summary>
+        /// 客户
+        /// </summary>
+        public string? custom { get; set; }
+
         /// <summary>
         /// 创建用户
         /// </summary>

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckPlanAdd.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities
+{
+    /// <summary>
+    /// 质检方案附加信息
+    /// </summary>
+    [SugarTable("qc_check_plan_add")]
+    public partial class QcCheckPlanAdd : BaseEntity<string>
+    {
+        public QcCheckPlanAdd()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+
+        /// <summary>
+        /// 触发类型
+        /// </summary>
+        public string? triggertype { get; set; }
+
+        /// <summary>
+        /// 触发内容
+        /// </summary>
+        public string? content { get; set; }
+
+        /// <summary>
+        /// 主表编号
+        /// </summary>
+        public string? mainid { get; set; }
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckPlanD.cs

@@ -7,10 +7,11 @@ using JNPF.Common.Contracts;
 using JNPF.Common.Security;
 using SqlSugar;
 
-namespace Tnb.QcMgr.Entities
+namespace Tnb.QcMgr.Entities.Entity
 {
+
     /// <summary>
-    /// 质检方案附加信息
+    /// 质检方案子表
     /// </summary>
     [SugarTable("qc_check_plan_d")]
     public partial class QcCheckPlanD : BaseEntity<string>
@@ -21,18 +22,84 @@ namespace Tnb.QcMgr.Entities
         }
 
         /// <summary>
-        /// 触发类型
-        /// </summary>
-        public string? triggertype { get; set; }
-
-        /// <summary>
-        /// 触发内容
-        /// </summary>
-        public string? content { get; set; }
-
-        /// <summary>
-        /// 主表编号
+        /// 质检方案主表编号
         /// </summary>
         public string? mainid { get; set; }
+        
+        /// <summary>
+        /// 执行项格式
+        /// </summary>
+        public string? extype { get; set; }
+
+        /// <summary>
+        /// 执行项内容
+        /// </summary>
+        public string? excontent { get; set; }
+
+        /// <summary>
+        /// 抽检类型
+        /// </summary>
+        public string? check { get; set; }
+
+        /// <summary>
+        /// 不良原因
+        /// </summary>
+        public string? errorcause { get; set; }
+
+        /// <summary>
+        /// 不良等级
+        /// </summary>
+        public string? errorlevel { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? remark { get; set; }
+
+        /// <summary>
+        /// 附件
+        /// </summary>
+        public string? attachment { get; set; }
+
+        /// <summary>
+        /// 执行时操作
+        /// </summary>
+        public string? isexec { get; set; }
+
+        /// <summary>
+        /// 客户
+        /// </summary>
+        public string? custom { get; set; }
+
+        /// <summary>
+        /// 质检项分类编号
+        /// </summary>
+        public string? typeid { get; set; }
+
+        /// <summary>
+        /// 质检项编号
+        /// </summary>
+        public string? itemid { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string? create_id { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// 修改用户
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+
     }
 }

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckPlanH.cs

@@ -9,8 +9,9 @@ using SqlSugar;
 
 namespace Tnb.QcMgr.Entities
 {
+
     /// <summary>
-    /// 质检方案主表
+    /// 质检方案
     /// </summary>
     [SugarTable("qc_check_plan_h")]
     public partial class QcCheckPlanH : BaseEntity<string>
@@ -19,6 +20,12 @@ namespace Tnb.QcMgr.Entities
         {
             id = SnowflakeIdHelper.NextId();
         }
+
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public string? code { get; set; }
+
         /// <summary>
         /// 名称
         /// </summary>
@@ -83,5 +90,8 @@ namespace Tnb.QcMgr.Entities
         /// 修改时间
         /// </summary>
         public DateTime? modify_time { get; set; }
+
+
+
     }
-}
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckPlanMaterial.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities
+{
+    /// <summary>
+    /// 质检方案物料关联表
+    /// </summary>
+    [SugarTable("qc_check_plan_material")]
+    public partial class QcCheckPlanMaterial : BaseEntity<string>
+    {
+        public QcCheckPlanMaterial()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        /// <summary>
+        /// 质检方案编号
+        /// </summary>
+        public string? planid { get; set; }
+
+        /// <summary>
+        /// 物料方案编号
+        /// </summary>
+        public string? materialid { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string? create_id { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// 修改用户
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string? extras { get; set; }
+
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckPlanProcess.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities
+{
+    /// <summary>
+    /// 质检方案工序关联表
+    /// </summary>
+    [SugarTable("qc_check_plan_process")]
+    public partial class QcCheckPlanProcess : BaseEntity<string>
+    {
+        public QcCheckPlanProcess()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        /// <summary>
+        /// 方案编号
+        /// </summary>
+        public string? planid { get; set; }
+
+        /// <summary>
+        /// 工序编号
+        /// </summary>
+        public string? processid { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string? create_id { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// 修改用户
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string? extras { get; set; }
+
+    }
+
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckPlanWork.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities.Entity
+{
+    /// <summary>
+    /// 质检方案工位关联表
+    /// </summary>
+    [SugarTable("qc_check_plan_work")]
+    public partial class QcCheckPlanWork : BaseEntity<string>
+    {
+        public QcCheckPlanWork()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        /// <summary>
+        /// 质检方案编号
+        /// </summary>
+        public string? planid { get; set; }
+
+        /// <summary>
+        /// 工位编号
+        /// </summary>
+        public string? workid { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string? create_id { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// 修改用户
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string? extras { get; set; }
+
+    }
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcTriggerEvent.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities
+{
+    /// <summary>
+    /// 触发事件
+    /// </summary>
+    [SugarTable("qc_trigger_event")]
+    public partial class QcTriggerEvent : BaseEntity<string>
+    {
+        public QcTriggerEvent()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string? name { get; set; }
+
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public string? code { get; set; }
+
+        /// <summary>
+        /// 分类
+        /// </summary>
+        public string? type { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string? create_id { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// 修改用户
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string? extras { get; set; }
+
+    }
+
+}

QcMgr/Tnb.QcMgr.Entities/Entity/QcTriggerPlan.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities
+{
+    /// <summary>
+    /// 触发计划
+    /// </summary>
+    [SugarTable("qc_trigger_plan")]
+    public partial class QcTriggerPlan : BaseEntity<string>
+    {
+        public QcTriggerPlan()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string? name { get; set; }
+
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public string? code { get; set; }
+
+        /// <summary>
+        /// 触发类型
+        /// </summary>
+        public string type { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 触发周期
+        /// </summary>
+        public string? cycle { get; set; }
+
+        /// <summary>
+        /// 触发事件
+        /// </summary>
+        public string? trievent { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string? create_id { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// 修改用户
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string? extras { get; set; }
+    }
+
+}