bug

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<UserRelationEntity>().AnyAsync(x => x.UserId == _userManager.UserId && x.ObjectId == "26586914497557"))
                 {

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<PrdMoListOuput> children { get; set; } = new List<PrdMoListOuput>();
+        
+        /// <summary>
+        /// 物料规格
+        /// </summary>
+        public string? f_flowtaskid { get; set; }
+    
+        /// <summary>
+        /// 物料型号
+        /// </summary>
+        public string? f_flowid { get; set; }
     }
 }

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<PrdMo>()
                         .LeftJoin<BasMaterial>((aa, bb) => aa.material_id == bb.id)
                         .LeftJoin<DictionaryTypeEntity>((aa, bb, cc) => cc.EnCode == DictConst.MeasurementUnit)