wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
DEVICE8\12494
2023-04-23 13:41:40 +08:00
parent 67113fabf8
commit f0fde866c8
13 changed files with 1039 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/PrdTaskOperInput.cs Normal file
View File

@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entitys.Dto.PrdManage
{
/// <summary>
/// 生产操作记录查询参数
/// </summary>
public class PrdTaskOperInput
{
/// <summary>
/// 工单号
/// </summary>
public string mo_no { get; set; }
/// <summary>
/// 任务单号
/// </summary>
public string task_no { get; set; }
/// <summary>
/// 产品编号
/// </summary>
public string item_code { get; set; }
/// <summary>
/// 设备编号
/// </summary>
public string eqp_code { get; set; }
/// <summary>
/// 计划生产开始日期
/// </summary>
public DateTime? plan_start_date{ get; set; }
/// <summary>
/// 计划生产结束日期
/// </summary>
public DateTime? plan_end_date { get; set; }
}
}

20
ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/PrdTaskOperOutput.cs Normal file
View File

@@ -0,0 +1,20 @@
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 PrdTaskOperOutput : PrdTaskLog
{
/// <summary>
///任务单操作状态
/// </summary>
public string statusName { get; set; }
}
}

48
ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/ProductionSchedulingCrInput.cs
View File

@@ -11,7 +11,11 @@ namespace Tnb.ProductionMgr.Entitys.Dto.WorkOrder
/// </summary>
public class ProductionSchedulingCrInput
{
/// <summary>
///
/// </summary>
public string id { get; set; }
/// <summary>
/// Desc:工单类型 1、注塑/挤出工单 2、组装/包装工单
/// Default:
@@ -47,40 +51,6 @@ namespace Tnb.ProductionMgr.Entitys.Dto.WorkOrder
/// </summary>
public DateTime? estimated_end_date { get; set; }
/// <summary>
/// Desc:实际开工时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? start_date { get; set; }
/// <summary>
/// Desc:实际完工时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? end_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:生产任务单状态
@@ -158,6 +128,10 @@ namespace Tnb.ProductionMgr.Entitys.Dto.WorkOrder
/// Nullable:True
/// </summary>
public string item_name { get; set; }
/// <summary>
/// 产品规格型号
/// </summary>
public string item_standard { get; set; }
/// <summary>
/// Desc:创建用户
@@ -204,6 +178,10 @@ namespace Tnb.ProductionMgr.Entitys.Dto.WorkOrder
/// 已排产数量
/// </summary>
public int scheduled_num { get; set; }
/// <summary>
/// 设备型号
/// </summary>
public string eqp_type_code { get; set; }
}

45
ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/TaskOperRecordOutput.cs Normal file
View File

@@ -0,0 +1,45 @@
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
{
public class TaskOperRecordOutput
{
/// <summary>
/// 任务单状态名称
/// </summary>
public string statusName { get; set; }
/// <summary>
/// Desc:工单Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mo_id { get; set; }
/// <summary>
/// 任务单号
/// </summary>
public string taskId { get; set; }
/// <summary>
/// Desc:设备编号
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string eqp_code { get; set; }
/// <summary>
/// 模具编号
/// </summary>
public string mold_code { get; set; }
/// <summary>
/// 产品型号
/// </summary>
public string item_code { get; set; }
/// <summary>
/// 操作人姓名
/// </summary>
public string operatorName { get; set; }
}
}

132
ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/BasItem.cs Normal file
View File

@@ -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;}
}
}

287
ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/Molds.cs
View File

@@ -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; }
}
}

326
ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdMo.cs Normal file
View File

@@ -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; }
}
}

244
ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdMoEntity.cs
View File

@@ -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; }
}
}

106
ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdTask.cs
View File

@@ -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; }
}
}

108
ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdTaskLog.cs Normal file
View File

@@ -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;}
}
}

182
ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
View File

@@ -1,11 +1,14 @@
using System.Dynamic;
using Aop.Api.Domain;
using JNPF.Common.Core.Manager;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Logging;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using Mapster;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@@ -26,14 +29,22 @@ namespace Tnb.ProductionPlanMgr
[Route("api/production/[controller]")]
public class PrdMoService : IPrdMoService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<PrdMoEntity> _repository;
private readonly ISqlSugarRepository<PrdMo> _repository;
private readonly IDataBaseManager _dataBaseManager;
private readonly IUserManager _userManager;
public PrdMoService(ISqlSugarRepository<PrdMoEntity> repository, IDataBaseManager dataBaseManager,IUserManager userManager)
private readonly IDictionaryDataService _dictionaryDataService;
public PrdMoService(
ISqlSugarRepository<PrdMo> repository,
IDataBaseManager dataBaseManager,
IUserManager userManager,
IDictionaryDataService dictionaryDataService
)
{
_repository = repository;
_dataBaseManager = dataBaseManager;
_userManager = userManager;
_dictionaryDataService = dictionaryDataService;
}
/// <summary>
/// 生产工单创建-生产工单下发
@@ -47,13 +58,49 @@ namespace Tnb.ProductionPlanMgr
{
throw new ArgumentNullException(nameof(input));
}
var db = await GetDbContext();
var row = await db.Updateable<PrdMoEntity>()
.SetColumns(it => new PrdMoEntity { MoStatus = "25019232867093" })
.Where(it => input.WorkOrderIds.Contains(it.Id))
.ExecuteCommandAsync();
var db = _repository.AsSugarClient();
var row = await db.Updateable<PrdMo>()
.SetColumns(it => new PrdMo { mo_status = "25019232867093" })
.Where(it => input.WorkOrderIds.Contains(it.id))
.ExecuteCommandAsync();
return (row > 0);
}
/// <summary>
/// 关联同组工单
/// </summary>
/// <param name="input">关联同组工单输入参数</param>
/// <returns></returns>
[HttpPost("relevancy")]
public async Task<dynamic> RelevancySameGroupMo(MoCrInput input)
{
var row = -1;
var list = await _repository.AsSugarClient().Queryable<PrdMo>()
.InnerJoin<Molds>((a, b) => a.item_code == b.item_code)
.Where((a, b) => input.WorkOrderIds.Contains(a.id))
.Select((a, b) => new
{
planDate = a.plan_start_date,
moldId = b.id,
}).ToListAsync();
if (list?.Count > 0)
{
var planDate = list.FirstOrDefault()?.planDate;
var moId = list.FirstOrDefault()?.moldId;
var all = list.Skip(1).All(x => x.planDate == planDate && x.moldId == moId);
if (all)
{
var groupId = SnowflakeIdHelper.NextId();
row = await _repository.AsSugarClient().Updateable<PrdMo>()
.SetColumns(c => new PrdMo { mo_group_no = groupId })
.Where(it => input.WorkOrderIds.Contains(it.id))
.ExecuteCommandAsync();
}
}
return row > 0;
}
/// <summary>
/// 生产工单-生产排产
/// </summary>
@@ -77,23 +124,49 @@ namespace Tnb.ProductionPlanMgr
[HttpPost("scheduling")]
public async Task<dynamic> ProductionScheduling(ProductionSchedulingCrInput input)
{
var entity = input.Adapt<PrdTask>();
entity.id ??= SnowflakeIdHelper.NextId();
entity.status = "ToBeScheduled"; //任务单状态默认，待排产
entity.create_id = _userManager.UserId;
entity.create_time = DateTime.Now;
var db = await GetDbContext();
var row = await db.Storageable(entity).ExecuteCommandAsync();
if (row > 0)
var row = -1;
if (input.mo_type.HasValue && input.mo_type.Value == 1)
{
//修改工单状态为已排产，同事修改已排产数量
row = await db.Updateable<PrdMoEntity>().SetColumns(it => new PrdMoEntity
input.id ??= SnowflakeIdHelper.NextId();
var entity = input.Adapt<PrdTask>();
entity.status = "ToBeScheduled"; //任务单状态默认，待排产
entity.create_id = _userManager.UserId;
entity.create_time = DateTime.Now;
var db = _repository.AsSugarClient();
try
{
MoStatus = "25019252113685",
InputQty = entity.scheduled_num
})
.Where(it => it.Id == entity.mo_id).ExecuteCommandAsync();
await db.Ado.BeginTranAsync();
row = await db.Storageable(entity).ExecuteCommandAsync();
var taskLogEntity = input.Adapt<PrdTaskLog>();
taskLogEntity.id ??= SnowflakeIdHelper.NextId();
taskLogEntity.status ??= "ToBeStarted";
taskLogEntity.create_id = _userManager.UserId;
taskLogEntity.create_time = DateTime.Now;
taskLogEntity.operator_name = _userManager.RealName;
//任务状态变更时插入操作记录
if (!db.Queryable<PrdTaskLog>().Where(it => it.task_id == input.id && it.status == taskLogEntity.status).Any())
{
row = await db.Insertable(taskLogEntity).ExecuteCommandAsync();
}
if (row > 0)
{
//修改工单状态为已排产，同事修改已排产数量
row = await db.Updateable<PrdMo>().SetColumns(it => new PrdMo
{
mo_status = "25019252113685",
input_qty = entity.scheduled_num
})
.Where(it => it.id == entity.mo_id).ExecuteCommandAsync();
}
await db.Ado.CommitTranAsync();
}
catch (Exception ex)
{
Log.Error("生产任务发布时发生错误", ex);
await db.Ado.RollbackTranAsync();
}
}
return row > 0;
}
@@ -108,7 +181,7 @@ namespace Tnb.ProductionPlanMgr
{
throw new ArgumentNullException(nameof(input));
}
var db = await GetDbContext();
var db = _repository.AsSugarClient(); ;
var row = await db.Updateable<PrdTask>()
.SetColumns(it => new PrdTask { status = "ToBeStarted" })
.Where(it => input.TaskIds.Contains(it.id))
@@ -118,36 +191,63 @@ namespace Tnb.ProductionPlanMgr
/// <summary>
/// 根据产品ID获取模具列表
/// </summary>
/// <param name="itemId">产品ID</param>
/// <returns></returns>
/// <remarks>
/// <br/>return results:
/// <br/>[
/// <br/> {
/// <br/> mold_code:模具编号
/// <br/> mold_name:模具名称
/// <br/> item_name:产品名称
/// <br/> item_code:产品编号
/// <br/> cavity_num:模穴数
/// <br/> }
/// <br/>]
/// </remarks>
[HttpGet("moldlist/{itemId}")]
public async Task<dynamic> GetMoldListByItemId(string itemId)
{
var db = await GetDbContext("tnb_mom");
List<dynamic> items = await db.Queryable<object>().AS("bas_item").Select(new List<SelectModel>()
{
new SelectModel{ FiledName="id" },
new SelectModel{ FiledName="item_name" },
}).ToListAsync();
var itemDic = items.ToDictionary(x => x.id, x => x.item_name);
db = await GetDbContext("tnb_eqp");
var moldList = await db.Queryable<Molds>().Where(it => it.item_id == itemId).ToListAsync();
var list = moldList.Adapt<List<MoldListOutput>>();
db.ThenMapper(list, x => x.item_name = itemDic.ContainsKey(x.item_id) ? itemDic[x.item_id] : "");
var db = _repository.AsSugarClient();
var list = await db.Queryable<Molds>().InnerJoin<BasItem>((a, b) => a.item_id == b.id)
.Where((a, b) => a.item_id == itemId)
.Select((a, b) => new MoldListOutput
{
id = a.id,
mold_code = a.mold_code,
mold_name = a.mold_name,
item_name = b.item_name,
item_code = b.item_code,
cavity_num = a.cavity_num,
})
.ToListAsync();
return list;
}
private async Task<ISqlSugarClient> GetDbContext(string dbName = "tnb_mes")
/// <summary>
/// 查看工单操作记录
/// </summary>
/// <param name="input">操作记录查询输入参数</param>
/// <returns></returns>
[HttpGet("record/{moId}")]
public async Task<dynamic> GetMoOperRecord(PrdTaskOperInput input)
{
var link = await _repository.AsSugarClient().Queryable<DbLinkEntity>().FirstAsync(x => x.FullName == dbName);
var db = _dataBaseManager.ChangeDataBase(link);
return db;
var list = await _repository.AsSugarClient().Queryable<PrdTask>().LeftJoin<PrdTaskLog>((a, b) => a.prd_task_id == b.id)
.WhereIF(!string.IsNullOrWhiteSpace(input.mo_no), a => a.mo_id == input.mo_no)
.WhereIF(!string.IsNullOrWhiteSpace(input.task_no), b => b.prd_task_id == input.task_no)
.WhereIF(!string.IsNullOrWhiteSpace(input.item_code), a => a.item_code == input.item_code)
.WhereIF(!string.IsNullOrWhiteSpace(input.eqp_code), a => a.eqp_type_code == input.eqp_code)
.WhereIF(input.plan_start_date.HasValue, a => a.plan_start_date >= input.plan_start_date!.Value)
.WhereIF(input.plan_end_date.HasValue, a => a.plan_end_date <= input.plan_end_date!.Value)
.ToListAsync();
var data = list.Adapt<List<PrdTaskOperOutput>>();
var dic = await _dictionaryDataService.GetDicByTypeId("25572555259157");
_repository.AsSugarClient().ThenMapper(data, x => x.statusName = dic.ContainsKey(x.status) ? dic[x.status].ToString() : "");
return data;
}
}
}

7
system/Tnb.Systems.Interfaces/System/IDictionaryDataService.cs
View File

@@ -31,4 +31,11 @@ public interface IDictionaryDataService
/// <param name="key"></param>
/// <returns></returns>
Task<Dictionary<string, object>> GetDicByKey(string key);
/// <summary>
/// 根据typeId获取字典
/// </summary>
/// <param name="typeId"></param>
/// <returns></returns>
Task<Dictionary<string, object>> GetDicByTypeId(string typeId);
}

11
system/Tnb.Systems/System/DictionaryDataService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Core.Manager;
using JNPF.ClayObject.Extensions;
using JNPF.Common.Core.Manager;
using JNPF.Common.Core.Manager.Files;
using JNPF.Common.Enums;
using JNPF.Common.Manager;
@@ -338,9 +339,15 @@ public class DictionaryDataService : IDictionaryDataService, IDynamicApiControll
return await _repository.AsSugarClient().Queryable<DictionaryDataEntity>()
.LeftJoin<DictionaryTypeEntity>((a, b) => a.DictionaryTypeId == b.Id)
.Where((a, b) => b.EnCode == key && b.DeleteMark == null)
.ToDictionaryAsync((it)=>it.EnCode,it=>it.FullName);
.ToDictionaryAsync((it) => it.EnCode, it => it.FullName);
}
public async Task<Dictionary<string, object>> GetDicByTypeId(string typeId) =>
await _repository.AsQueryable().Where(x => x.DictionaryTypeId == typeId).ToDictionaryAsync(x => x.EnCode, x => x.FullName);
#endregion
#region PrivateMethod