1

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

@@ -80,6 +80,17 @@ public class PriceList implements Serializable {
     @TableField("part_id")
     private Integer partId;
 
+    /**
+     * 出库状态0未出库，1已出库
+     */
+    @TableField("out_status")
+    private Integer outStatus;
+
+    /**
+     * 回收状态，0未回收，1已回收
+     */
+    @TableField("recovery_status")
+    private Integer recoveryStatus;
 
 
 }

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

@@ -40,15 +40,6 @@ public class RepairRegisterPart implements Serializable {
     @TableField("part_count")
     private Integer partCount;
 
-    @TableField("status")
-    private Integer status;
-
-    @TableField("recovery_status")
-    private Integer recoveryStatus;
-
-    @TableField("check_status")
-    private Integer checkStatus;
-
     @TableField("create_time")
     private String createTime;
 

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

@@ -29,4 +29,8 @@ public interface IPriceListService extends IService<PriceList> {
     List<PriceList> getByRepairIdAndStatusAndType(String repairId, Integer type);
 
     void delNoCm(String repairId);
+
+    void outStock(String repairId);
+
+    void recoveryPart(String repairId);
 }

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

@@ -16,8 +16,4 @@ import java.util.List;
 public interface IRepairRegisterPartService extends IService<RepairRegisterPart> {
 
     List<RepairRegisterPart> getByRepairId(String repairId);
-
-    void updateStatus(String repairId,Integer status);
-
-    void updateRecoveryStatus(String repairId, Integer status);
 }

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

@@ -80,4 +80,22 @@ public class PriceListServiceImpl extends ServiceImpl<IPriceListMapper, PriceLis
         wrapper.eq(PriceList::getStatus,0);
         this.remove(wrapper);
     }
+
+    @Override
+    public void outStock(String repairId) {
+        LambdaUpdateWrapper<PriceList> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(PriceList::getRepairId,repairId);
+        wrapper.eq(PriceList::getStatus,1);
+        wrapper.set(PriceList::getOutStatus,1);
+        this.update(wrapper);
+    }
+
+    @Override
+    public void recoveryPart(String repairId) {
+        LambdaUpdateWrapper<PriceList> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(PriceList::getRepairId,repairId);
+        wrapper.eq(PriceList::getStatus,1);
+        wrapper.set(PriceList::getRecoveryStatus,1);
+        this.update(wrapper);
+    }
 }

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

@@ -28,19 +28,5 @@ public class RepairRegisterPartServiceImpl extends ServiceImpl<IRepairRegisterPa
         return this.list(wrapper);
     }
 
-    @Override
-    public void updateStatus(String repairId,Integer status) {
-        LambdaUpdateWrapper<RepairRegisterPart> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(RepairRegisterPart::getRepairId,repairId);
-        wrapper.set(RepairRegisterPart::getStatus,status);
-        this.update(wrapper);
-    }
 
-    @Override
-    public void updateRecoveryStatus(String repairId, Integer status) {
-        LambdaUpdateWrapper<RepairRegisterPart> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(RepairRegisterPart::getRepairId,repairId);
-        wrapper.set(RepairRegisterPart::getRecoveryStatus,status);
-        this.update(wrapper);
-    }
 }

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

@@ -49,6 +49,8 @@ public class RepairSupplyService {
     IRepairRegisterPartService repairRegisterPartService;
     @Autowired
     IPartService partService;
+    @Autowired
+    IPriceListService priceListService;
 
     /**
      * 维修备件管理 供应链
@@ -65,24 +67,30 @@ public class RepairSupplyService {
     }
 
     public List<RepairRegisterPartVo> partInfo(String repairId,Integer type) {
-        LambdaQueryWrapper<RepairRegisterPart> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(RepairRegisterPart::getRepairId,repairId);
+        LambdaQueryWrapper<PriceList> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PriceList::getRepairId,repairId);
+        wrapper.eq(PriceList::getStatus,1);
+        wrapper.eq(PriceList::getType,0);
+
         if(type == 0){
-            wrapper.eq(RepairRegisterPart::getStatus,0);
+            wrapper.eq(PriceList::getOutStatus,0);
         }
-        if(type == 1){
-            wrapper.eq(RepairRegisterPart::getRecoveryStatus,0);
+        if(type == 0){
+            wrapper.eq(PriceList::getRecoveryStatus,0);
         }
-        List<RepairRegisterPart> list = repairRegisterPartService.list(wrapper);
+        List<PriceList> list = priceListService.list(wrapper);
+
         List<RepairRegisterPartVo> parts = new ArrayList<>();
-        for (RepairRegisterPart repairRegisterPart : list) {
-            Part part =  partService.getById(repairRegisterPart.getPartId());
+        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());
             BeanUtils.copyProperties(part,vo);
-            BeanUtils.copyProperties(repairRegisterPart,vo);
+            BeanUtils.copyProperties(priceList,vo);
             parts.add(vo);
         }
         return parts;
@@ -101,7 +109,7 @@ public class RepairSupplyService {
         for (RepairRegisterPartVo partVo : partVoList) {
             partService.outStock(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId());
         }
-        repairRegisterPartService.updateStatus(repair.getRepairId(),1);
+        priceListService.outStock(repair.getRepairId());
 
         repairLogService.saveBySysUser(userId,param.getRepairId(),6,"备件出库");
     }
@@ -119,7 +127,7 @@ public class RepairSupplyService {
         for (RepairRegisterPartVo partVo : partVoList) {
             partService.recovery(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId());
         }
-        repairRegisterPartService.updateRecoveryStatus(repair.getRepairId(),1);
+        priceListService.recoveryPart(repair.getRepairId());
 
         repairLogService.saveBySysUser(userId,param.getRepairId(),7,"备件回收");
     }