fix(决算模块): 发出由维修和退役组成

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/service/impl/FinalCheckServiceImpl.java

@@ -196,12 +196,11 @@ public class FinalCheckServiceImpl implements FinalCheckService {
                     otherList = v.stream().filter(deviceLibrary -> deviceLibrary.getMatchingRange() == 4).collect(Collectors.toList());
                 }
                 //收到的  入库+维修退回（中办送回）
-                //发出的  送修
-
+                //发出的  送修+退役
 //            detailList.add(new FinalDetail(v.get(0).getModel(), v.get(0).getName(), v.size(), 0, 0, 0, v.size(),
 //                    0, received, sending, 0, report.getId()));
                 detailList.add(new FinalDetail(v.get(0).getModel(), v.get(0).getName(), vList.size(), hList.size(), 0, otherList.size(), v.size(),
-                        0, storage+repairBack, sending, scrap,report.getId(),loss ,"",destroy));
+                        0, storage+repairBack, sending+retire, scrap,report.getId(),loss ,"",destroy));
         }
         for (Map.Entry<String, List<DeviceLibrary>> entry : outMap.entrySet()) {
             String key = entry.getKey();
@@ -216,7 +215,7 @@ public class FinalCheckServiceImpl implements FinalCheckService {
                 Integer loss = lossMap.get(key) == null ? 0 : destroyMap.get(key).getNum();
                 v = entry.getValue();
                 detailList.add(new FinalDetail(v.get(0).getModel(), v.get(0).getName(), 0, 0, 0, 0, 0,
-                        0, storage+repairBack, sending, scrap,report.getId(),loss ,"",destroy));
+                        0, storage+repairBack, sending+retire, scrap,report.getId(),loss ,"",destroy));
             }
         }
         detailList = detailDao.saveAll(detailList);