仓库报表

platform-common/src/main/java/com/platform/common/constant/CommonConstants.java

@@ -234,4 +234,13 @@ public interface CommonConstants {
      * 角色类别-维修-管理员
      */
     String WORKPLACE_REPAIR_MANAGE = "workplace-repair-manage";
+    /**
+     * 角色类别-仓库-管理员
+     */
+    String WORKPLACE_STORE_MANAGE="workplace_store_manage";
+    /**
+     * 角色类别-仓库-普通
+     */
+    String WORKPLACE_STORE_NORMAL="workplace_store_normal";
+
 }

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

@@ -1,8 +1,10 @@
 package com.platform.dao.mapper.sqarepartmanage;
 
 import com.platform.dao.config.MyMapper;
+import com.platform.dao.dto.repair.RepairFeeDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.entity.sqarepartmanage.SparePartInfo;
+import com.platform.dao.vo.query.repair.RepairFeeVO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
 import org.springframework.stereotype.Component;
 
@@ -57,4 +59,11 @@ public interface SparePartInfoMapper extends MyMapper<SparePartInfo> {
      * @return
      */
     List<SparePartInfoVO> getSpareListBySbInfo(SparePartInfoDTO model);
+
+    /**
+     * 备件类型数量饼状图
+     * @param model
+     * @return
+     */
+    List<SparePartInfoVO> listForWorkplace();
 }

platform-dao/src/main/java/com/platform/dao/mapper/store/InStoreDetailMapper.java

@@ -2,6 +2,7 @@ package com.platform.dao.mapper.store;
 
 import com.platform.dao.dto.store.InStoreDetailDTO;
 import com.platform.dao.config.MyMapper;
+import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.entity.store.InStoreDetail;
 import com.platform.dao.vo.query.store.InStoreDetailVO;
 import org.springframework.stereotype.Component;
@@ -32,4 +33,6 @@ public interface InStoreDetailMapper extends MyMapper<InStoreDetail> {
 
 
     void updateBatch(List<InStoreDetail> updateDetailList);
+
+    List<InStoreDetailVO> getCurrentlyList(InStoreFormDTO inStoreFormDTO);
 }

platform-dao/src/main/java/com/platform/dao/mapper/store/InStoreFormMapper.java

@@ -26,6 +26,8 @@ public interface InStoreFormMapper extends MyMapper<InStoreForm> {
      */
     List<InStoreFormVO> selectList(InStoreFormDTO dto);
 
+    List<InStoreFormVO> getInStoreDetailVOs();
+
     /**
      * 查看入库详情
      * @param id
@@ -33,4 +35,6 @@ public interface InStoreFormMapper extends MyMapper<InStoreForm> {
      */
     List<InStoreDetailVO> selectDetailList(@Param("id") Object id);
 
+
+
 }

platform-dao/src/main/java/com/platform/dao/mapper/store/OutStoreDetailMapper.java

@@ -2,6 +2,7 @@ package com.platform.dao.mapper.store;
 
 import com.platform.dao.dto.store.OutStoreDetailDTO;
 import com.platform.dao.config.MyMapper;
+import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.entity.store.OutStoreDetail;
 import com.platform.dao.vo.query.store.OutStoreDetailVO;
 import org.springframework.stereotype.Component;
@@ -31,4 +32,6 @@ public interface OutStoreDetailMapper extends MyMapper<OutStoreDetail> {
     List<OutStoreDetailVO> selectReportList(OutStoreDetailDTO dto);
 
     void updateBatch(List<OutStoreDetail> updateDetailList);
+
+    List<OutStoreDetailVO> getCurrentlyList(OutStoreFormDTO outStoreFormDTO);
 }

platform-dao/src/main/java/com/platform/dao/mapper/store/OutStoreFormMapper.java

@@ -1,8 +1,11 @@
 package com.platform.dao.mapper.store;
 
+import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.config.MyMapper;
 import com.platform.dao.entity.store.OutStoreForm;
+import com.platform.dao.vo.query.store.InStoreDetailVO;
+import com.platform.dao.vo.query.store.InStoreFormVO;
 import com.platform.dao.vo.query.store.OutStoreDetailVO;
 import com.platform.dao.vo.query.store.OutStoreFormVO;
 import org.apache.ibatis.annotations.Param;
@@ -25,6 +28,8 @@ public interface OutStoreFormMapper extends MyMapper<OutStoreForm> {
      */
     List<OutStoreFormVO> selectList(OutStoreFormDTO dto);
 
+    List<OutStoreFormVO> selectOutStoreList();
+
     /**
      * 查询详情列表
      * @param id
@@ -32,4 +37,6 @@ public interface OutStoreFormMapper extends MyMapper<OutStoreForm> {
      */
     List<OutStoreDetailVO> selectDetailList(@Param("id") Object id);
 
+
+
 }

platform-dao/src/main/java/com/platform/dao/vo/export/store/ExportOutStoreDetailVO.java

@@ -65,28 +65,40 @@ public class ExportOutStoreDetailVO implements Serializable {
   @Excel(name = "创建人名称", orderNum = "8")
   private String createdUserName;
 
+  /**
+   * 出库单价
+   */
+  @Excel(name = "出库单价", orderNum = "9")
+  private Double price;
+
+  /**
+   * 出库总价
+   */
+  @Excel(name = "出库总价", orderNum = "10")
+  private Double totalPrice;
+
     /**
    * 更新人
    */
-  @Excel(name = "更新人", orderNum = "9")
+  @Excel(name = "更新人", orderNum = "11")
   private String updateUserId;
 
     /**
    * 更新人名称
    */
-  @Excel(name = "更新人名称", orderNum = "10")
+  @Excel(name = "更新人名称", orderNum = "12")
   private String updateUserName;
 
     /**
    * 创建日期
    */
-  @Excel(name = "创建日期", orderNum = "11")
+  @Excel(name = "创建日期", orderNum = "13")
   private LocalDateTime createdTime;
 
     /**
    * 更新日期
    */
-  @Excel(name = "更新日期", orderNum = "12")
+  @Excel(name = "更新日期", orderNum = "14")
   private LocalDateTime updateTime;
 
 

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

@@ -121,4 +121,9 @@ public class InStoreDetailVO extends BaseVO implements Serializable {
      */
     private String typeName;
 
+    /**
+     * 星期几名称
+     */
+    private String weekDayName;
+
 }

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

@@ -116,4 +116,5 @@ public class InStoreFormVO extends BaseVO implements Serializable {
     private List<InStoreDetailVO> detailList;
 
 
+
 }

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

@@ -118,4 +118,10 @@ public class OutStoreDetailVO extends BaseVO implements Serializable {
      */
     private String typeName;
 
+    /**
+     * 星期几名称
+     */
+    private String weekDayName;
+
+
 }

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

@@ -22,7 +22,7 @@
         where 1=1
         <if test="keyword != null and keyword != ''">
             and ( position.name like concat('%',#{keyword},'%') or
-            position.no like concat('%',#{keyword},'%')
+            position.no like concat('%',#{keyword},'%'))
         </if>
         <if test="parentId != null and parentId != ''">
             and ( position.parent_id = #{parentId} or position.id = #{parentId})

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

@@ -339,4 +339,10 @@ warn_status,forecast_status,
             </if>
         </where>
     </select>
+
+    <select id="listForWorkplace" resultType="com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO">
+select t.currentStock as currentStock,spareType.name from
+(select SUM(spareStore.num) as currentStock,partInfo.type_id from t_spare_part_info partInfo join t_spare_store spareStore
+on partInfo.id = spareStore.spare_id GROUP BY partInfo.type_id) t join t_spare_type spareType on t.type_id = spareType.id
+    </select>
 </mapper>

platform-dao/src/main/resources/mapper/store/InStoreDetailMapper.xml

@@ -150,4 +150,24 @@
             where id = #{item.id}
         </foreach>
     </update>
+
+    <select id="selectReportByInStoreFormVO"  parameterType="com.platform.dao.vo.query.store.InStoreFormVO"
+            resultType="com.platform.dao.vo.query.store.InStoreDetailVO">
+
+    </select>
+    <select id="getCurrentlyList"  parameterType="com.platform.dao.vo.query.store.InStoreFormVO"
+            resultType="com.platform.dao.vo.query.store.InStoreDetailVO">
+        select * from t_in_store_detail
+        <where>
+            <if test="searchStartTime != null">
+                and created_time <![CDATA[ > ]]> #{searchStartTime}
+            </if>
+            <if test="searchEndTime != null">
+                and created_time <![CDATA[ < ]]> #{searchEndTime}
+            </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
+        </where>
+    </select>
 </mapper>

platform-dao/src/main/resources/mapper/store/InStoreFormMapper.xml

@@ -151,4 +151,14 @@
         left join t_spare_part_info spareinfo on spareinfo.id = detail.spare_id
         where form.id = #{id}
     </select>
+
+    <select id="getInStoreDetailVOs" parameterType="com.platform.dao.dto.store.InStoreFormDTO"
+            resultType="com.platform.dao.vo.query.store.InStoreFormVO">
+        select detail.*,form.status
+        from t_in_store_detail detail
+        left join t_in_store_form form on form.id = detail.in_id
+    </select>
+
+
+
 </mapper>

platform-dao/src/main/resources/mapper/store/OutStoreDetailMapper.xml

@@ -154,4 +154,22 @@
             where id = #{item.id}
         </foreach>
     </update>
+
+
+    <select id="getCurrentlyList" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
+            resultType="com.platform.dao.vo.query.store.OutStoreDetailVO"
+    >
+        select * from t_out_store_detail
+        <where>
+            <if test="searchStartTime != null">
+                and created_time <![CDATA[ > ]]> #{searchStartTime}
+            </if>
+            <if test="searchEndTime != null">
+                and created_time <![CDATA[ < ]]> #{searchEndTime}
+            </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
+        </where>
+    </select>
 </mapper>

platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -118,7 +118,14 @@
         </where>
     </select>
 
-    <select id="selectDetailList" resultType="com.platform.dao.vo.query.store.OutStoreDetailVO">
+    <select id="selectOutStoreList" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
+            resultType="com.platform.dao.vo.query.store.OutStoreFormVO">
+ select detail.*,form.status
+        from t_out_store_detail detail
+        left join  t_out_store_form form on form.id = detail.out_id
+    </select>
+
+    <select id="selectDetailList"  resultType="com.platform.dao.vo.query.store.OutStoreDetailVO">
         select detail.*,
                store.name storeName,
                spareinfo.name spareName,

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

@@ -4,8 +4,10 @@ import com.platform.common.bean.AbstractPageResultBean;
 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.vo.query.repair.RepairFeeVO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
 import com.platform.dao.vo.sb.SbInfoVO;
+import com.platform.dao.vo.spare.SparePartInfo1VO;
 import com.platform.service.base.IBaseService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -89,4 +91,12 @@ public interface SparePartInfoService extends IBaseService<SparePartInfo, SpareP
      * @return
      */
     AbstractPageResultBean<SparePartInfoVO> getSpareList(SparePartInfoDTO record, int pageNum, int pageSize);
+
+ /**
+  * 备件类型数量饼状图
+  * @param userId
+  * @param searchTime
+  * @return
+  */
+ List<SparePartInfo1VO> listForWorkplacePie(String userId, String searchTime);
 }

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

@@ -12,6 +12,7 @@ import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.check.CheckStandardSpareDTO;
+import com.platform.dao.dto.repair.RepairFeeDTO;
 import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartUsedDTO;
@@ -41,6 +42,7 @@ import com.platform.dao.vo.query.check.CheckStandardSpareVO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
 import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.dao.vo.sb.SbModelSpareBomVO;
+import com.platform.dao.vo.spare.SparePartInfo1VO;
 import com.platform.dao.vo.spare.SparePartUsedVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.check.CheckStandardService;
@@ -89,6 +91,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
     private CheckStandardSpareMapper checkStandardSpareMapper;
     private CheckStandardService checkStandardService;
 
+
     @Override
     public int batchDelete(List<String> ids) {
 
@@ -1233,4 +1236,17 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
         }
         return pageInfos;
     }
+
+    @Override
+    public List<SparePartInfo1VO> listForWorkplacePie(String userId, String searchTime) {
+        List<SparePartInfoVO> sparePartInfoVOS = mapper.listForWorkplace() == null ? new ArrayList<>() : mapper.listForWorkplace();
+        List<SparePartInfo1VO> sparePartInfo1VOS=new ArrayList<>();
+        for(SparePartInfoVO vo:sparePartInfoVOS){
+            SparePartInfo1VO sparePartInfo1VO=new SparePartInfo1VO();
+            sparePartInfo1VO.setName(vo.getName());
+            sparePartInfo1VO.setCurrentStock(vo.getCurrentStock());
+            sparePartInfo1VOS.add(sparePartInfo1VO);
+        }
+        return sparePartInfo1VOS;
+    }
 }

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

@@ -9,12 +9,11 @@ import com.platform.dao.entity.purchase.PurchaseList;
 import com.platform.dao.entity.purchase.PurchaseOrder;
 import com.platform.dao.entity.sb.SbCheckDetail;
 import com.platform.dao.entity.sb.SbCheckForm;
-import com.platform.dao.vo.query.store.InStoreFormVO;
+import com.platform.dao.vo.query.store.*;
 import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.entity.store.InStoreForm;
 import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.dao.vo.query.store.SpareBackDetailVO;
-import com.platform.dao.vo.query.store.StoreCheckJobVO;
+import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.service.base.IBaseService;
 import java.util.List;
 
@@ -34,8 +33,23 @@ public interface InStoreFormService extends IBaseService<InStoreForm, InStoreFor
     */
     int batchDelete(List<String> ids);
 
-    /**
-     * 分页查询
+   /**
+    * 近一周数据
+    * @param userId
+    * @return
+    */
+   StoreWorkBenchVO getCurrentlyList(String userId);
+
+   /**
+    * 仓库工作台数据
+    */
+   StoreWorkBenchVO getStoreWorkBenchVO(String userid);
+
+
+
+
+ /**
+  * 分页查询
      * @param record
      * @param pageNum
      * @param pageSize

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

@@ -9,6 +9,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.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.store.*;
 import com.platform.dao.entity.purchase.PurchaseDispatchOrder;
 import com.platform.dao.entity.purchase.PurchaseDispatchOrderList;
@@ -22,15 +23,10 @@ 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.store.InStoreDetailMapper;
-import com.platform.dao.mapper.store.InStoreFormMapper;
-import com.platform.dao.mapper.store.SpareBackFormMapper;
-import com.platform.dao.mapper.store.SpareStoreMapper;
+import com.platform.dao.mapper.store.*;
 import com.platform.dao.util.MessageTemplateUtil;
-import com.platform.dao.vo.query.store.InStoreFormVO;
-import com.platform.dao.vo.query.store.SpareBackDetailVO;
-import com.platform.dao.vo.query.store.StoreCheckJobVO;
-import com.platform.dao.vo.query.store.StoreVO;
+import com.platform.dao.vo.query.store.*;
+import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.business.PurchaseBusinessService;
 import com.platform.service.event.WorkplaceBacklogEvent;
@@ -46,8 +42,10 @@ import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.format.TextStyle;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.stream.Collectors;
 
 /**
@@ -63,6 +61,11 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     private SpareStoreMapper spareStoreMapper;
     private StoreService storeService;
     private SpareBackFormMapper spareBackFormMapper;
+    private InStoreDetailMapper inStoreDetailMapper;
+    private OutStoreDetailMapper outStoreDetailMapper;
+    private InStoreFormMapper inStoreFormMapper;
+    private OutStoreFormMapper outStoreFormMapper;
+
 
     @Override
     public int batchDelete(List<String> ids) {
@@ -76,6 +79,142 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
         return 1;
     }
 
+    @Override
+    public StoreWorkBenchVO getCurrentlyList(String userId) {
+        StoreWorkBenchVO storeWorkBenchVO=new StoreWorkBenchVO();
+        LocalDateTime now = LocalDateTime.now();
+
+        List<LocalDateTime> currentWeekStartAndEndList = DateUtils.currentWeek();
+        LocalDateTime searchStartTime = now.plusDays(-6).withHour(0).withMinute(0).withSecond(0);
+        LocalDateTime searchEndTime = now.withHour(23).withMinute(59).withSecond(59);
+        // 总数
+        InStoreFormDTO queryDTO = new InStoreFormDTO();
+        OutStoreFormDTO queryDTO2=new OutStoreFormDTO();
+        queryDTO2.setSearchStartTime(searchStartTime);
+        queryDTO.setSearchStartTime(searchStartTime);
+        queryDTO.setSearchEndTime(searchEndTime);
+        queryDTO2.setSearchEndTime(searchEndTime);
+        queryDTO.setUserId(userId);
+        queryDTO2.setUserId(userId);
+        List<InStoreDetailVO> list = inStoreDetailMapper.getCurrentlyList(queryDTO) == null ? new ArrayList<>() : inStoreDetailMapper.getCurrentlyList(queryDTO);
+        List<OutStoreDetailVO> list2=outStoreDetailMapper.getCurrentlyList(queryDTO2) == null ? new ArrayList<>() : outStoreDetailMapper.getCurrentlyList(queryDTO2);
+        List<InStoreDetailVO> result = new ArrayList<>();
+        List<OutStoreDetailVO> result2=new ArrayList<>();
+        for(LocalDateTime tempDate: currentWeekStartAndEndList){
+            InStoreDetailVO vo = new InStoreDetailVO();
+            OutStoreDetailVO vo1=new OutStoreDetailVO();
+            int tempTotalNum = 0;
+            vo.setWeekDayName(tempDate.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINA));
+            vo1.setWeekDayName(tempDate.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINA));
+            for(InStoreDetailVO useVO: list){
+                if(useVO.getCreatedTime().toLocalDate().isEqual(tempDate.toLocalDate())){
+                    tempTotalNum+=1;
+                }
+            }
+
+            for(OutStoreDetailVO useVO: list2){
+                if(useVO.getCreatedTime().toLocalDate().isEqual(tempDate.toLocalDate())){
+                    tempTotalNum+=1;
+                }
+            }
+            result.add(vo);
+            result2.add(vo1);
+        }
+        storeWorkBenchVO.setInStoreDetailVOS(result);
+        storeWorkBenchVO.setOutStoreDetailVOS(result2);
+        return storeWorkBenchVO;
+    }
+
+    @Override
+    public StoreWorkBenchVO getStoreWorkBenchVO(String userId) {
+        SpareStoreDTO spareStoreDTO=new SpareStoreDTO();
+        spareStoreDTO.setUserId(userId);
+        List<SpareStoreVO> spareStoreVOS=spareStoreMapper.selectList(spareStoreDTO);
+        int totalNum=0;
+        for(SpareStoreVO vo:spareStoreVOS){
+            totalNum+=vo.getNum().intValue();
+        }
+        InStoreFormDTO queryDTO=new InStoreFormDTO();
+        queryDTO.setUserId(userId);
+        OutStoreFormDTO queryDTO2=new OutStoreFormDTO();
+        queryDTO2.setUserId(userId);
+        List<OutStoreFormVO> outStoreFormVOS=outStoreFormMapper.selectOutStoreList();
+        List<InStoreFormVO> inStoreFormVOS=inStoreFormMapper.getInStoreDetailVOs();
+        StoreWorkBenchVO storeWorkBenchVO=new StoreWorkBenchVO();
+        int num=0;
+        int purchaseNum=0;
+        int xzNum=0;
+        int dbNum=0;
+        int otherNum=0;
+        int num1=0;
+        int lyNum=0;
+        int dbNum2=0;
+        int bfNum=0;
+        int otherNum2=0;
+        int pdNum=0;
+        for(OutStoreFormVO vo:outStoreFormVOS){
+            List<OutStoreDetailVO> outStoreDetailVOS=vo.getDetailList();
+            //待出库
+            if(vo.getStatus()!=null&&vo.getStatus().equals(OutStoreStatusEnum.NOT_EXECUTE)){
+                for(OutStoreDetailVO vo1:outStoreDetailVOS){
+                    num1+=vo1.getNum().intValue();
+                    if(vo1.getType()==OutStoreTypeEnum.CHUKU_LINGYONG.getValue()){
+                        lyNum+=vo1.getNum().intValue();
+                    }
+                    if(vo1.getType()==OutStoreTypeEnum.CHUKU_DIAOBO.getValue()){
+                        dbNum2+=vo1.getNum().intValue();
+                    }
+                    if(vo1.getType()==OutStoreTypeEnum.CHUKU_BAOFEI.getValue()){
+                        bfNum+=vo1.getNum().intValue();
+                    }
+                    if(vo1.getType()==OutStoreTypeEnum.CHUKU_QITA.getValue()){
+                        otherNum2+=vo1.getNum().intValue();
+                    }
+                    if(vo1.getType()==OutStoreTypeEnum.STORE_CHECK.getValue()){
+                        pdNum+=vo1.getNum().intValue();
+                    }
+                }
+            }
+        }
+        for(InStoreFormVO vo:inStoreFormVOS){
+            List<InStoreDetailVO> inStoreDetailVOS=vo.getDetailList();
+            //待入库数据
+            if(vo.getStatus()!=null&&vo.getStatus().equals(InStoreStatusEnum.NOT_EXECUTE.getValue())){
+                for (InStoreDetailVO vo1:inStoreDetailVOS){
+                    num+=vo1.getNum().intValue();
+                    //采购
+                    if(vo1.getType()==InStoreTypeEnum.CAIGOU_RUKU.getValue()){
+                        purchaseNum+=vo1.getNum().intValue();
+                    }
+                    //闲置入库
+                    if(vo1.getType()==InStoreTypeEnum.XIANZHI_RUKU.getValue()){
+                        xzNum+=vo1.getNum().intValue();
+                    }
+                    //调拨入库
+                    if(vo1.getType()==InStoreTypeEnum.DIAOBO_RUKU.getValue()){
+                        dbNum+=vo1.getNum().intValue();
+                    }
+                    if(vo1.getType()==InStoreTypeEnum.FAYUN_RUKU.getValue()||vo1.getType()==InStoreTypeEnum.STORE_CHECK.getValue()){
+                        otherNum+=vo1.getNum().intValue();
+                    }
+                }
+            }
+        }
+        storeWorkBenchVO.setInTotalNum(num);
+        storeWorkBenchVO.setPurchaseApplyNum(purchaseNum);
+        storeWorkBenchVO.setSpareBackApplyNum(xzNum);
+        storeWorkBenchVO.setOtherNum(otherNum);
+        storeWorkBenchVO.setDbApplyNum(dbNum);
+        storeWorkBenchVO.setBFNum(bfNum);
+        storeWorkBenchVO.setLYNum(lyNum);
+        storeWorkBenchVO.setDBOutNum(dbNum2);
+        storeWorkBenchVO.setOtherOutNum(otherNum2);
+        storeWorkBenchVO.setPDOutNum(pdNum);
+        storeWorkBenchVO.setOutTotalNum(num1);
+        storeWorkBenchVO.setTotalNum(totalNum);
+        return storeWorkBenchVO;
+    }
+
     @Override
     public AbstractPageResultBean<InStoreFormVO> selectPageList(InStoreFormDTO model, int pageNum, int pageSize) {
         // 登录人负责的仓库，入库单

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

@@ -10,6 +10,7 @@ import com.platform.common.util.IdGeneratorUtils;
 import com.platform.common.util.SecurityUtils;
 import com.platform.dao.bean.MyPage;
 import com.github.pagehelper.PageHelper;
+import com.platform.dao.dto.sb.SbTypeDTO;
 import com.platform.dao.dto.store.StoreDTO;
 import com.platform.dao.dto.upms.SysDeptDTO;
 import com.platform.dao.entity.store.SpareStore;
@@ -25,6 +26,7 @@ import com.platform.dao.util.CustomExcelImportUtil;
 import com.platform.dao.util.UserUtil;
 import com.platform.dao.vo.query.store.StoreVO;
 import com.platform.dao.vo.query.upms.SysDeptVO;
+import com.platform.dao.vo.sb.SbTypeVO;
 import com.platform.service.store.StoreService;
 import com.platform.service.upms.SysDeptService;
 import com.platform.service.upms.SysUserDeptService;
@@ -78,6 +80,10 @@ public class StoreServiceImpl extends BaseServiceImpl<StoreMapper, Store, StoreD
         return 1;
     }
 
+
+
+
+
     /**
      * 可选择全部，也可以选择登录用户对应的仓库
      *

platform-service/src/main/java/com/platform/service/workplace/impl/IndexServiceImpl.java

@@ -6,6 +6,10 @@ import com.platform.common.util.R;
 import com.platform.common.util.SecurityUtils;
 import com.platform.service.repair.RepairApplicationFormService;
 import com.platform.service.repair.RepairFeeService;
+import com.platform.service.sqarepartmanage.SparePartInfoService;
+import com.platform.service.store.InStoreDetailService;
+import com.platform.service.store.InStoreFormService;
+import com.platform.service.store.impl.InStoreDetailServiceImpl;
 import com.platform.service.workplace.IndexService;
 import org.springframework.stereotype.Service;
 
@@ -18,6 +22,11 @@ public class IndexServiceImpl implements IndexService {
     private RepairApplicationFormService repairApplicationFormService;
     @Resource
     private RepairFeeService repairFeeService;
+    @Resource
+    private InStoreFormService inStoreFormService;
+    @Resource
+    private SparePartInfoService sparePartInfoService;
+
 
     @Override
     public R getWorkplaceTopData(String roleCode) {
@@ -26,11 +35,17 @@ public class IndexServiceImpl implements IndexService {
         R r = R.success();
         switch (roleCode){
             case CommonConstants.WORKPLACE_REPAIR_NORMAL:
-                r.setData(repairApplicationFormService.getWorkplaceRepairData(userId, DateUtils.dateToString(now,DateUtils.PATTERN_YMD)));
+                r.setData(repairApplicationFormService.getWorkplaceRepairData("1", DateUtils.dateToString(now,DateUtils.PATTERN_YMD)));
                 break;
             case CommonConstants.WORKPLACE_REPAIR_MANAGE:
                 r.setData(repairApplicationFormService.getWorkplaceRepairData(null, DateUtils.dateToString(now,DateUtils.PATTERN_YMD)));
                 break;
+            case CommonConstants.WORKPLACE_STORE_MANAGE:
+                r.setData(inStoreFormService.getStoreWorkBenchVO(null));
+                break;
+            case CommonConstants.WORKPLACE_STORE_NORMAL:
+                r.setData(inStoreFormService.getStoreWorkBenchVO("1"));
+                break;
         }
         return r;
     }
@@ -47,6 +62,12 @@ public class IndexServiceImpl implements IndexService {
             case CommonConstants.WORKPLACE_REPAIR_MANAGE:
                 r.setData(repairFeeService.listForWorkplacePie(null, DateUtils.dateToString(now,DateUtils.PATTERN_YMD)));
                 break;
+            case CommonConstants.WORKPLACE_STORE_MANAGE:
+                r.setData(sparePartInfoService.listForWorkplacePie(null,DateUtils.dateToString(now,DateUtils.PATTERN_YMD)));
+                break;
+            case CommonConstants.WORKPLACE_STORE_NORMAL:
+                r.setData(sparePartInfoService.listForWorkplacePie(userId,DateUtils.dateToString(now,DateUtils.PATTERN_YMD)));
+                break;
         }
         return r;
     }
@@ -62,6 +83,12 @@ public class IndexServiceImpl implements IndexService {
             case CommonConstants.WORKPLACE_REPAIR_MANAGE:
                 r.setData(repairApplicationFormService.getCurrentlyList(null));
                 break;
+            case CommonConstants.WORKPLACE_STORE_MANAGE:
+                r.setData(inStoreFormService.getCurrentlyList(null));
+                break;
+            case CommonConstants.WORKPLACE_STORE_NORMAL:
+                r.setData(inStoreFormService.getCurrentlyList(userId));
+                break;
         }
         return r;
     }