生产管理模块代码调整

This commit is contained in:
DEVICE8\12494
2023-05-15 14:47:14 +08:00
parent c3809e2f45
commit a3ec329dc7
3 changed files with 367 additions and 333 deletions

View File

@@ -11,297 +11,302 @@ namespace Tnb.ProductionMgr.Entities
[SugarTable("prd_mo")]
public partial class PrdMo
{
public PrdMo(){
public PrdMo()
{
}
/// <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:False
/// </summary>
public string mo_code {get;set;}
/// <summary>
/// Desc:工单代码
/// Default:
/// Nullable:False
/// </summary>
public string mo_code { get; set; }
/// <summary>
/// Desc:工单类型1-正常工单、2-返工工单、3-试制工单
/// Default:
/// Nullable:False
/// </summary>
public string mo_type {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:生产状态 Initial: 初始, Confirm:确认 Release: 下发, Open: 生产中, Close: 关单, Pending: 暂停
/// Default:
/// Nullable:False
/// </summary>
public string mo_status { get; set; }
/// <summary>
/// Desc:生产数量
/// Default:
/// Nullable:False
/// </summary>
public int plan_qty {get;set;}
/// <summary>
/// Desc:生产数量
/// Default:
/// Nullable:False
/// </summary>
public int plan_qty { get; set; }
/// <summary>
/// Desc:已投入数量
/// Default:
/// Nullable:True
/// </summary>
public int input_qty {get;set;}
/// <summary>
/// Desc:已投入数量
/// Default:
/// Nullable:True
/// </summary>
public int input_qty { get; set; }
/// <summary>
/// Desc:已完工数量
/// Default:
/// Nullable:True
/// </summary>
public decimal? complete_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: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_start_date { get; set; }
/// <summary>
/// Desc:计划结束时间
/// Default:
/// Nullable:False
/// </summary>
public DateTime plan_end_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_start_date { get; set; }
/// <summary>
/// Desc:实际完工日期
/// Default:
/// Nullable:True
/// </summary>
public DateTime? act_end_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 int? order_seq { get; set; }
/// <summary>
/// Desc:关联比例
/// Default:
/// Nullable:True
/// </summary>
public decimal? relation_ratio {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? mo_down_date { get; set; }
/// <summary>
/// Desc:物料编号
/// Default:
/// Nullable:False
/// </summary>
public string material_code {get;set;}
/// <summary>
/// Desc:物料编号
/// Default:
/// Nullable:False
/// </summary>
public string material_code { get; set; }
/// <summary>
/// Desc:排程开始时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? seduling_start_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 DateTime? seduling_end_date { get; set; }
/// <summary>
/// Desc:是否生派工单
/// Default:
/// Nullable:True
/// </summary>
public int? is_create_dispatch {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:子工单序号(1开始,最大+1,不强制连续)
/// Default:
/// Nullable:True
/// </summary>
public int? seq { get; set; }
/// <summary>
/// Desc:是否合并
/// Default:
/// Nullable:True
/// </summary>
public int? is_merge {get;set;}
/// <summary>
/// Desc:是否合并
/// 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? 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 org_id {get;set;}
/// <summary>
/// Desc:所属组织
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string org_id { get; set; }
/// <summary>
/// Desc:生产部门ID
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string dept_id {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 customer_code { get; set; }
/// <summary>
/// Desc:订单号
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string order_no {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: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:下发人员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 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 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 work_center_code { get; set; }
/// <summary>
/// Desc:主工单代码
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string parent_mo_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:数据来源 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 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 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 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 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; }
/// <summary>
/// Desc:物料ID
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string material_id {get;set;}
/// <summary>
/// Desc:物料ID
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string material_id { get; set; }
/// <summary>
/// 已排产数量
/// </summary>
public int scheduled_qty { get; set; }
}
}

View File

@@ -11,98 +11,103 @@ namespace Tnb.ProductionMgr.Entities
[SugarTable("prd_mo_task_log")]
public partial class PrdTaskLog
{
public PrdTaskLog(){
public PrdTaskLog()
{
}
/// <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 DateTime? create_time {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:
/// 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 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 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 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_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 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 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? 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 operator_name { get; set; }
/// <summary>
/// Desc:创建用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string create_id {get;set;}
/// <summary>
/// 生产任务ID
/// </summary>
public string mo_task_id { get;set;}
/// <summary>
/// Desc:创建用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string create_id { get; set; }
/// <summary>
/// 生产任务ID
/// </summary>
public string mo_task_id { get; set; }
/// <summary>
/// 任务单编号
/// </summary>
public string mo_task_code { get; set; }
}
}

View File

@@ -438,13 +438,37 @@ namespace Tnb.ProductionMgr
//根据工单号获取当前工单包含的已排产数
var schedQty = db.Queryable<PrdMoTask>().Where(it => it.mo_id == input.mo_id)?.Sum(d => d.scheduled_qty);
//判断如果当前 工单的已排产数大于工单计划数量则更新工单状态为 已排产
if (mo != null && schedQty.HasValue && schedQty.Value >= mo.plan_qty)
{
mo.mo_status = DictConst.AlreadyId;
row = await db.Updateable(mo).ExecuteCommandAsync();
if (mo != null)
{//判断如果当前 工单的已排产数大于工单计划数量则更新工单状态为 已排产
if (schedQty.HasValue && schedQty.Value >= mo.plan_qty)
{
mo.mo_status = DictConst.AlreadyId;
row = await db.Updateable(mo).ExecuteCommandAsync();
}
else
{
if (schedQty.HasValue)
mo.scheduled_qty = schedQty.Value;
}
}
var material = await db.Queryable<BasMaterial>().FirstAsync(it => it.id == moTask.material_id);
var taskLog = new PrdTaskLog();
taskLog.id = SnowflakeIdHelper.NextId();
taskLog.mo_code = (await db.Queryable<PrdMo>().FirstAsync(it => it.id == input.mo_id))?.mo_code;
taskLog.eqp_code = (await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == input.eqp_id))?.code;
taskLog.mold_code = (await db.Queryable<Molds>().FirstAsync(it => it.id == input.mold_id))?.mold_code;
taskLog.item_code = material?.code;
taskLog.item_standard = material?.material_standard;
taskLog.status = DictConst.ToBeScheduledEncode;
taskLog.operator_name = _userManager.RealName;
taskLog.create_id = _userManager.UserId;
taskLog.create_time = DateTime.Now;
taskLog.mo_task_id = moTask.id;
taskLog.mo_task_code = moTask.mo_task_code;
await db.Insertable(taskLog).ExecuteCommandAsync();
//将生产任务插入到自检报废记录表
var sacipRecord = new PrdMoTaskDefectRecord();
sacipRecord.id = SnowflakeIdHelper.NextId();