diff --git a/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs b/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs index 5789376a..c5872aa9 100644 --- a/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs +++ b/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs @@ -82,6 +82,10 @@ public static class DictConst /// public const string MoCloseId = "25501969636645"; /// + /// 工单状态-完工 + /// + public const string MoCompleteId = "25501960891941"; + /// /// 工单状态-code /// public const string MoTaskStatusCode = "OrderStatus"; diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/WorkOrderAdjustmentListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/WorkOrderAdjustmentListOutput.cs index cb0fd31a..fb6e5593 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/WorkOrderAdjustmentListOutput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/WorkOrderAdjustmentListOutput.cs @@ -22,5 +22,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage public string eqp_id { get; set; } public string eqp_id_id { get; set; } public string create_time { get; set; } + + public int? schedule_type { get; set; } } } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index fa17b11b..e066aff7 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -652,6 +652,8 @@ namespace Tnb.ProductionMgr if (input.schedule_type.Value == 1) //注塑、基础排产 { PrdMo? mo = await db.Queryable().FirstAsync(it => it.id == input.mo_id); + if (mo.mo_status == DictConst.MoCloseId || mo.mo_status == DictConst.MoCompleteId) + throw Oops.Bah("状态错误"); BasMbomProcess? basMbomProcess = null; if (!string.IsNullOrEmpty(input.bom_id)) { @@ -813,6 +815,8 @@ namespace Tnb.ProductionMgr moTask.estimated_end_date = input.estimated_end_date; moTask.scheduled_qty = input.scheduled_qty; PrdMo? mo = await _db.Queryable().FirstAsync(it => it.id == input.mo_id); + if (mo.mo_status == DictConst.MoCloseId || mo.mo_status == DictConst.MoCompleteId) + throw Oops.Bah("状态错误"); // moTask.unit_id = mo.unit_id; string? moCode = mo?.mo_code; // var taskCode = await _db.Queryable().Where(it => string.IsNullOrEmpty(it.parent_id) && !string.IsNullOrEmpty(it.mo_task_code) && it.mo_task_code.Contains(moCode)) @@ -2106,7 +2110,8 @@ namespace Tnb.ProductionMgr estimated_end_date = a.estimated_end_date == null ? "" : a.estimated_end_date.Value.ToString("yyyy-MM-dd"), eqp_id = a.eqp_id == null ? "" : h.code + "/" + h.name, eqp_id_id = a.eqp_id, - create_time = a.create_time == null ? "" : a.create_time.Value.ToString(DbTimeFormat.SS) + create_time = a.create_time == null ? "" : a.create_time.Value.ToString(DbTimeFormat.SS), + schedule_type = a.schedule_type, }).OrderByDescending(a => a.create_time).ToPagedListAsync(input.currentPage, input.pageSize); return PageResult.SqlSugarPageResult(result); }