tangdi 2 лет назад
Родитель
Сommit
61408210a5

+ 3 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -1105,7 +1105,7 @@ namespace Business.ResourceExamineManagement
                 }
                 else
                 {
-                    int orderNum = sublist.Select(s => s.substitute_all_num.GetValueOrDefault()).ToList().Min();
+                    int orderNum = sublist.Where(s => s.type == 1).Select(s => s.substitute_all_num.GetValueOrDefault()).ToList().Min();
                     //取代
                     select = sublist.Where(s => s.substitute_all_num == orderNum).ToList();
                 }
@@ -1282,8 +1282,9 @@ namespace Business.ResourceExamineManagement
                 }
                 else
                 {
+                    int minNum = sublist.Where(s => s.type == 1).Select(s => s.substitute_all_num.GetValueOrDefault()).ToList().Min();
                     //取代
-                    select = sublist.Where(s => s.substitute_all_num == 0).ToList();
+                    select = sublist.Where(s => s.substitute_all_num == minNum).ToList();
                 }
                 //对select执行补充(根据属性采购、外购、自制等)
                 foreach (var sct in select)