合并新疆代码

src/main/java/com/fdkankan/sale/service/impl/RepairCustomerService.java

@@ -40,6 +40,8 @@ public class RepairCustomerService {
     @Autowired
     IPriceListService priceListService;
     @Autowired
+    IPriceListLogService priceListLogService;
+    @Autowired
     RepairSupplyService repairSupplyService;
     @Autowired
     IPartLogService partLogService;
@@ -93,6 +95,7 @@ public class RepairCustomerService {
         }
         if(param.getConfirm() == 0){
             priceListService.updateStatusByRepairId(repair.getRepairId());
+            priceListLogService.updateByRepairId(repair.getRepairId());
             //无备件更换，不需要备料，应直接进入维修中
             List<PriceList> partList = priceListService.getByRepairId(repair.getRepairId());
             List<PriceList> collect = partList.stream().filter(entity -> entity.getType() == 0).collect(Collectors.toList());

src/main/java/com/fdkankan/sale/service/impl/RepairSupplyService.java

@@ -164,7 +164,6 @@ public class RepairSupplyService {
             partService.outStock(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId());
         }
         priceListService.updateStatusByRepairId(repair.getRepairId(),2);
-        priceListLogService.updateByRepairId(repair.getRepairId());
 
         repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_REPAIRED.status(),repair.getStatus(),"备件出库");
     }