diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs index 2a3a7c83..dd264e2c 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs @@ -194,7 +194,7 @@ namespace Tnb.EquipMgr string id = dic["id"]; EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x => x.id == id); - if (eqpRepairApply.status == RepairApplyStatus.TOBERECEIVED) + if (eqpRepairApply.status == RepairApplyStatus.TOBEEXECUTED) { if (await _repository.AsSugarClient().Queryable().AnyAsync(x => x.UserId == _userManager.UserId && x.ObjectId == "26586914497557")) { diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListOuput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListOuput.cs index fdbafc2a..a4bd3407 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListOuput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListOuput.cs @@ -19,5 +19,15 @@ namespace Tnb.ProductionMgr.Entities.Dto public string combine_mo_code { get; set; } public string material_id_id { get; set; } public List children { get; set; } = new List(); + + /// + /// 物料规格 + /// + public string? f_flowtaskid { get; set; } + + /// + /// 物料型号 + /// + public string? f_flowid { get; set; } } } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs index 62d1a8ee..146506aa 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs @@ -166,6 +166,8 @@ namespace Tnb.ProductionMgr mo_status = e.FullName, ebom_version = a.ebom_version, remark = a.remark, + f_flowtaskid = b.material_specification, + f_flowid = b.material_standard, children = SqlFunc.Subqueryable() .LeftJoin((aa, bb) => aa.material_id == bb.id) .LeftJoin((aa, bb, cc) => cc.EnCode == DictConst.MeasurementUnit)