Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-sb

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

@@ -29,6 +29,7 @@ public interface SbModelSpareBomMapper extends MyMapper<SbModelSpareBom> {
     List<SbModelSpareBomVO> selectList(SbModelSpareBomDTO dto);
 
     List<SbModelSpareBomVO> selectVOList(SbModelSpareBomDTO dto);
+    List<SbModelSpareBomVO> selectVOList1(SbModelSpareBomDTO dto);
 
     List<SbModelSpareBomVO> selectExportList(SparePartInfoDTO sparePartInfoDTO);
 

platform-dao/src/main/java/com/platform/dao/vo/sb/SbModelSpareBomVO.java

@@ -24,6 +24,15 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class SbModelSpareBomVO extends BaseVO implements Serializable {
 
+    /**
+     * 预计更换日期
+     */
+    private LocalDate changeDate;
+    /**
+     * 实际更换日期
+     */
+    private LocalDate realChangeDate;
+
     /**
      * 计划周期
      */

platform-dao/src/main/java/com/platform/dao/vo/sb/SbTreeVO.java

@@ -24,8 +24,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbTreeVO extends BaseVO implements Serializable {
+    private Integer status;
     private String name;
     private String id;
+    private String model;
     /**
      * 子设备集合
      */
@@ -39,4 +41,6 @@ public class SbTreeVO extends BaseVO implements Serializable {
      */
     private List<SbModelSpareBomVO> sbModelSpareBomVOList;
 
+    private BigDecimal spareNum;
+
 }

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

@@ -78,4 +78,35 @@
             where id = #{item.id}
         </foreach>
     </update>
+
+    <select id="selectVOList1" parameterType="com.platform.dao.dto.sb.SbModelSpareBomDTO"
+            resultType="com.platform.dao.vo.sb.SbModelSpareBomVO">
+        select
+        partInfo.name as spareName,used.change_date,used.real_change_date,
+        <include refid="Left_Column"/>
+        from t_sb_model_spare_bom bom
+        LEFT JOIN t_sb_info sbInfo ON bom.sb_id = sbInfo.id
+        LEFT JOIN t_part_info part on bom.sb_part_id = part.id
+        left join t_spare_part_info partInfo on bom.spare_id = partInfo.id
+        left join t_spare_part_used used on used.spare_id=bom.spare_id
+        <where>
+            <if test="spareId != null">
+                and bom.spare_id = #{spareId}
+            </if>
+            <if test="sbId != null">
+                and bom.sb_id = #{sbId}
+            </if>
+            <if test="isSpecial != null">
+                and partInfo.is_special = #{isSpecial}
+            </if>
+            <if test="keyword != null and keyword != ''">
+                and (
+                sbInfo.no like concat('%',#{keyword},'%')
+                or sbInfo.name like concat('%',#{keyword},'%')
+                or sbInfo.model like concat('%',#{keyword},'%')
+                or sbInfo.zbh like concat('%',#{keyword},'%')
+                )
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -602,13 +602,16 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         SbInfoVO sbInfoVO=sbInfoMapper.getById(sbInfoDTO.getId());
         List<SbInfoVO> ids=sbInfoMapper.getSubSb(sbInfoDTO);
         SbTreeVO sbTreeVO = new SbTreeVO();
+        sbTreeVO.setModel(sbInfoVO.getModel());
         sbTreeVO.setName(sbInfoVO.getName());
+        sbTreeVO.setStatus(sbInfoVO.getStatus());
         List<SbTreeVO> subSbTreeList=new ArrayList<>();
         if(ids!=null&&ids.size()>0){
             for(SbInfoVO id: ids){
                 SbInfoDTO infoDTO=new SbInfoDTO();
                 SbTreeVO subSbTreeVO= getSbVOById(infoDTO.setId(id.getId()));
 //                subSbTreeVO.setName(id.getName());
+
                 subSbTreeList.add(subSbTreeVO);
 
             }
@@ -619,7 +622,10 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         partInfoDTO.setSbId(sbInfoDTO.getId());
         sbModelSpareBomDTO.setSbId(sbInfoDTO.getId());
         List<PartInfo> partInfoList = partInfoMapper.selectPageList(partInfoDTO);
-        List<SbModelSpareBomVO> sbModelSpareBomVOList = sbModelSpareBomMapper.selectVOList(sbModelSpareBomDTO);
+        List<SbModelSpareBomVO> sbModelSpareBomVOList = sbModelSpareBomMapper.selectVOList1(sbModelSpareBomDTO);
+//        BigDecimal spareNum=new BigDecimal(0);
+//        spareNum=new BigDecimal(subSbTreeList.size());
+//        sbTreeVO.setSpareNum(spareNum);
         List<SbModelSpareBomVO> spareList = new ArrayList<>();
         List<SbModelSpareBomVO> spareList2 = new ArrayList<>();
         for (PartInfo info : partInfoList) {

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

@@ -866,10 +866,13 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
                 throw new BusinessException("找不到该备件仓库!，备件ID:" + detail.getSpareId() + "，仓库ID:" + detail.getStoreId());
             } else {
                 BigDecimal rest = spareStore.getNum().subtract(detail.getNum());
+
                 if (rest.compareTo(new BigDecimal(0)) < 0) {
-                    throw new BusinessException("库存不足,请调整出库数量，或等采购入库!");
+//                    throw new BusinessException("库存不足,请调整出库数量，或等采购入库!");
+                    spareStore.setNum(spareStore.getNum());
+                }else {
+                    spareStore.setNum(rest);
                 }
-                spareStore.setNum(rest);
                 spareStore.setUpdateTime(LocalDateTime.now());
                 spareStore.setUpdateUserId(userInfo.getUserId());
                 spareStore.setUpdateUserName(userInfo.getRealName());