去除引用common.props

This commit is contained in:
2023-11-06 19:35:59 +08:00
parent 6a2154edd9
commit c6b8dfc861
810 changed files with 3910 additions and 6695 deletions

View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Contracts;
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;

View File

@@ -1,8 +1,3 @@
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;
@@ -17,16 +12,16 @@ namespace Tnb.ProductionMgr.Entities.Entity
id = SnowflakeIdHelper.NextId();
}
public string? region_name { get; set; }
public string? name { get; set; }
public string? push_rule_id { get; set; }
/// <summary>
/// 故障类别
/// </summary>
public string? andon_type { get; set; }
/// <summary>
/// 故障

View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Contracts;
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
@@ -38,14 +33,14 @@ namespace Tnb.ProductionMgr.Entities
public string? remark { get; set; }
public string? andon_type_id { get; set; }
public string? andon_info_id { get; set; }
public string? repair_id { get; set; }
public string? repair_id { get; set; }
public DateTime? response_time { get; set; }
public DateTime? start_repair_time { get; set; }
public DateTime? end_repair_time { get; set; }
public DateTime? confirm_time { get; set; }
public string status { get; set; }
}
}

View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Contracts;
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
@@ -20,7 +15,7 @@ namespace Tnb.ProductionMgr.Entities
/// 名称
/// </summary>
public string? name { get; set; }
public string? remark { get; set; }
public string? create_id { get; set; }
@@ -31,6 +26,6 @@ namespace Tnb.ProductionMgr.Entities
/// 所属组织
/// </summary>
public string? org_id { get; set; }
}
}

View File

@@ -15,7 +15,7 @@ namespace Tnb.ProductionMgr.Entities.Entity
public string eqp_id { get; set; }
public string eqp_id_id { get; set; }
public string equip_code { get; set; }
public string process_id { get; set; }
public string process_id_id { get; set; }
public string process_code { get; set; }
@@ -23,9 +23,9 @@ namespace Tnb.ProductionMgr.Entities.Entity
public int? scheduled_qty { get; set; }
public int? reported_work_qty { get; set; }
public int? scrap_qty { get; set; }
public string plan_start_date { get; set; }
public string plan_end_date { get; set; }
}
}

View File

@@ -15,7 +15,7 @@ namespace Tnb.ProductionMgr.Entities
public string eqp_id { get; set; }
public string eqp_id_id { get; set; }
public string equip_code { get; set; }
public string process_id { get; set; }
public string process_id_id { get; set; }
public string process_code { get; set; }
@@ -23,9 +23,9 @@ namespace Tnb.ProductionMgr.Entities
public int? scheduled_qty { get; set; }
public int? reported_work_qty { get; set; }
public int? scrap_qty { get; set; }
public string plan_start_date { get; set; }
public string plan_end_date { get; set; }
}
}

View File

@@ -3,7 +3,7 @@ namespace Tnb.ProductionMgr.Entities.Entity
public class CheckMoldInput
{
public string mo_task_id { get; set; }
public string mold_qrcode { get; set; }
}
}

View File

@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using JNPF.Common.Contracts;
using SqlSugar;
using JNPF.Common.Contracts;
namespace Tnb.ProductionMgr.Entities
{

View File

@@ -53,7 +53,7 @@ public partial class PrdFeedingD : BaseEntity<string>
/// 物料签收单子表id
/// </summary>
public string? material_receipt_detail_id { get; set; }
/// <summary>
/// 创建用户
/// </summary>
@@ -63,7 +63,7 @@ public partial class PrdFeedingD : BaseEntity<string>
/// 创建时间
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// 状态 0 未消耗 1 部分消耗 2 消耗完
/// </summary>

View File

@@ -53,7 +53,7 @@ public partial class PrdInstockD : BaseEntity<string>
/// 生产提报id
/// </summary>
public string report_id { get; set; } = string.Empty;
/// <summary>
/// 生产任务单号
/// </summary>

View File

@@ -38,7 +38,7 @@ public partial class PrdInstockH : BaseEntity<string>
/// 起始库位编号
/// </summary>
public string location_code { get; set; } = string.Empty;
/// <summary>
/// 工位id
/// </summary>
@@ -54,7 +54,7 @@ public partial class PrdInstockH : BaseEntity<string>
/// </summary>
public string? workshop_id { get; set; }
/// <summary>
/// 检验(0-未检 1-已检)

View File

@@ -38,7 +38,7 @@ public partial class PrdMaterialReceiptD : BaseEntity<string>
/// 单位id
/// </summary>
public string? unit_id { get; set; }
/// <summary>
/// 条码编号
/// </summary>
@@ -48,7 +48,7 @@ public partial class PrdMaterialReceiptD : BaseEntity<string>
/// 载具id
/// </summary>
public string carry_id { get; set; } = string.Empty;
/// <summary>
/// 子载具id
/// </summary>
@@ -69,7 +69,7 @@ public partial class PrdMaterialReceiptD : BaseEntity<string>
/// 已投料数量
/// </summary>
public decimal feeding_num { get; set; }
/// <summary>
/// 供应商
/// </summary>

View File

@@ -14,12 +14,12 @@ public partial class PrdMaterialReceiptH : BaseEntity<string>
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 签收单号
/// </summary>
public string code { get; set; } = string.Empty;
/// <summary>
/// 工位id
/// </summary>

View File

@@ -53,7 +53,7 @@ public partial class PrdMo : BaseEntity<string>
/// 已完工数量
/// </summary>
public int? complete_qty { get; set; }
/// <summary>
/// 已报工数量
/// </summary>
@@ -227,12 +227,12 @@ public partial class PrdMo : BaseEntity<string>
/// 父工单id
/// </summary>
public string parent_id { get; set; }
/// <summary>
/// 物料单位
/// </summary>
public string? unit_id { get; set; }
/// <summary>
/// 工单来源
/// </summary>

View File

@@ -78,7 +78,7 @@ public partial class PrdMoTask : BaseEntity<string>
/// 已完工数量
/// </summary>
public int? complete_qty { get; set; }
/// <summary>
/// 已报工数量
/// </summary>
@@ -177,22 +177,22 @@ public partial class PrdMoTask : BaseEntity<string>
/// 工序id
/// </summary>
public string process_id { get; set; }
/// <summary>
/// 生产bom工序id
/// </summary>
public string? mbom_process_id { get; set; }
/// <summary>
/// 最后一道工序完成数量
/// </summary>
public int? last_process_complete_qty { get; set; }
/// <summary>
/// 物料单位
/// </summary>
public string? unit_id { get; set; }
/// <summary>
/// 物料清单id
/// </summary>

View File

@@ -1,7 +1,3 @@
using System;
using System.Linq;
using System.Text;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.ProductionMgr.Entities

View File

@@ -73,7 +73,7 @@ public partial class PrdMoTaskLog : BaseEntity<string>
/// 任务单编号
/// </summary>
public string? mo_task_code { get; set; }
/// <summary>
/// 工位编号
/// </summary>

View File

@@ -1,5 +1,4 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.ProductionMgr.Entities;
@@ -12,7 +11,7 @@ public partial class PrdOnwipTool : BaseEntity<char>
{
public PrdOnwipTool()
{
}
/// <summary>
/// TODO

View File

@@ -78,18 +78,18 @@ public partial class PrdReport : BaseEntity<string>
/// 生产任务量
/// </summary>
public int? icmo_qty { get; set; }
/// <summary>
/// 批次
/// </summary>
public string? batch { get; set; }
/// <summary>
/// 条码
/// </summary>
public string? barcode { get; set; }
/// <summary>
/// 设备id
/// </summary>
@@ -109,7 +109,7 @@ public partial class PrdReport : BaseEntity<string>
/// 状态 0 未入库 1 已入库
/// </summary>
public int status { get; set; }
/// <summary>
/// 物料id
/// </summary>
@@ -119,12 +119,12 @@ public partial class PrdReport : BaseEntity<string>
/// 物料单位
/// </summary>
public string? unit_id { get; set; }
/// <summary>
/// 工序id
/// </summary>
public string? process_id { get; set; }
/// <summary>
/// 料箱编号
/// </summary>

View File

@@ -1,7 +1,4 @@
using System;
using System.Linq;
using System.Text;
using SqlSugar;
using SqlSugar;
namespace DbModels
{

View File

@@ -1,7 +1,4 @@
using System;
using System.Linq;
using System.Text;
using SqlSugar;
using SqlSugar;
namespace Tnb.ProductionMgr.Entities
{
@@ -138,7 +135,7 @@ namespace Tnb.ProductionMgr.Entities
/// <summary>
/// 工单数(生产任务数)
/// </summary>
public int mo_qty{ get; set; }
public int mo_qty { get; set; }
/// <summary>
/// Desc:模具Id
/// Default:NULL::character varying

View File

@@ -1,7 +1,4 @@
using System;
using System.Linq;
using System.Text;
using SqlSugar;
using SqlSugar;
namespace Tnb.ProductionMgr.Entities
{