Merge branch 'demo_' of http://124.71.196.186:8888/hfxc226/hitch-manage into demo_

platform-rest/src/main/java/com/platform/rest/controller/sb/SbInfoController.java

@@ -13,8 +13,10 @@ import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.sb.SbChangeRecordDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.sb.SbMeasureLogDTO;
+import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.sb.SbMeasureLog;
+import com.platform.dao.entity.sb.SbModelSpareBom;
 import com.platform.dao.entity.sb.SbType;
 import com.platform.dao.enums.SbMeasureLogOtherTypeEnum;
 import com.platform.dao.enums.SysRoleCodeEnum;
@@ -684,7 +686,7 @@ public class SbInfoController {
     }
 
     @GetMapping("/get/synchronous/sb")
-    public R getSynchronousSb(SbInfoDTO dto, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+    public R getSynchronousSb(SbModelSpareBomDTO dto, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
 //        List<String> spareIds = dto.getSpareIds();
         return new R(sbInfoService.getSynchronousSb(dto,pageNum,pageSize));
     }

platform-service/src/main/java/com/platform/service/sb/SbInfoService.java

@@ -5,6 +5,7 @@ import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.sb.SbChangeRecordDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
+import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.sb.SbTypeDTO;
 import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.vo.report.SbInfoTypeReportVO;
@@ -25,7 +26,7 @@ import java.util.Map;
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface SbInfoService extends IBaseService<SbInfo, SbInfoDTO> {
-    AbstractPageResultBean<SbInfoVO> getSynchronousSb(SbInfoDTO dto,Integer pageNum,Integer pageSize);
+    AbstractPageResultBean<SbInfoVO> getSynchronousSb(SbModelSpareBomDTO dto, Integer pageNum, Integer pageSize);
 
     AbstractPageResultBean<YiBiaoHisroryVO> getPositionNoHistory(SbChangeRecordDTO dto,Integer pageNum,Integer pageSize);
 

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -142,13 +142,13 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     private final FillGatherTaskDetailMapper fillGatherTaskDetailMapper;
 
     @Override
-    public AbstractPageResultBean<SbInfoVO> getSynchronousSb(SbInfoDTO dto,Integer pageNum,Integer pageSize) {
-        SbModelSpareBomDTO sbModelSpareBomDTO = new SbModelSpareBomDTO();
-        sbModelSpareBomDTO.setSbId(dto.getId());
+    public AbstractPageResultBean<SbInfoVO> getSynchronousSb(SbModelSpareBomDTO dto,Integer pageNum,Integer pageSize) {
+//        SbModelSpareBomDTO sbModelSpareBomDTO = new SbModelSpareBomDTO();
+//        sbModelSpareBomDTO.setSbId(dto.getId());
 
 //        SbModelSpareBomDTO dto = new SbModelSpareBomDTO();
 //        dto.setSpareIds(spareIds);
-        List<SbModelSpareBomVO> list = sbModelSpareBomMapper.selectVOList(sbModelSpareBomDTO);
+        List<SbModelSpareBomVO> list = sbModelSpareBomMapper.selectVOList(dto);
         List<String> needIds = new ArrayList<>();
         List<String> notSbIds = new ArrayList<>();
         if (list!=null &&list.size()>0) {
@@ -172,21 +172,22 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         List<String> sbIds = list.stream().map(SbModelSpareBomVO::getSbId).distinct().collect(Collectors.toList());
         SbInfoDTO sbInfoDTO = new SbInfoDTO();
 
-        sbInfoDTO.setNotSbIds(sbIds);
+//        sbInfoDTO.setNotSbIds(sbIds);
 
-        List<SbInfoVO> sbInfoVOs = mapper.selectVOList(sbInfoDTO);
+        PageHelper.startPage(pageNum,pageSize);
+        List<SbInfoVO> sbInfoVOs = mapper.selectVOList(null);
 
-        sbInfoDTO.setNotSbIds(null);
-        List<SbInfoVO> infoVOS = new ArrayList<>();
-        if (needIds!=null&&needIds.size()>0) {
-            sbInfoDTO.setSbIds(needIds);
-            infoVOS = mapper.selectVOList(sbInfoDTO);
-        }
-        if (infoVOS!=null){
-            infoVOS.addAll(sbInfoVOs);
-        }
-        AbstractPageResultBean<SbInfoVO> pageResultBean = getPageInfo(pageNum,pageSize,infoVOS);
-        return pageResultBean;
+//        sbInfoDTO.setNotSbIds(null);
+//        List<SbInfoVO> infoVOS = new ArrayList<>();
+//        if (needIds!=null&&needIds.size()>0) {
+//            sbInfoDTO.setSbIds(needIds);
+//            infoVOS = mapper.selectVOList(sbInfoDTO);
+//        }
+//        if (infoVOS!=null){
+//            infoVOS.addAll(sbInfoVOs);
+//        }
+        AbstractPageResultBean<SbInfoVO> pageResultBean = getPageInfo(pageNum,pageSize,sbInfoVOs);
+        return new MyPage<>(sbInfoVOs);
     }
 
     private static AbstractPageResultBean<SbInfoVO> getPageInfo(Integer pageNum, Integer pageSize, List<SbInfoVO> list){

platform-service/src/main/java/com/platform/service/sb/impl/SbModelSpareBomServiceImpl.java

@@ -68,36 +68,44 @@ public class SbModelSpareBomServiceImpl extends BaseServiceImpl<SbModelSpareBomM
     @Override
     public void synchronousAdd(SbModelSpareBomDTO dto) {
         List<String> sbIds = dto.getSbIds();
-        SbModelSpareBomDTO sbModelSpareBomDTO = new SbModelSpareBomDTO();
-        sbModelSpareBomDTO.setSbId(dto.getSbId());
-        List<SbModelSpareBomVO> sbModelSpareBomVOS = sbModelSpareBomMapper.selectVOList(sbModelSpareBomDTO);
+        for (String sbId:sbIds){
+            if (sbId.equals(dto.getSbId())){
+                sbIds.remove(sbId);
+                break;
+            }
+        }
+        SbModelSpareBom sbModelSpareBom = new SbModelSpareBom();
+        sbModelSpareBom.setSbId(dto.getSbId());
+        List<SbModelSpareBom> sbModelSpareBomVOS = sbModelSpareBomMapper.select(sbModelSpareBom);
         List<SparePartInfoDTO> sparePartInfoDTOS = new ArrayList<>();
-        for (SbModelSpareBomVO vo:sbModelSpareBomVOS){
+        for (SbModelSpareBom vo:sbModelSpareBomVOS){
             SparePartInfoDTO sparePartInfoDTO = new SparePartInfoDTO();
             sparePartInfoDTO.setId(vo.getSpareId());
             sparePartInfoDTO.setNo(vo.getNo());
             sparePartInfoDTO.setGgxh(vo.getGgxh());
+            sparePartInfoDTO.setName(vo.getSpareName());
             sparePartInfoDTOS.add(sparePartInfoDTO);
         }
         List<String> spareIds = sparePartInfoDTOS.stream().map(SparePartInfoDTO::getId).collect(Collectors.toList());
         Weekend<SbModelSpareBom> weekend = new Weekend(SbModelSpareBom.class);
         WeekendCriteria<SbModelSpareBom,Object> weekendCriteria = weekend.weekendCriteria();
-        if (dto.isCover()) {
+        if (!dto.isCover()) {
             weekendCriteria.andIn(SbModelSpareBom::getSpareId, spareIds);
         }
         weekendCriteria.andIn(SbModelSpareBom::getSbId,sbIds);
         sbModelSpareBomMapper.deleteByExample(weekend);
         List<SbModelSpareBom> boms = new ArrayList<>();
+        UserInfo userInfo = SecurityUtils.getUserInfo();
         for (String sbId:sbIds){
             for (SparePartInfoDTO detailDTO:sparePartInfoDTOS){
-                packageBom(boms,detailDTO,sbId);
+                packageBom(boms,detailDTO,sbId,userInfo);
             }
         }
         if (boms!=null && boms.size()>0){
             sbModelSpareBomMapper.insertListforComplex(boms);
         }
     }
-    private void packageBom(List<SbModelSpareBom> boms, SparePartInfoDTO dto,String sbId){
+    private void packageBom(List<SbModelSpareBom> boms, SparePartInfoDTO dto,String sbId,UserInfo userInfo){
         SbModelSpareBom sbModelSpareBom = new SbModelSpareBom();
         sbModelSpareBom.setSpareId(dto.getId());
         sbModelSpareBom.setSbId(sbId);
@@ -107,6 +115,12 @@ public class SbModelSpareBomServiceImpl extends BaseServiceImpl<SbModelSpareBomM
         sbModelSpareBom.setSpareName(dto.getName());
         sbModelSpareBom.setModelId(sbId);
         sbModelSpareBom.setNo(dto.getNo());
+        sbModelSpareBom.setCreatedUserId(userInfo.getUserId());
+        sbModelSpareBom.setCreatedUserName(userInfo.getUsername());
+        sbModelSpareBom.setCreatedTime(LocalDateTime.now());
+        sbModelSpareBom.setUpdateUserId(userInfo.getUserId());
+        sbModelSpareBom.setUpdateUserName(userInfo.getUsername());
+        sbModelSpareBom.setUpdateTime(LocalDateTime.now());
         boms.add(sbModelSpareBom);
     }