生产管理-生产工单排产代码调整

ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/BasItem.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace Tnb.ProductionMgr.Entitys.Entity
+{
+    ///<summary>
+    ///产品信息
+    ///</summary>
+    [SugarTable("bas_item")]
+    public partial class BasItem
+    {
+           public BasItem(){
+
+
+           }
+           /// <summary>
+           /// Desc:主键
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public string id {get;set;}
+
+           /// <summary>
+           /// Desc:产品代码
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string item_code {get;set;}
+
+           /// <summary>
+           /// Desc:产品分类ID
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string categoryid {get;set;}
+
+           /// <summary>
+           /// Desc:关联比例
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? relation_ratio {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:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string org_id {get;set;}
+
+           /// <summary>
+           /// Desc:产品名称
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string item_name {get;set;}
+
+           /// <summary>
+           /// Desc:产品规格型号
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string item_standard {get;set;}
+
+           /// <summary>
+           /// Desc:物料ID，BAS_MATERIAL.ID
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string material_id {get;set;}
+
+           /// <summary>
+           /// Desc:产品类型： 半成品：SemiManufacture 成品：FinishedProduct
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string item_type {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/Molds.cs

@@ -11,171 +11,176 @@ namespace Tnb.ProductionMgr.Entitys.Entity
     [SugarTable("tool_molds")]
     public partial class Molds
     {
-           public Molds(){
+        public Molds()
+        {
 
 
-           }
-           /// <summary>
-           /// Desc:主键
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           [SugarColumn(IsPrimaryKey=true)]
-           public string id {get;set;}
+        }
+        /// <summary>
+        /// Desc:主键
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [SugarColumn(IsPrimaryKey = true)]
+        public string id { get; set; }
 
-           /// <summary>
-           /// Desc:生产模数
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public int? production_modulus {get;set;}
+        /// <summary>
+        /// Desc:生产模数
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? production_modulus { get; set; }
 
-           /// <summary>
-           /// Desc:保养模次
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public int? maintain_num {get;set;}
+        /// <summary>
+        /// Desc:保养模次
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? maintain_num { get; set; }
 
-           /// <summary>
-           /// Desc:日定额
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public decimal? daily_rate {get;set;}
+        /// <summary>
+        /// Desc:日定额
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public decimal? daily_rate { get; set; }
 
-           /// <summary>
-           /// Desc:工时定额（H/PCS）
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public decimal? hour_norm {get;set;}
+        /// <summary>
+        /// Desc:工时定额（H/PCS）
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public decimal? hour_norm { get; set; }
 
-           /// <summary>
-           /// Desc:成长周期
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public int? growth_cycle {get;set;}
+        /// <summary>
+        /// Desc:成长周期
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? growth_cycle { get; set; }
 
-           /// <summary>
-           /// Desc:型腔数
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public int? cavity_num {get;set;}
+        /// <summary>
+        /// Desc:型腔数
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? cavity_num { get; set; }
 
-           /// <summary>
-           /// Desc:模具寿命
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public int? mold_life {get;set;}
+        /// <summary>
+        /// Desc:模具寿命
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? mold_life { get; set; }
 
-           /// <summary>
-           /// Desc:备注
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string remark {get;set;}
+        /// <summary>
+        /// Desc:备注
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string remark { get; set; }
 
-           /// <summary>
-           /// Desc:创建时间
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public DateTime? create_time {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 DateTime? modify_time { get; set; }
 
-           /// <summary>
-           /// Desc:扩展字段
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string extras {get;set;}
+        /// <summary>
+        /// Desc:扩展字段
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string extras { get; set; }
 
-           /// <summary>
-           /// Desc:模具编号
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string mold_code {get;set;}
+        /// <summary>
+        /// Desc:模具编号
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string mold_code { get; set; }
 
-           /// <summary>
-           /// Desc:模具名称
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string mold_name {get;set;}
+        /// <summary>
+        /// Desc:模具名称
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string mold_name { get; set; }
 
-           /// <summary>
-           /// Desc:产品Id
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string item_id {get;set;}
+        /// <summary>
+        /// Desc:产品Id
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string item_id { get; set; }
+        /// <summary>
+        /// 产品code 
+        /// </summary>
+        public string item_code { get; set; }
 
-           /// <summary>
-           /// Desc:设备Id
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string eqp_id {get;set;}
+        /// <summary>
+        /// Desc:设备Id
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string eqp_id { get; set; }
 
-           /// <summary>
-           /// Desc:设备代码
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string eqp_code {get;set;}
+        /// <summary>
+        /// Desc:设备代码
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string eqp_code { get; set; }
 
-           /// <summary>
-           /// Desc:磨具使用状态
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string mold_status {get;set;}
+        /// <summary>
+        /// Desc:磨具使用状态
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string mold_status { get; set; }
 
-           /// <summary>
-           /// Desc:模具剩余寿命
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string mold_remaining_life {get;set;}
+        /// <summary>
+        /// Desc:模具剩余寿命
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string mold_remaining_life { get; set; }
 
-           /// <summary>
-           /// Desc:库房编号
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string warehosue_id {get;set;}
+        /// <summary>
+        /// Desc:库房编号
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string warehosue_id { get; set; }
 
-           /// <summary>
-           /// Desc:库位编号
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string location_id {get;set;}
+        /// <summary>
+        /// Desc:库位编号
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string location_id { 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 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 modify_id { get; set; }
 
     }
 }

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

@@ -0,0 +1,326 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace Tnb.ProductionMgr.Entitys.Entity
+{
+    ///<summary>
+    ///MES生产工单
+    ///</summary>
+    [SugarTable("prd_mo")]
+    public partial class PrdMo
+    {
+        public PrdMo()
+        {
+
+
+        }
+        /// <summary>
+        /// Desc:Id
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [SugarColumn(IsPrimaryKey = true)]
+        public string id { get; set; }
+
+        /// <summary>
+        /// Desc:工单代码
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string mo_code { get; set; }
+        /// <summary>
+        /// 产品ID
+        /// </summary>
+        public string item_id { get; set; }
+
+        /// <summary>
+        /// Desc:产品代码， BAS_MATERIA.MATERIALCODE BAS_ITEM.ITEMCODE
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string item_code { get; set; }
+
+        /// <summary>
+        /// Desc:工单类型：1-正常工单、2-返工工单、3-试制工单
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string mo_type { get; set; }
+
+        /// <summary>
+        /// Desc:生产状态 Initial: 初始,  Confirm:确认 Release: 下发,  Open: 生产中,  Close: 关单,  Pending: 暂停
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string mo_status { get; set; }
+
+        /// <summary>
+        /// Desc:生产数量
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public decimal plan_qty { get; set; }
+
+        /// <summary>
+        /// Desc:已投入数量
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public decimal? input_qty { get; set; }
+
+        /// <summary>
+        /// Desc:已完工数量
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public decimal? complete_qty { get; set; }
+
+        /// <summary>
+        /// Desc:报废数量
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public decimal? scrap_qty { get; set; }
+
+        /// <summary>
+        /// Desc:计划开始时间
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public DateTime plan_start_date { get; set; }
+
+        /// <summary>
+        /// Desc:计划结束时间
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public DateTime plan_end_date { get; set; }
+
+        /// <summary>
+        /// Desc:实际开工日期
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? act_start_date { get; set; }
+
+        /// <summary>
+        /// Desc:实际完工日期
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? act_end_date { get; set; }
+
+        /// <summary>
+        /// Desc:订单行号
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? order_seq { get; set; }
+
+        /// <summary>
+        /// Desc:关联比例
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public decimal? relation_ratio { get; set; }
+
+        /// <summary>
+        /// Desc:下发日期
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? mo_down_date { get; set; }
+
+        /// <summary>
+        /// Desc:排程开始时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? seduling_start_date { get; set; }
+
+        /// <summary>
+        /// Desc:排程结束时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? seduling_end_date { get; set; }
+
+        /// <summary>
+        /// Desc:是否生派工单
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? is_create_dispatch { get; set; }
+
+        /// <summary>
+        /// Desc:子工单序号(1开始,最大+1,不强制连续)
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? seq { get; set; }
+
+        /// <summary>
+        /// Desc:租户ID
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string tenant_id { get; set; }
+
+        /// <summary>
+        /// Desc:ismerge
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? is_merge { 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:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string org_id { get; set; }
+
+        /// <summary>
+        /// Desc:产品附属信息
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string item_attribute { get; set; }
+
+        /// <summary>
+        /// Desc:生产部门ID
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string dept_id { get; set; }
+
+        /// <summary>
+        /// Desc:客户代码
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string customer_code { get; set; }
+
+        /// <summary>
+        /// Desc:订单号
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string order_no { get; set; }
+
+        /// <summary>
+        /// Desc:BOM版本
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string bom_version { get; set; }
+
+        /// <summary>
+        /// Desc:下发人员ID
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string mo_down_user_id { get; set; }
+
+        /// <summary>
+        /// Desc:下发人员名称
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string mo_down_user_name { 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 work_center_code { get; set; }
+
+        /// <summary>
+        /// Desc:主工单代码
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string parent_mo_code { get; set; }
+
+        /// <summary>
+        /// Desc:数据来源 10-计划,20-插入,30-导入
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string data_sources { get; set; }
+
+        /// <summary>
+        /// Desc:产线代码
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string production_linecode { get; set; }
+
+        /// <summary>
+        /// Desc:组合工单
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string combine_mo_code { get; set; }
+
+        /// <summary>
+        /// Desc:时间戳
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string time_stamp { 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 mo_group_no { get; set; }
+
+    }
+}

ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdMoEntity.cs

@@ -1,244 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using Tnb.Common.Contracts;
-
-namespace Tnb.ProductionMgr.Entitys.Entity
-{
-    /// <summary>
-    /// MES生产工单
-    ///</summary>
-    [SugarTable("prd_mo")]
-    public class PrdMoEntity : BaseEntity<string>
-    {
-        /// <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>
-        /// 工单代码 
-        ///</summary>
-        [SugarColumn(ColumnName = "mo_code")]
-        public string MoCode { get; set; }
-        /// <summary>
-        /// 产品Id
-        /// </summary>
-        [SugarColumn(ColumnName = "item_id")]
-        public string ItemId { get; set; }
-        /// <summary>
-        /// 产品代码， BAS_MATERIA.MATERIALCODE BAS_ITEM.ITEMCODE 
-        ///</summary>
-        [SugarColumn(ColumnName = "item_code")]
-        public string ItemCode { get; set; }
-        /// <summary>
-        /// 产品附属信息 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "item_attribute")]
-        public string ItemAttribute { get; set; }
-        /// <summary>
-        /// 工单类型：1-正常工单、2-返工工单、3-试制工单 
-        ///</summary>
-        [SugarColumn(ColumnName = "mo_type")]
-        public string MoType { get; set; }
-        /// <summary>
-        /// 生产状态 Initial: 初始,  Confirm:确认 Release: 下发,  Open: 生产中,  Close: 关单,  Pending: 暂停 
-        ///</summary>
-        [SugarColumn(ColumnName = "mo_status")]
-        public string MoStatus { get; set; }
-        /// <summary>
-        /// 生产数量 
-        ///</summary>
-        [SugarColumn(ColumnName = "plan_qty")]
-        public decimal PlanQty { get; set; }
-        /// <summary>
-        /// 已投入数量 
-        ///</summary>
-        [SugarColumn(ColumnName = "input_qty")]
-        public decimal? InputQty { get; set; }
-        /// <summary>
-        /// 已完工数量 
-        ///</summary>
-        [SugarColumn(ColumnName = "complete_qty")]
-        public decimal? CompleteQty { get; set; }
-        /// <summary>
-        /// 报废数量 
-        ///</summary>
-        [SugarColumn(ColumnName = "scrap_qty")]
-        public decimal? ScrapQty { get; set; }
-        /// <summary>
-        /// 计划开始时间 
-        ///</summary>
-        [SugarColumn(ColumnName = "plan_start_date")]
-        public DateTime PlanStartDate { get; set; }
-        /// <summary>
-        /// 计划结束时间 
-        ///</summary>
-        [SugarColumn(ColumnName = "plan_end_date")]
-        public DateTime PlanEndDate { get; set; }
-        /// <summary>
-        /// 实际开工日期 
-        ///</summary>
-        [SugarColumn(ColumnName = "act_start_date")]
-        public DateTime? ActStartDate { get; set; }
-        /// <summary>
-        /// 实际完工日期 
-        ///</summary>
-        [SugarColumn(ColumnName = "act_end_date")]
-        public DateTime? ActEndDate { get; set; }
-        /// <summary>
-        /// 生产部门ID 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "dept_id")]
-        public string DeptId { get; set; }
-        /// <summary>
-        /// 客户代码 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "customer_code")]
-        public string CustomerCode { get; set; }
-        /// <summary>
-        /// 订单号 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "order_no")]
-        public string OrderNo { get; set; }
-        /// <summary>
-        /// 订单行号 
-        ///</summary>
-        [SugarColumn(ColumnName = "order_seq")]
-        public int? OrderSeq { get; set; }
-        /// <summary>
-        /// BOM版本 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "bom_version")]
-        public string BomVersion { get; set; }
-        /// <summary>
-        /// 关联比例 
-        ///</summary>
-        [SugarColumn(ColumnName = "relation_ratio")]
-        public decimal? RelationRatio { get; set; }
-        /// <summary>
-        /// 下发人员ID 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "mo_down_user_id")]
-        public string MoDownUserId { get; set; }
-        /// <summary>
-        /// 下发人员名称 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "mo_down_user_name")]
-        public string MoDownUserName { get; set; }
-        /// <summary>
-        /// 下发日期 
-        ///</summary>
-        [SugarColumn(ColumnName = "mo_down_date")]
-        public DateTime? MoDownDate { get; set; }
-        /// <summary>
-        /// 备注 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "remark")]
-        public string Remark { get; set; }
-        /// <summary>
-        /// 工作中心代码 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "work_center_code")]
-        public string WorkCenterCode { get; set; }
-        /// <summary>
-        /// 主工单代码 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "parent_mo_code")]
-        public string ParentMoCode { get; set; }
-        /// <summary>
-        /// 排程开始时间 
-        ///</summary>
-        [SugarColumn(ColumnName = "seduling_start_date")]
-        public DateTime? SedulingStartDate { get; set; }
-        /// <summary>
-        /// 排程结束时间 
-        ///</summary>
-        [SugarColumn(ColumnName = "seduling_end_date")]
-        public DateTime? SedulingEndDate { get; set; }
-        /// <summary>
-        /// 是否生派工单 
-        ///</summary>
-        [SugarColumn(ColumnName = "is_create_dispatch")]
-        public int? IsCreateDispatch { get; set; }
-        /// <summary>
-        /// 子工单序号(1开始,最大+1,不强制连续) 
-        ///</summary>
-        [SugarColumn(ColumnName = "seq")]
-        public int? Seq { get; set; }
-        /// <summary>
-        /// 数据来源 10-计划,20-插入,30-导入 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "data_sources")]
-        public string DataSources { get; set; }
-        /// <summary>
-        /// 产线代码 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "production_linecode")]
-        public string ProductionLinecode { get; set; }
-        /// <summary>
-        /// ismerge 
-        ///</summary>
-        [SugarColumn(ColumnName = "is_merge")]
-        public int? IsMerge { get; set; }
-        /// <summary>
-        /// 组合工单 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "combine_mo_code")]
-        public string CombineMoCode { get; set; }
-        /// <summary>
-        /// 时间戳 
-        /// 默认值: NULL::character varying
-        ///</summary>
-        [SugarColumn(ColumnName = "time_stamp")]
-        public string TimeStamp { 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; }
-    }
-}

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

@@ -95,11 +95,39 @@ namespace Tnb.ProductionMgr.Entitys.Entity
         public string extras { get; set; }
 
         /// <summary>
-        /// Desc:生产任务单状态
+        /// Desc:模穴数
         /// Default:
         /// Nullable:True
         /// </summary>           
-        public string status { get; set; }
+        public int? mold_cavity_num { get; set; }
+
+        /// <summary>
+        /// Desc:计划生产数量
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? plan_num { get; set; }
+
+        /// <summary>
+        /// Desc:完成数量
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? comple_num { get; set; }
+
+        /// <summary>
+        /// Desc:吨位
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public decimal? tonnage { get; set; }
+
+        /// <summary>
+        /// Desc:已排产数
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? scheduled_num { get; set; }
 
         /// <summary>
         /// Desc:工单Id
@@ -108,13 +136,6 @@ namespace Tnb.ProductionMgr.Entitys.Entity
         /// </summary>           
         public string mo_id { get; set; }
 
-        /// <summary>
-        /// Desc:工单代码
-        /// Default:NULL::character varying
-        /// Nullable:True
-        /// </summary>           
-        public string mo_code { get; set; }
-
         /// <summary>
         /// Desc:模具Id
         /// Default:NULL::character varying
@@ -122,26 +143,16 @@ namespace Tnb.ProductionMgr.Entitys.Entity
         /// </summary>           
         public string mold_id { get; set; }
 
-        /// <summary>
-        /// Desc:模具名称
-        /// Default:NULL::character varying
-        /// Nullable:True
-        /// </summary>           
-        public string mold_name { get; set; }
-
         /// <summary>
         /// Desc:设备Id
         /// Default:NULL::character varying
         /// Nullable:True
         /// </summary>           
         public string eqp_id { get; set; }
-
         /// <summary>
-        /// Desc:设备名称
-        /// Default:NULL::character varying
-        /// Nullable:True
-        /// </summary>           
-        public string eqp_name { get; set; }
+        /// 设备型号 
+        /// </summary>
+        public string eqp_type_code { get; set; }
 
         /// <summary>
         /// Desc:产线编号
@@ -150,26 +161,20 @@ namespace Tnb.ProductionMgr.Entitys.Entity
         /// </summary>           
         public string line_id { get; set; }
 
-        /// <summary>
-        /// Desc:产线名称
-        /// Default:NULL::character varying
-        /// Nullable:True
-        /// </summary>           
-        public string line_name { get; set; }
-
         /// <summary>
         /// Desc:产品Id
         /// Default:NULL::character varying
         /// Nullable:True
         /// </summary>           
         public string item_id { get; set; }
-
         /// <summary>
-        /// Desc:产品名称
-        /// Default:NULL::character varying
-        /// Nullable:True
-        /// </summary>           
-        public string item_name { get; set; }
+        /// 产品编号
+        /// </summary>
+        public string item_code { get; set; }
+        /// <summary>
+        /// 产品规格型号
+        /// </summary>
+        public string item_standard { get; set; }
 
         /// <summary>
         /// Desc:创建用户
@@ -185,6 +190,13 @@ namespace Tnb.ProductionMgr.Entitys.Entity
         /// </summary>           
         public string modify_id { get; set; }
 
+        /// <summary>
+        /// Desc:生产任务单状态
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string status { get; set; }
+
         /// <summary>
         /// Desc:生产车间
         /// Default:NULL::character varying
@@ -193,29 +205,15 @@ namespace Tnb.ProductionMgr.Entitys.Entity
         public string workshop { get; set; }
 
         /// <summary>
-        /// Desc:模穴数
-        /// Default:
+        /// Desc:操作人姓名
+        /// Default:NULL::character varying
         /// Nullable:True
         /// </summary>           
-        public int? mold_cavity_num { get; set; }
-
+        public string operator_name { get; set; }
         /// <summary>
-        /// Desc:计划生产数量
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        public int? plan_num { get; set; }
-
-        /// <summary>
-        /// Desc:吨位
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        public decimal? tonnage { get; set; }
-        /// <summary>
-        /// 已排产数量
+        /// 生产任务ID
         /// </summary>
-        public int scheduled_num { get; set; }
+        public string prd_task_id { get; set; }
 
     }
 }

ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdTaskLog.cs

@@ -0,0 +1,108 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace Tnb.ProductionMgr.Entitys.Entity
+{
+    ///<summary>
+    ///生产任务操作记录
+    ///</summary>
+    [SugarTable("prd_task_log")]
+    public partial class PrdTaskLog
+    {
+           public PrdTaskLog(){
+
+
+           }
+           /// <summary>
+           /// Desc:主键
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public string id {get;set;}
+
+           /// <summary>
+           /// Desc:创建时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? create_time {get;set;}
+
+           /// <summary>
+           /// Desc:扩展字段
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string extras {get;set;}
+
+           /// <summary>
+           /// Desc:工单号
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string mo_code {get;set;}
+
+           /// <summary>
+           /// Desc:设备编号
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string eqp_code {get;set;}
+
+           /// <summary>
+           /// Desc:模具编号
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string mold_code {get;set;}
+
+           /// <summary>
+           /// Desc:产品编号
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string item_code {get;set;}
+
+           /// <summary>
+           /// Desc:产品规格型号
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string item_standard {get;set;}
+
+           ///// <summary>
+           ///// Desc:设备型号
+           ///// Default:NULL::character varying
+           ///// Nullable:True
+           ///// </summary>           
+           //public string eqp_type_code {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 operator_name {get;set;}
+
+           /// <summary>
+           /// Desc:创建用户
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string create_id {get;set;}
+            /// <summary>
+            /// 生产任务ID
+            /// </summary>
+           public string task_id { get;set;}
+
+    }
+}