|
@@ -77,12 +77,7 @@ public class RepairSupplyService {
|
|
|
List<PriceList> priceListList = priceListService.getByRepairId(repairId);
|
|
|
for (PriceList priceList : priceListList) {
|
|
|
if(priceList.getStatus() == 1){
|
|
|
- if(priceList.getPartId() == null || priceList.getType() == 1){
|
|
|
- RepairRegisterPartVo vo = new RepairRegisterPartVo();
|
|
|
- vo.setPartName(priceList.getName());
|
|
|
- vo.setPartCount(priceList.getCount());
|
|
|
- parts.add(vo);
|
|
|
- }else {
|
|
|
+ if(priceList.getPartId() != null && priceList.getType() == 0){
|
|
|
if(priceMap.get(priceList.getPartId()) == null){
|
|
|
priceMap.put(priceList.getPartId(),priceList);
|
|
|
}else {
|
|
@@ -90,7 +85,6 @@ public class RepairSupplyService {
|
|
|
priceList1.setCount(priceList1.getCount() + priceList.getCount());
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
for (Integer partId : priceMap.keySet()) {
|