仓库报表

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

@@ -23,4 +23,7 @@ public interface StoreMapper extends MyMapper<Store> {
      */
     List<StoreVO> selectList(StoreDTO dto);
 
+    List<StoreVO> selectVOList(StoreDTO model);
+
+    Integer getStoreNums(String userId);
 }

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

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -27,6 +28,10 @@ public class StoreWorkBenchVO extends BaseVO implements Serializable {
     private List<InStoreDetailVO> inStoreDetailVOS;
     private List<OutStoreDetailVO> outStoreDetailVOS;
 
+    /**
+     * 仓库总数
+     */
+    private Integer storeNums;
     /**
      * 待调拨出库数量
      */
@@ -73,9 +78,11 @@ public class StoreWorkBenchVO extends BaseVO implements Serializable {
      */
     private Integer otherNum;
     /**
-     * 备件总数
+     * 备件总价值
      */
-    private Integer totalNum;
+
+
+    private BigDecimal totalPrice;
     /**
      * 采购已入库数量(近一周内)
      */

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

@@ -157,6 +157,7 @@
         select detail.*,form.status
         from t_in_store_detail detail
         left join t_in_store_form form on form.id = detail.in_id
+
     </select>
 
 

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

@@ -255,4 +255,5 @@
             where id = #{item.id}
         </foreach>
     </update>
+
 </mapper>

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

@@ -117,4 +117,18 @@
         </where>
         order by store.sort asc
     </select>
+
+    <select id="getStoreNums" parameterType="com.platform.dao.dto.store.StoreDTO"
+            resultType="int"
+    >
+        select count(*) from t_store
+        <where>
+        1=1
+        <if test="userId!=null">
+            and user_id=#{userId}
+        </if>
+        </where>
+
+    </select>
+
 </mapper>

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

@@ -41,7 +41,9 @@ public class StoreController {
 
   private final  StoreService storeService;
 
-  /**
+
+
+    /**
    * 通过id查询单条记录
    *
    * @param id 主键

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

@@ -81,4 +81,5 @@ public interface StoreService extends IBaseService<Store, StoreDTO> {
     String importListAddAndUpdate(String storeId, MultipartFile file);
 
     String changeStore(String sourceStoreId, String destStoreId);
+
 }

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

@@ -65,6 +65,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     private OutStoreDetailMapper outStoreDetailMapper;
     private InStoreFormMapper inStoreFormMapper;
     private OutStoreFormMapper outStoreFormMapper;
+    private StoreMapper storeMapper;
 
 
     @Override
@@ -131,12 +132,16 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
 
     @Override
     public StoreWorkBenchVO getStoreWorkBenchVO(String userId) {
+        StoreDTO query=new StoreDTO();
+        query.setUserId(userId);
+        Integer count=storeMapper.getStoreNums(userId);
+
         SpareStoreDTO spareStoreDTO=new SpareStoreDTO();
         spareStoreDTO.setUserId(userId);
         List<SpareStoreVO> spareStoreVOS=spareStoreMapper.selectList(spareStoreDTO);
-        int totalNum=0;
+        Double totalPrice=0.0;
         for(SpareStoreVO vo:spareStoreVOS){
-            totalNum+=vo.getNum().intValue();
+            totalPrice+=(vo.getNum().intValue())*(vo.getPrice().doubleValue());
         }
         InStoreFormDTO queryDTO=new InStoreFormDTO();
         queryDTO.setUserId(userId);
@@ -219,7 +224,8 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
         storeWorkBenchVO.setOtherOutNum(otherNum2);
         storeWorkBenchVO.setOutPDNum(pdNum);
         storeWorkBenchVO.setOutTotalNum(num1);
-        storeWorkBenchVO.setTotalNum(totalNum);
+        storeWorkBenchVO.setTotalPrice(new BigDecimal(totalPrice));
+        storeWorkBenchVO.setStoreNums(count);
         return storeWorkBenchVO;
     }
 

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

@@ -400,4 +400,7 @@ public class StoreServiceImpl extends BaseServiceImpl<StoreMapper, Store, StoreD
         }
         return result;
     }
+
+
+
 }