备件回收

src/main/java/com/fdkankan/sale/service/IPartLogService.java

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IPartLogService extends IService<PartLog> {
 
-    void saveLog(Integer partId,Integer count, Long userId,Integer status,String repairId);
+    void saveLog(Integer partId,Integer count, Long userId,Integer status,String repairId,Integer priceListId);
 
     PageInfo pageList(RequestBase param);
 }

src/main/java/com/fdkankan/sale/service/IPartService.java

@@ -26,9 +26,9 @@ public interface IPartService extends IService<Part> {
 
     void outStockCheck(Integer partId,Integer count,Long userId,String repairId);
 
-    void outStock(Integer partId,Integer count,Long userId,String repairId);
+    void outStock(Integer partId,Integer count,Long userId,String repairId,Integer priceListId);
 
-    void recovery(Integer partId, Integer partCount, Long userId, String repairId,Integer status);
+    void recovery(Integer partId, Integer partCount, Long userId, String repairId,Integer status,Integer priceListId);
 
     HashMap<Integer, Part> getHashMap();
 }

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

@@ -31,7 +31,7 @@ public class PartLogServiceImpl extends ServiceImpl<IPartLogMapper, PartLog> imp
     IPartService partService;
 
     @Override
-    public void saveLog(Integer partId,Integer count, Long userId,Integer status,String repairId) {
+    public void saveLog(Integer partId,Integer count, Long userId,Integer status,String repairId,Integer priceListId) {
         Part part = partService.getById(partId);
         if(part == null){
             throw new BusinessException(ResultCode.PART_NOT_EXITS);
@@ -43,7 +43,7 @@ public class PartLogServiceImpl extends ServiceImpl<IPartLogMapper, PartLog> imp
         partLog.setCount(count);
         partLog.setSysUserId(userId);
         partLog.setRepairId(repairId);
-        partLog.setPriceListId();
+        partLog.setPriceListId(priceListId);
         this.save(partLog);
     }
 

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

@@ -78,7 +78,7 @@ public class PartServiceImpl extends ServiceImpl<IPartMapper, Part> implements I
         wrapper.eq(Part::getPartId,part.getPartId());
         wrapper.setSql("part_stock = part_stock +" + part.getPartStock());
         this.update(wrapper);
-        partLogService.saveLog(part.getPartId(),part.getPartStock(),userId,0,null);
+        partLogService.saveLog(part.getPartId(),part.getPartStock(),userId,0,null,null);
     }
 
     @Override
@@ -93,24 +93,24 @@ public class PartServiceImpl extends ServiceImpl<IPartMapper, Part> implements I
 
     }
     @Override
-    public void outStock(Integer partId, Integer count,Long userId,String repairId) {
+    public void outStock(Integer partId, Integer count,Long userId,String repairId,Integer priceListId) {
         LambdaUpdateWrapper<Part> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(Part::getPartId,partId);
         wrapper.setSql("part_stock = part_stock -" + count);
         this.update(wrapper);
-        partLogService.saveLog(partId,count,userId,1,repairId);
+        partLogService.saveLog(partId,count,userId,1,repairId,priceListId);
 
     }
 
     @Override
-    public void recovery(Integer partId, Integer partCount, Long userId, String repairId,Integer status) {
+    public void recovery(Integer partId, Integer partCount, Long userId, String repairId,Integer status,Integer priceListId) {
         if(status.equals(RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status())){
             LambdaUpdateWrapper<Part> wrapper = new LambdaUpdateWrapper<>();
             wrapper.eq(Part::getPartId,partId);
             wrapper.setSql("part_stock = part_stock +" +partCount);
             this.update(wrapper);
         }
-        partLogService.saveLog(partId,partCount,userId,2,repairId);
+        partLogService.saveLog(partId,partCount,userId,2,repairId,priceListId);
 
     }
 

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

@@ -133,7 +133,7 @@ public class RepairSupplyService {
             partService.outStockCheck(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId());
         }
         for (RepairRegisterPartVo partVo : partVoList) {
-            partService.outStock(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId());
+            partService.outStock(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId(),partVo.getPriceListId());
         }
         priceListService.outStock(repair.getRepairId());
 
@@ -155,7 +155,7 @@ public class RepairSupplyService {
         }
         List<RepairRegisterPartVo> partVoList = this.partInfo(param.getRepairId(),1);
         for (RepairRegisterPartVo partVo : partVoList) {
-            partService.recovery(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId(),repair.getStatus());
+            partService.recovery(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId(),repair.getStatus(),partVo.getPriceListId());
         }
         priceListService.recoveryPart(repair.getRepairId());