备件出库，备件回收回显

src/main/java/com/fdkankan/sale/entity/PartLog.java

@@ -75,7 +75,5 @@ public class PartLog implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
-    @TableField("price_list_id")
-    private Integer priceListId;
 
 }

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,Integer priceListId);
+    void saveLog(Integer partId,Integer count, Long userId,Integer status,String repairId);
 
     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,Integer priceListId);
+    void outStock(Integer partId,Integer count,Long userId,String repairId);
 
-    void recovery(Integer partId, Integer partCount, Long userId, String repairId,Integer status,Integer priceListId);
+    void recovery(Integer partId, Integer partCount, Long userId, String repairId,Integer status);
 
     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,Integer priceListId) {
+    public void saveLog(Integer partId,Integer count, Long userId,Integer status,String repairId) {
         Part part = partService.getById(partId);
         if(part == null){
             throw new BusinessException(ResultCode.PART_NOT_EXITS);
@@ -43,7 +43,6 @@ public class PartLogServiceImpl extends ServiceImpl<IPartLogMapper, PartLog> imp
         partLog.setCount(count);
         partLog.setSysUserId(userId);
         partLog.setRepairId(repairId);
-        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,null);
+        partLogService.saveLog(part.getPartId(),part.getPartStock(),userId,0,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,Integer priceListId) {
+    public void outStock(Integer partId, Integer count,Long userId,String repairId) {
         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,priceListId);
+        partLogService.saveLog(partId,count,userId,1,repairId);
 
     }
 
     @Override
-    public void recovery(Integer partId, Integer partCount, Long userId, String repairId,Integer status,Integer priceListId) {
+    public void recovery(Integer partId, Integer partCount, Long userId, String repairId,Integer status) {
         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,priceListId);
+        partLogService.saveLog(partId,partCount,userId,2,repairId);
 
     }
 

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

@@ -76,41 +76,42 @@ public class RepairSupplyService {
         wrapper.eq(PriceList::getStatus,1);
         wrapper.eq(PriceList::getType,0);
         List<PriceList> list = priceListService.list(wrapper);
-        List<PriceList> returnList = new ArrayList<>();
 
         LambdaQueryWrapper<PartLog> wrapper2 = new LambdaQueryWrapper<>();
         wrapper2.eq(PartLog::getRepairId,repairId);
-        if(type == 0 || type == 2){ //出库
+        if(type == 0 ){ //出库
             wrapper2.eq(PartLog::getStatus,1);
         }
         if(type == 1){ //回收
             wrapper2.eq(PartLog::getStatus,2);
         }
-
-        List<PartLog> partLogs = partLogService.list(wrapper2);
         HashMap<Integer,PartLog> map = new HashMap<>();
-        partLogs.forEach(entity -> map.put(entity.getPriceListId(),entity));
-
-        for (PriceList priceList : list) {
-            if(type != 2 && map.get(priceList.getPriceListId()) == null){
-                returnList.add(priceList);
-            }
-            if(type == 2 && map.get(priceList.getPriceListId()) != null){
-                returnList.add(priceList);
-            }
+        if(type != 2){
+            List<PartLog> partLogs = partLogService.list(wrapper2);
+            partLogs.forEach(entity -> map.put(entity.getPartId(),entity));
         }
 
         List<RepairRegisterPartVo> parts = new ArrayList<>();
-        for (PriceList priceList : returnList) {
+        for (PriceList priceList : list) {
             Part part =  partService.getById(priceList.getPartId());
             if(part == null){
                 continue;
             }
             RepairRegisterPartVo vo = new RepairRegisterPartVo();
             vo.setPartName(priceList.getName());
-            vo.setPartCount(priceList.getCount());
+            vo.setPartCount(priceList.getCount() );
             BeanUtils.copyProperties(part,vo);
             BeanUtils.copyProperties(priceList,vo);
+            if(type != 2){
+                PartLog partLog = map.get(part.getPartId());
+                if(partLog != null){
+                    Integer count = partLog.getCount();
+                    vo.setPartCount(priceList.getCount() - count);
+                }
+                if(vo.getPartCount() <=0){
+                    continue;
+                }
+            }
             parts.add(vo);
         }
         return parts;
@@ -133,7 +134,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(),partVo.getPriceListId());
+            partService.outStock(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId());
         }
         priceListService.outStock(repair.getRepairId());
 
@@ -155,7 +156,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(),partVo.getPriceListId());
+            partService.recovery(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId(),repair.getStatus());
         }
         priceListService.recoveryPart(repair.getRepairId());
 

src/main/java/com/fdkankan/sale/vo/response/RepairRegisterPartVo.java

@@ -6,5 +6,4 @@ import lombok.Data;
 @Data
 public class RepairRegisterPartVo extends RepairRegisterPart {
     private String partName;
-    private Integer priceListId;
 }