车间bug修改

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -4870,24 +4870,28 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             boolean allMatch = true;
             //计算最小堆高度，就是凑整的数量
             int minHeapHeight = Integer.MAX_VALUE;
-            for (Integer curProcedureId : targetProdProduceIds) {
-                boolean find = false;
-                for (Integer integer : prodProcedureSteelNumMap.keySet()) {
-                    if (integer.equals(curProcedureId)) {
-                        find = true;
-                        break;
+            if(targetProdProduceIds.size()>0){
+                for (Integer curProcedureId : targetProdProduceIds) {
+                    boolean find = false;
+                    for (Integer integer : prodProcedureSteelNumMap.keySet()) {
+                        if (integer.equals(curProcedureId)) {
+                            find = true;
+                            break;
+                        }
                     }
-                }
-                if (find) {
-                    int size = prodProcedureSteelNumMap.get(curProcedureId).size();
-                    if (size < minHeapHeight) {
-                        minHeapHeight = size;
+                    if (find) {
+                        int size = prodProcedureSteelNumMap.get(curProcedureId).size();
+                        if (size < minHeapHeight) {
+                            minHeapHeight = size;
+                        }
+                    } else {
+                        //有一个工序凑不完整，就不算凑整件数
+                        allMatch = false;
+                        break;
                     }
-                } else {
-                    //有一个工序凑不完整，就不算凑整件数
-                    allMatch = false;
-                    break;
                 }
+            }else {
+                minHeapHeight=0;
             }
 
             List<String> leftSteelNums =new ArrayList<>();
@@ -5390,7 +5394,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 item.put("nowCost",arrangeTotalNowCost.doubleValue());
                 item.put("planHour",arrangeTotalPlanHour.doubleValue());
                 item.put("nowHour",arrangeTotalNowHour.doubleValue());
-                BigDecimal progress = arrangeTotalNowNum.divide(arrangeTotalPlanNum,2, BigDecimal.ROUND_HALF_UP);
+                BigDecimal progress =(BigDecimal.ZERO).compareTo(arrangeTotalNowNum) == 0 ? arrangeTotalNowNum:arrangeTotalNowNum.divide(arrangeTotalPlanNum,2, BigDecimal.ROUND_HALF_UP);
                 item.put("progress",format.format(progress.doubleValue()));
                 resultList.add(item);
             }