维修中添加备件，...

src/main/java/com/fdkankan/sale/controller/RepairSupplyController.java

@@ -41,7 +41,7 @@ public class RepairSupplyController extends BaseController{
     }
 
     /**
-     * 备件出库详情回显
+     * 备件出库详情回显 todo
      */
     @GetMapping("/partInfo")
     public ResultData partInfo(@RequestParam(required = false) String repairId,

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

@@ -174,6 +174,8 @@ public class RepairPersonnelService {
             throw new BusinessException(ResultCode.REPAIR_CHECK_EMPTY);
         }
         repairRegister.setStatus(1);
+        repairRegister.setCheckResult(param.getCheckResult());
+        repairRegister.setCheckImg(param.getCheckImg());
         RepairRegisterLog repairRegisterLog = repairRegisterLogService.saveLog(repairRegister);
         this.addRepairPart(param.getPartList(),repair,repairRegister,repairRegisterLog.getRegisterLogId());
 

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

@@ -29,6 +29,8 @@ public class RepairRegisterLogServiceImpl extends ServiceImpl<IRepairRegisterLog
     public RepairRegisterLog saveLog(RepairRegister repairRegister) {
         RepairRegisterLog repairRegisterLog = new RepairRegisterLog();
         BeanUtil.copyProperties(repairRegister,repairRegisterLog);
+        repairRegisterLog.setCreateTime(null);
+        repairRegisterLog.setUpdateTime(null);
         this.save(repairRegisterLog);
         return repairRegisterLog;
     }

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

@@ -174,6 +174,11 @@ public class RepairSaleService {
         HashMap<Integer,Part> partMap = partService.getHashMap();
         HashMap<Integer,LaborCost> laborMap = laborCostService.getHashMap();
 
+        List<PriceList> priceLists = priceListService.getByRepairId(repair.getRepairId());
+        List<PriceList> collect = priceLists.stream().filter(entity -> entity.getType() == 0).collect(Collectors.toList());
+        HashMap<Integer,PriceList> partMapDb = new HashMap<>();
+        collect.forEach(entity -> partMapDb.put(entity.getPartId(),entity));
+
         priceListService.delNoCm(repair.getRepairId());
         for (PriceList priceList : param.getPriceLists()) {
             if(priceList.getType() == null){
@@ -183,6 +188,11 @@ public class RepairSaleService {
                 if(priceList.getPartId() == null ||  partMap.get(priceList.getPartId()) == null || priceList.getDiscount() == null){
                     throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
                 }
+                PriceList priceListDb = partMapDb.get(priceList.getPartId());
+                if(priceListDb != null){
+                    priceList.setPriceListId(priceListDb.getPriceListId());
+                    priceList.setOutStatus(priceListDb.getOutStatus());
+                }
                 Part part = partMap.get(priceList.getPartId());
                 priceList.setPrice(part.getPartPrice());
                 priceList.setPriceDiscount(part.getPartPriceDiscount());