备件更换

platform-dao/src/main/java/com/platform/dao/dto/sqarepartmanage/SparePartUsedDTO.java

@@ -152,4 +152,9 @@ public class SparePartUsedDTO extends BaseDTO implements Serializable {
 
     private List<String> typeIds;
 
+    /**
+     * 龙岩新增字段
+     */
+    private Integer sparePeriod; // 备件寿命
+
 }

platform-dao/src/main/java/com/platform/dao/entity/sb/SbModelSpareBom.java

@@ -103,4 +103,11 @@ public class SbModelSpareBom implements Serializable {
     @Transient
     private DataScope dataScope;
 
+    /**
+     * 龙岩新增字段
+     */
+    private String spareName; // 备件名称
+    private String ggxh;  // 规格型号
+    private Integer sparePeriod; // 备件寿命期限（天）
+
 }

platform-dao/src/main/java/com/platform/dao/entity/sqarepartmanage/SparePartUsed.java

@@ -129,15 +129,17 @@ public class SparePartUsed implements Serializable {
      */
     @Transient
     private String sbName;
-    /**
-     * 备件名称
-     */
-    @Transient
-    private String spareName;
     /**
      * 数据权限
      */
     @Transient
     private DataScope dataScope;
 
+    /**
+     * 龙岩新增字段
+     */
+    private String spareName;  // 备件名称
+    private String ggxh; // 规格型号
+    private Integer isSpecial; // 是否关联设备 1 是 0 否
+
 }

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

@@ -7,6 +7,7 @@ import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 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.sb.SbModelSpareBomVO;
 import org.springframework.stereotype.Component;
 
@@ -35,4 +36,5 @@ public interface SbModelSpareBomMapper extends MyMapper<SbModelSpareBom> {
 
     void updateBatch(List<SbModelSpareBom> sbModelSpareBomList);
     void updateBatchAll(List<SbModelSpareBom> sbModelSpareBomList);
+    List<SparePartInfoVO> selectLongYanVOList(SbModelSpareBomDTO dto);
 }

platform-dao/src/main/java/com/platform/dao/mapper/sqarepartmanage/SparePartUsedMapper.java

@@ -79,4 +79,10 @@ public interface SparePartUsedMapper extends MyMapper<SparePartUsed> {
      * @return
      */
     List<SparePartUsedVO> selectUpdateAlert(SparePartUsedDTO model);
+
+    /**
+     * 更改为历史记录和记录实际更换时间
+     * @param model
+     */
+    void updateRecordToOld(SparePartUsedDTO model);
 }

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

@@ -0,0 +1,14 @@
+package com.platform.dao.vo.query.store;
+
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class LongYanSpareVO implements Serializable {
+
+    private String spareId;    // 备件ID
+    private String spareName; // 备件名称
+    private String ggxh;  // 规格型号
+    private Integer sparePeriod; // 备件寿命(天）
+    private String remark; // 备注
+}

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

@@ -57,6 +57,20 @@
         </where>
     </select>
 
+    <select id="selectLongYanVOList" parameterType="com.platform.dao.dto.sb.SbModelSpareBomDTO"
+            resultType="com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO">
+        select
+        bom.spare_name as name from t_sb_model_spare_bom bom
+        <where>
+            <if test="spareId != null">
+                and bom.spare_id = #{spareId}
+            </if>
+            <if test="sbId != null">
+                and bom.sb_id = #{sbId}
+            </if>
+        </where>
+    </select>
+
     <update id="updateBatch" parameterType="java.util.List">
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update t_sb_model_spare_bom

platform-dao/src/main/resources/mapper/sqarepartmanage/SparePartUsedMapper.xml

@@ -106,6 +106,7 @@
         left join t_spare_part_info spareInfo on used.spare_id = spareInfo.id
         where used.repair_id = #{repairId}
     </select>
+
     <select id="selectNameById" parameterType="java.lang.Object" resultType="java.lang.String">
         select spareInfo.name
         from t_spare_part_used used
@@ -158,9 +159,9 @@
     </select>
 
     <select id="selectUpdateAlert" parameterType="com.platform.dao.dto.sqarepartmanage.SparePartUsedDTO" resultType="com.platform.dao.vo.spare.SparePartUsedVO">
-        select sb.name as sbName,spare.name as spareName,usd.start_date,usd.change_date,usd.repair_no,usd.created_user_name from t_spare_part_used usd
+        select sb.name as sbName,usd.spareName,usd.start_date,usd.change_date,usd.repair_no,usd.created_user_name from t_spare_part_used usd
         join t_sb_info sb on usd.sb_id = sb.id
-        join t_spare_part_info spare on usd.spare_id = spare.id where usd.status = 1
+        where usd.status = 1
         <if test="changeDate != null">
             and usd.change_date <![CDATA[ <= ]]> #{changeDate}
         </if>
@@ -174,4 +175,14 @@
             </foreach>
         </if>
     </select>
+
+    <update id="updateRecordToOld" parameterType="com.platform.dao.dto.sqarepartmanage.SparePartUsedDTO">
+        <if test="typeIds != null and typeIds.size > 0">
+            update t_spare_part_used set status = 2,real_change_date = now() where
+             id in
+            <foreach item="item" index="index" collection="typeIds" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </update>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/sqarepartmanage/SparePartUsedController.java

@@ -72,6 +72,19 @@ public class SparePartUsedController {
         return new R();
     }
 
+    /**
+     * 批量更换备件记录
+     *
+     * @param sparePartUsedDTOList 备件使用DTO
+     * @return R
+     */
+    @SysLog("更换备件")
+    @PostMapping("/longyan/batch")
+    public R saveLongyan(@Validated({AddGroup.class}) @RequestBody List<SparePartUsedDTO> sparePartUsedDTOList) throws Exception {
+        sparePartUsedService.saveLongYanBatch(sparePartUsedDTOList);
+        return new R();
+    }
+
     /**
      * 关联备件
      *
@@ -85,6 +98,18 @@ public class SparePartUsedController {
         return new R<>(list);
     }
 
+    /**
+     * 关联龙岩备件
+     * @param repairId 维修单-维修项目关联DTO
+     * @return R
+     */
+    @SysLog("维修项目bom")
+    @GetMapping("repair/longyan/{repairId}")
+    public R selectLongYanUsedListByRepairId(@PathVariable String repairId) {
+        List<SparePartUsed> list =  sparePartUsedService.selectLongYanByRepairId(repairId);
+        return new R<>(list);
+    }
+
     @SysLog("维修项目bom")
     @GetMapping("list/{sbId}")
     public R selectSparePartUsedListBySbId(@PathVariable String sbId) {

platform-rest/src/main/java/com/platform/rest/controller/store/SpareStoreController.java

@@ -1,12 +1,15 @@
 package com.platform.rest.controller.store;
 
 import com.platform.common.util.R;
+import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.entity.sqarepartmanage.SparePartInfo;
 import com.platform.dao.entity.store.SpareStore;
 import com.platform.dao.entity.store.Store;
 import com.platform.dao.mapper.store.StoreMapper;
 import com.platform.dao.vo.export.sqarepartmanage.ExportSparePartInfoVO;
+import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
+import com.platform.dao.vo.query.store.LongYanSpareVO;
 import com.platform.dao.vo.spare.SpareStoreInfoVO;
 import com.platform.rest.controller.sqarepartmanage.SpareInfo;
 import com.platform.rest.controller.sqarepartmanage.SpareStoreTest;
@@ -138,6 +141,12 @@ public class SpareStoreController {
         return new R<>(spareStoreService.selectPageList(spareStoreDTO, pageNum, pageSize));
     }
 
+    @GetMapping("/longyan/page")
+    public R<AbstractPageResultBean<SparePartInfoVO>> queryLongYan(SparePartInfoDTO sparePartInfoDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        // 备件库存
+        return new R<>(spareStoreService.selectLongYanPageList(sparePartInfoDTO, pageNum, pageSize));
+    }
+
     /**
      * 获取项目部仓库汇总分页
      * 统计某个分公司下某个项目部的总仓库库存，这个就是各个仓库累加的结果

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

@@ -9,6 +9,7 @@ import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 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.sb.SbModelSpareBomVO;
 import com.platform.dao.vo.sb.SbModelVO;
 import com.platform.service.base.IBaseService;
@@ -78,4 +79,6 @@ public interface SbModelSpareBomService extends IBaseService<SbModelSpareBom, Sb
      * @param sbModelSpareBomDTO
      */
     void modModelByDTO(SbModelSpareBomDTO sbModelSpareBomDTO);
+
+    List<SparePartInfoVO> selectLongYanVOList(SbModelSpareBomDTO dto);
 }

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

@@ -26,6 +26,7 @@ import com.platform.dao.mapper.sb.SbModelSpareBomMapper;
 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.sb.SbModelSpareBomVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.check.CheckProjectStandardRelationService;
@@ -225,4 +226,9 @@ public class SbModelSpareBomServiceImpl extends BaseServiceImpl<SbModelSpareBomM
         }
         super.modModelByDTO(model);
     }
+
+    @Override
+    public List<SparePartInfoVO> selectLongYanVOList(SbModelSpareBomDTO dto) {
+        return mapper.selectLongYanVOList(dto);
+    }
 }

platform-service/src/main/java/com/platform/service/sqarepartmanage/SparePartUsedService.java

@@ -67,6 +67,8 @@ public interface SparePartUsedService extends IBaseService<SparePartUsed, SpareP
 
     List<SparePartUsedVO> selectSparePartUsedListByRepairId(String repairId);
 
+    List<SparePartUsed> selectLongYanByRepairId(String repairId);
+
     /**
      * 报表数据
      * @param sparePartUsedDTO
@@ -93,6 +95,13 @@ public interface SparePartUsedService extends IBaseService<SparePartUsed, SpareP
      */
     void saveBatch(List<SparePartUsedDTO> sparePartUsedDTOList);
 
+    /**
+     * 批量插入
+     * @param sparePartUsedDTOList
+     * @return
+     */
+    void saveLongYanBatch(List<SparePartUsedDTO> sparePartUsedDTOList);
+
     /**
      * 设备备件更换
      * @param records

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

@@ -203,6 +203,13 @@ public class SparePartUsedServiceImpl extends BaseServiceImpl<SparePartUsedMappe
         return mapper.selectSparePartUsedListByRepairId(repairId);
     }
 
+    @Override
+    public List<SparePartUsed> selectLongYanByRepairId(String repairId) {
+        SparePartUsed queryUsed = new SparePartUsed();
+        queryUsed.setRepairId(repairId);
+        return mapper.select(queryUsed);
+    }
+
     @Override
     public List<SparePartInfoReportVO> getMonthReport(SparePartUsedDTO sparePartUsedDTO, Integer searchYear, LocalDate startMonth, LocalDate endMonth) {
         List<Map<String, LocalDateTime>> monthStartAndEndList = null;
@@ -289,6 +296,56 @@ public class SparePartUsedServiceImpl extends BaseServiceImpl<SparePartUsedMappe
         }
     }
 
+    @Override
+    public void saveLongYanBatch(List<SparePartUsedDTO> sparePartUsedDTOList) {
+        // 待插入更换记录
+        List<SparePartUsed> saveList = new ArrayList<>();
+        // 待修改为历史状态记录ID
+        List<String> ids = 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
     public synchronized void updateSpare(List<SparePartUsedDTO> records) {
         for(SparePartUsedDTO sparePartUsedDTO : records){
@@ -351,7 +408,7 @@ public class SparePartUsedServiceImpl extends BaseServiceImpl<SparePartUsedMappe
             record.setKeyword(record.getKeyword().trim());
         }
         // 根据备件类型查询
-        if (StringUtils.isNotBlank(record.getTypeId())) {
+        /*if (StringUtils.isNotBlank(record.getTypeId())) {
             Weekend<SpareType> weekend = new Weekend<>(SpareType.class);
             WeekendCriteria<SpareType, Object> weekendCriteria = weekend.weekendCriteria();
             weekendCriteria.andEqualTo(SpareType::getParentId, record.getTypeId());
@@ -364,7 +421,7 @@ public class SparePartUsedServiceImpl extends BaseServiceImpl<SparePartUsedMappe
                 });
             }
             record.setTypeIds(typeIds);
-        }
+        }*/
         return new MyVOPage<>(mapper.selectUpdateAlert(record));
     }
 

platform-service/src/main/java/com/platform/service/store/SpareStoreService.java

@@ -1,5 +1,8 @@
 package com.platform.service.store;
 
+import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
+import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
+import com.platform.dao.vo.query.store.LongYanSpareVO;
 import com.platform.dao.vo.query.store.SpareStoreVO;
 import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.entity.store.SpareStore;
@@ -72,4 +75,13 @@ public interface SpareStoreService extends IBaseService<SpareStore, SpareStoreDT
     SpareStoreInfoVO getAllSpareStoreInfoVO(String storeId);
 
     void genMinStockWarn();
+
+    /**
+     * 龙岩备件列表分页
+     * @param record
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    AbstractPageResultBean<SparePartInfoVO> selectLongYanPageList(SparePartInfoDTO record, int pageNum, int pageSize);
 }

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

@@ -2,25 +2,22 @@ package com.platform.service.store.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.cache.ConfigCache;
 import com.platform.common.constant.CommonConstants;
 import com.platform.common.enums.DataFilterTypeEnum;
 import com.platform.common.exception.BusinessException;
-import com.platform.common.util.*;
+import com.platform.common.util.IdGeneratorUtils;
+import com.platform.common.util.SpringContextHolder;
+import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.sqarepartmanage.SpareTypeDTO;
-import com.platform.dao.dto.store.InStoreFormDTO;
-import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.dto.store.StoreDTO;
-import com.platform.dao.entity.sqarepartmanage.SparePartInfo;
 import com.platform.dao.entity.sqarepartmanage.SpareType;
 import com.platform.dao.entity.store.SpareStore;
 import com.platform.dao.entity.store.Store;
@@ -28,29 +25,26 @@ import com.platform.dao.enums.StoreLevelEnum;
 import com.platform.dao.enums.SysConfigEnum;
 import com.platform.dao.enums.WorkplaceBacklogDetailTypeEnum;
 import com.platform.dao.enums.WorkplaceBacklogTypeEnum;
-import com.platform.dao.mapper.sqarepartmanage.SparePartInfoMapper;
 import com.platform.dao.mapper.sqarepartmanage.SparePartUsedMapper;
-import com.platform.dao.mapper.sqarepartmanage.SpareTypeMapper;
 import com.platform.dao.mapper.store.InStoreFormMapper;
 import com.platform.dao.mapper.store.OutStoreFormMapper;
 import com.platform.dao.mapper.store.SpareStoreMapper;
 import com.platform.dao.mapper.store.StoreMapper;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
-import com.platform.dao.vo.query.store.*;
+import com.platform.dao.vo.query.store.SpareStoreVO;
+import com.platform.dao.vo.query.store.StoreVO;
 import com.platform.dao.vo.sb.SbModelSpareBomVO;
 import com.platform.dao.vo.spare.SparePartUsedVO;
 import com.platform.dao.vo.spare.SpareStoreInfoVO;
-import com.platform.dao.vo.spare.SpareTypeVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.sb.SbModelSpareBomService;
 import com.platform.service.sqarepartmanage.SpareTypeService;
 import com.platform.service.store.SpareStoreService;
 import com.platform.service.store.StoreService;
-import com.platform.service.upms.SysDeptService;
-import com.platform.service.upms.SysUserDeptService;
 import com.platform.service.util.CodeFileUtils;
+import com.platform.service.yongyou.YongyouService;
 import lombok.AllArgsConstructor;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -61,7 +55,6 @@ import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -81,16 +74,13 @@ public class SpareStoreServiceImpl extends BaseServiceImpl<SpareStoreMapper, Spa
     private StoreService storeService;
     private SpareTypeService spareTypeService;
     private final Environment environment;
-    private SysUserDeptService sysUserDeptService;
-    private SysDeptService sysDeptService;
     private SbModelSpareBomService sbModelSpareBomService;
     private SparePartUsedMapper sparePartUsedMapper;
     private SpareStoreMapper spareStoreMapper;
-    private SpareTypeMapper spareTypeMapper;
     private InStoreFormMapper inStoreFormMapper;
     private OutStoreFormMapper outStoreFormMapper;
     private StoreMapper storeMapper;
-    private SparePartInfoMapper sparePartInfoMapper;
+    private YongyouService yongyouService;
 
     @Override
     public SpareStoreVO getDetail(Object id) {
@@ -416,6 +406,18 @@ public class SpareStoreServiceImpl extends BaseServiceImpl<SpareStoreMapper, Spa
         }
     }
 
+    @Override
+    public AbstractPageResultBean<SparePartInfoVO> selectLongYanPageList(SparePartInfoDTO record, int pageNum, int pageSize) {
+        // 1、是否是关联备件的获取
+        if(record.getIsSpecial() != null && record.getIsSpecial() == 1){
+            PageHelper.startPage(pageNum, pageSize);
+            SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
+            sbModelDTO.setSbId(record.getSbId());
+            return new MyPage(sbModelSpareBomService.selectLongYanVOList(sbModelDTO));
+        }
+        // 2、全部备件的拉取，传入分页数据
+        return yongyouService.selectPageList(record,pageNum,pageSize);
+    }
 
 
 }