|
@@ -10,6 +10,7 @@ import com.platform.common.exception.BusinessException;
|
|
|
import com.platform.common.model.UserInfo;
|
|
|
import com.platform.common.util.*;
|
|
|
import com.platform.dao.bean.MyPage;
|
|
|
+import com.platform.dao.dto.sb.SbModelSpareBomDTO;
|
|
|
import com.platform.dao.dto.store.*;
|
|
|
import com.platform.dao.entity.purchase.PurchaseDispatchOrder;
|
|
|
import com.platform.dao.entity.purchase.PurchaseDispatchOrderList;
|
|
@@ -24,6 +25,7 @@ import com.platform.dao.enums.*;
|
|
|
import com.platform.dao.mapper.purchase.PurchaseDispatchOrderListMapper;
|
|
|
import com.platform.dao.mapper.purchase.PurchaseDispatchOrderMapper;
|
|
|
import com.platform.dao.mapper.purchase.PurchaseListMapper;
|
|
|
+import com.platform.dao.mapper.sb.SbModelSpareBomMapper;
|
|
|
import com.platform.dao.mapper.sqarepartmanage.SparePartInfoMapper;
|
|
|
import com.platform.dao.mapper.store.InStoreDetailMapper;
|
|
|
import com.platform.dao.mapper.store.InStoreFormMapper;
|
|
@@ -38,6 +40,7 @@ import com.platform.dao.vo.query.store.StoreVO;
|
|
|
import com.platform.dao.vo.repair.RepairApplicationFormVO;
|
|
|
import com.platform.dao.vo.report.InStoreFormReportVO;
|
|
|
import com.platform.dao.vo.report.RepairReport24VO;
|
|
|
+import com.platform.dao.vo.sb.SbModelSpareBomVO;
|
|
|
import com.platform.service.base.impl.BaseServiceImpl;
|
|
|
import com.platform.service.business.PurchaseBusinessService;
|
|
|
import com.platform.service.event.WorkplaceBacklogEvent;
|
|
@@ -73,6 +76,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
|
|
|
private StoreService storeService;
|
|
|
private SpareBackFormMapper spareBackFormMapper;
|
|
|
private SparePartInfoMapper sparePartInfoMapper;
|
|
|
+ private SbModelSpareBomMapper sbModelSpareBomMapper;
|
|
|
|
|
|
@Override
|
|
|
public int batchDelete(List<String> ids) {
|
|
@@ -93,6 +97,13 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
|
|
|
UserInfo userInfo = SecurityUtils.getUserInfo();
|
|
|
model.setUserId(userInfo.getUserId());
|
|
|
}
|
|
|
+ if(StringUtils.isNotEmpty(model.getModel())){
|
|
|
+ SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
|
|
|
+ sbModelDTO.setKeyword(model.getModel());
|
|
|
+ List<SbModelSpareBomVO> modelList = sbModelSpareBomMapper.selectVOList(sbModelDTO);
|
|
|
+ List<String> spareList = modelList.stream().map(item -> item.getSpareId()).distinct().collect(Collectors.toList());
|
|
|
+ model.setSpareIdList(spareList);
|
|
|
+ }
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
return new MyPage(mapper.selectList(model));
|
|
|
}
|
|
@@ -239,6 +250,13 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
|
|
|
|
|
|
@Override
|
|
|
public AbstractPageResultBean<InStoreFormVO> getInStoreFormCollect(InStoreFormDTO dto, Integer pageNum,Integer pageSize) {
|
|
|
+ if(StringUtils.isNotEmpty(dto.getModel())){
|
|
|
+ SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
|
|
|
+ sbModelDTO.setKeyword(dto.getModel());
|
|
|
+ List<SbModelSpareBomVO> modelList = sbModelSpareBomMapper.selectVOList(sbModelDTO);
|
|
|
+ List<String> spareList = modelList.stream().map(item -> item.getSpareId()).distinct().collect(Collectors.toList());
|
|
|
+ dto.setSpareIdList(spareList);
|
|
|
+ }
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
|
List<InStoreFormVO> list = mapper.getInStoreFormCollect(dto);
|
|
|
return new MyPage<>(list);
|