Merge remote-tracking branch 'origin/demo_' into demo_

platform-dao/src/main/java/com/platform/dao/mapper/sb/SbModelSpareBomMapper.java

@@ -4,10 +4,12 @@ import com.platform.dao.config.MyMapper;
 import com.platform.dao.dto.check.CheckProjectStandardRelationDTO;
 import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
+import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.entity.check.CheckProjectStandardRelation;
 import com.platform.dao.entity.sb.SbModelSpareBom;
 import com.platform.dao.vo.query.check.CheckProjectStandardRelationVO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
+import com.platform.dao.vo.query.store.SpareStoreVO;
 import com.platform.dao.vo.sb.SbModelSpareBomVO;
 import org.springframework.stereotype.Component;
 
@@ -36,5 +38,5 @@ public interface SbModelSpareBomMapper extends MyMapper<SbModelSpareBom> {
 
     void updateBatch(List<SbModelSpareBom> sbModelSpareBomList);
     void updateBatchAll(List<SbModelSpareBom> sbModelSpareBomList);
-    List<SparePartInfoVO> selectLongYanVOList(SbModelSpareBomDTO dto);
+    List<SpareStoreVO> selectLongYanVOList(SpareStoreDTO dto);
 }

platform-dao/src/main/java/com/platform/dao/vo/query/store/SpareStoreVO.java

@@ -74,7 +74,7 @@ public class SpareStoreVO extends BaseVO implements Serializable {
      */
     private String id;
     /**
-     * 主键
+     * 备件编码
      */
     private String no;
     /**

platform-dao/src/main/resources/mapper/sb/SbModelSpareBomMapper.xml

@@ -57,10 +57,10 @@
         </where>
     </select>
 
-    <select id="selectLongYanVOList" parameterType="com.platform.dao.dto.sb.SbModelSpareBomDTO"
-            resultType="com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO">
+    <select id="selectLongYanVOList" parameterType="com.platform.dao.dto.store.SpareStoreDTO"
+            resultType="com.platform.dao.vo.query.store.SpareStoreVO">
         select
-        bom.spare_name as name from t_sb_model_spare_bom bom
+        spare.name as spareName,spare.no as no,spare.ggxh as ggxh from t_sb_model_spare_bom bom join t_spare_part_info spare on bom.spare_id = spare.id
         <where>
             <if test="spareId != null">
                 and bom.spare_id = #{spareId}

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

@@ -6,10 +6,12 @@ import com.platform.dao.dto.lubricationmanage.LubricationPlanStandardRelationDTO
 import com.platform.dao.dto.sb.SbModelDTO;
 import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
+import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.entity.check.CheckProjectStandardRelation;
 import com.platform.dao.entity.sb.SbModelSpareBom;
 import com.platform.dao.vo.query.check.CheckProjectStandardRelationVO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
+import com.platform.dao.vo.query.store.SpareStoreVO;
 import com.platform.dao.vo.sb.SbModelSpareBomVO;
 import com.platform.dao.vo.sb.SbModelVO;
 import com.platform.service.base.IBaseService;
@@ -80,5 +82,5 @@ public interface SbModelSpareBomService extends IBaseService<SbModelSpareBom, Sb
      */
     void modModelByDTO(SbModelSpareBomDTO sbModelSpareBomDTO);
 
-    List<SparePartInfoVO> selectLongYanVOList(SbModelSpareBomDTO dto);
+    List<SpareStoreVO> selectLongYanVOList(SpareStoreDTO dto);
 }

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

@@ -15,6 +15,7 @@ import com.platform.dao.dto.check.CheckStandardDTO;
 import com.platform.dao.dto.part.PartInfoDTO;
 import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
+import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.entity.check.CheckProjectStandardRelation;
 import com.platform.dao.entity.check.CheckStandard;
 import com.platform.dao.entity.part.PartInfo;
@@ -27,6 +28,7 @@ import com.platform.dao.util.CustomExcelImportUtil;
 import com.platform.dao.vo.query.check.CheckProjectStandardRelationVO;
 import com.platform.dao.vo.query.check.CheckStandardVO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
+import com.platform.dao.vo.query.store.SpareStoreVO;
 import com.platform.dao.vo.sb.SbModelSpareBomVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.check.CheckProjectStandardRelationService;
@@ -228,7 +230,7 @@ public class SbModelSpareBomServiceImpl extends BaseServiceImpl<SbModelSpareBomM
     }
 
     @Override
-    public List<SparePartInfoVO> selectLongYanVOList(SbModelSpareBomDTO dto) {
+    public List<SpareStoreVO> selectLongYanVOList(SpareStoreDTO dto) {
         return mapper.selectLongYanVOList(dto);
     }
 }

platform-service/src/main/java/com/platform/service/sqarepartmanage/impl/SparePartUsedServiceImpl.java

@@ -298,7 +298,7 @@ public class SparePartUsedServiceImpl extends BaseServiceImpl<SparePartUsedMappe
 
     @Override
     public void saveLongYanBatch(List<SparePartUsedDTO> sparePartUsedDTOList) {
-        // 待插入更换记录
+        /*// 待插入更换记录
         List<SparePartUsed> saveList = new ArrayList<>();
         // 待修改为历史状态记录ID
         List<String> ids = new ArrayList<>();
@@ -343,7 +343,51 @@ public class SparePartUsedServiceImpl extends BaseServiceImpl<SparePartUsedMappe
             SparePartUsedDTO updDTO = new SparePartUsedDTO();
             updDTO.setTypeIds(ids);
             mapper.updateRecordToOld(updDTO);
+        }*/
+        // 待插入更换记录
+        /*List<SparePartUsed> saveList = new ArrayList<>();
+        // 区分是否bom关联备件
+        for(SparePartUsedDTO sparePartUsedDTO : sparePartUsedDTOList){
+            int isSpecial = sparePartUsedDTO.getIsSpecial() == null ? 0 : sparePartUsedDTO.getIsSpecial();
+            // 获取old id
+            SparePartUsed oldUsed = new SparePartUsed();
+            oldUsed.setSbId(sparePartUsedDTO.getSbId());
+            oldUsed.setSpareId(sparePartUsedDTO.getSpareId());
+            oldUsed.setStatus(SparePartUsedStatusEnum.IN_USE.getValue());
+            oldUsed = mapper.selectOne(oldUsed);
+            if(oldUsed != null){
+                ids.add(oldUsed.getId());
+            }
+            // 封装新增更换记录
+            SparePartUsed entity = BeanConverterUtil.copyObjectProperties(sparePartUsedDTO, SparePartUsed.class);
+            entity.setId(IdGeneratorUtils.getObjectId());
+            entity.setCreatedTime(LocalDateTime.now());
+            OauthUser user = SecurityUtils.getUser();
+            if (user != null) {
+                UserInfo userInfo = user.getUserInfo();
+                entity.setCreatedUserId(userInfo.getUserId());
+                entity.setCreatedUserName(userInfo.getRealName());
+            }
+            LocalDate now = LocalDate.now();
+            entity.setStartDate(now);
+            entity.setIsSpecial(isSpecial);
+            // 计算下次更换时间
+            if(sparePartUsedDTO.getSparePeriod() != null && sparePartUsedDTO.getSparePeriod() > 0){
+                entity.setChangeDate(now.plusDays(sparePartUsedDTO.getSparePeriod()));
+            }
+            saveList.add(entity);
+
+        }
+        // 保存更换记录
+        if(saveList.size() > 0){
+            mapper.insertListforComplex(saveList);
         }
+        // 将之前记录修改为历史和实际更换时间
+        if(ids.size() > 0){
+            SparePartUsedDTO updDTO = new SparePartUsedDTO();
+            updDTO.setTypeIds(ids);
+            mapper.updateRecordToOld(updDTO);
+        }*/
     }
 
     @Override

platform-service/src/main/java/com/platform/service/store/impl/SpareStoreServiceImpl.java

@@ -413,7 +413,7 @@ public class SpareStoreServiceImpl extends BaseServiceImpl<SpareStoreMapper, Spa
             PageHelper.startPage(pageNum, pageSize);
             SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
             sbModelDTO.setSbId(record.getSbId());
-            return new MyPage(sbModelSpareBomService.selectLongYanVOList(sbModelDTO));
+            return new MyPage(sbModelSpareBomService.selectLongYanVOList(record));
         }
         // 2、全部备件的拉取，传入分页数据
         return yongyouService.selectPageList(record,pageNum,pageSize);