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

blade-service/logpm-report/src/main/java/com/logpm/report/controller/IndexCountController.java

@@ -4,7 +4,7 @@ package com.logpm.report.controller;
 import com.logpm.report.service.InLibraryDeliverService;
 import com.logpm.report.service.IndexCountService;
 import com.logpm.report.vo.IndexCountVO;
-import com.logpm.report.vo.indexCount.QuantityAbnormalWorkOrdersVO;
+import com.logpm.report.vo.indexCount.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -21,30 +21,68 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/index-count")
 @Api(value = "首页统计数据", tags = "首页统计数据")
 public class IndexCountController {
-	private InLibraryDeliverService inLibraryDeliverService;
 	private IndexCountService indexCountService;
 
-	@ApiParam(value = "warehouseId", name = "仓库ID")
-	@GetMapping("/index_count")
-	@ApiOperation(value = "定制品在库订单总量",tags = "定制品在库订单总量")
-	public R<IndexCountVO> indexCount(@RequestParam(value = "warehouseId", required = false) Long warehouseId) {
-		IndexCountVO indexCountVO = indexCountService.indexCount(warehouseId);
 
+	@GetMapping("/index_count")
+	@ApiOperation(value = "在库数据",tags = "在库数据")
+	public R<IndexCountVO> indexCount() {
+		IndexCountVO indexCountVO = indexCountService.indexCount();
 		return R.data(indexCountVO);
 	}
 
-	@GetMapping("/index_number_in_the_library")
-	@ApiOperation(value = "定制品在库订单上架总数",tags = "定制品在库订单上架总数")
-	public R<Integer> getTheNumberOfShelvesInTheLibrary(@RequestParam("id") Long id){
-		Integer theNumberOfShelvesInTheLibrary= inLibraryDeliverService.theNumberOfShelvesInTheLibrary(id,2);
-		return  R.data(theNumberOfShelvesInTheLibrary);
+
+	@GetMapping("/get_freight_data")
+	@ApiOperation(value = "库位数据",tags = "库位数据")
+	public R<FreightDataVo> getFreightData() {
+		FreightDataVo freightData = indexCountService.getFreightData();
+		return R.data(freightData);
+	}
+
+	@GetMapping("/get_mainLine_data")
+	@ApiOperation(value = "干线数据",tags = "干线数据")
+	public R<MainLineDataVo> getMainLineData() {
+		MainLineDataVo mainLineData = indexCountService.getMainLineData();
+		return R.data(mainLineData);
+	}
+
+	@GetMapping("/get_abnormal_data")
+	@ApiOperation(value = "异常数据",tags = "异常数据")
+	public R<AbnormalDataVo> getAbnormalData() {
+		AbnormalDataVo abnormalData = indexCountService.getAbnormalData();
+		return R.data(abnormalData);
 	}
 
-	@GetMapping("/index_number_no_the_library")
-	@ApiOperation(value = "定制品在库订单未上架总数",tags = "定制品在库订单未上架总数")
-	public R<Integer> getTheNumberOfShelvesNoTheLibrary(@RequestParam("id") Long id){
-		Integer theNumberOfShelvesInTheLibrary= inLibraryDeliverService.theNumberOfShelvesInTheLibrary(id,1);
-		return  R.data(theNumberOfShelvesInTheLibrary);
+	@GetMapping("/get_Delivery_data")
+	@ApiOperation(value = "配送数据",tags = "配送数据")
+	public R<DeliveryDetailDataVo> getDeliveryData() {
+		DeliveryDetailDataVo deliveryData = indexCountService.getDeliveryData();
+		return R.data(deliveryData);
 	}
 
+
+	@GetMapping("/get_sign_data")
+	@ApiOperation(value = "签收数据",tags = "签收数据")
+	public R<SignDataVo> getSignData() {
+		SignDataVo signData = indexCountService.getSignData();
+		return R.data(signData);
+	}
+
+
+
+
+//	@GetMapping("/index_number_in_the_library")
+//	@ApiOperation(value = "定制品在库订单上架总数",tags = "定制品在库订单上架总数")
+//	public R<Integer> getTheNumberOfShelvesInTheLibrary(@RequestParam("id") Long id){
+//		Integer theNumberOfShelvesInTheLibrary= inLibraryDeliverService.theNumberOfShelvesInTheLibrary(id,2);
+//		return  R.data(theNumberOfShelvesInTheLibrary);
+//	}
+//
+//	@GetMapping("/index_number_no_the_library")
+//	@ApiOperation(value = "定制品在库订单未上架总数",tags = "定制品在库订单未上架总数")
+//	public R<Integer> getTheNumberOfShelvesNoTheLibrary(@RequestParam("id") Long id){
+//		Integer theNumberOfShelvesInTheLibrary= inLibraryDeliverService.theNumberOfShelvesInTheLibrary(id,1);
+//		return  R.data(theNumberOfShelvesInTheLibrary);
+//	}
+
 }

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.java

@@ -11,18 +11,12 @@ public interface  InLibraryDeliverMapper  extends BaseMapper {
 
 	/**
 	 * 根据仓库ID获取在库总量数据
-	 * @param warehouseId
+	 * @param warehouse
 	 * @return
 	 */
-	Integer obtainTheNumberOfInventoryListings (Long warehouseId);
+	Integer getIndexCount (@Param("warehouse") List<Long> warehouse);
+
 
-	/**
-	 * 根据仓库ID\1已上架 2未上架获取在库数
-	 * @param warehouseId
-	 * @param order_package_grounding_status
-	 * @return
-	 */
-	Integer theNumberOfShelvesInTheLibrary(Long warehouseId , Integer order_package_grounding_status);
 
 
 	/**
@@ -53,8 +47,37 @@ public interface  InLibraryDeliverMapper  extends BaseMapper {
 	 * @return
 	 */
 	Integer getCityData(@Param("warehouse") List<Long> warehouse);
+
+	/**
+	 * 获取自提数据
+	 * @param warehouse
+	 * @return
+	 */
 	Integer getSelfHelp(@Param("warehouse") List<Long> warehouse);
 
+
+
+	/*获取库位信息*/
+
+	Integer getFreightAll(@Param("warehouse") List<Long> warehouse);
+	Integer getFreightShelves(@Param("warehouse") List<Long> warehouse);
+	Integer getFreightIdle(@Param("warehouse") List<Long> warehouse);
+	Integer getFreightShelvesCount(@Param("warehouse") List<Long> warehouse);
+	Integer getFreightIdleCount(@Param("warehouse") List<Long> warehouse);
+
+
+
+
+	/*获取干线数据*/
+	Integer getMainLineAll(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineInWareCount(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineInWareWeight(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineInWareArea(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineAllCar(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineStreet(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineJob(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineEndCount(@Param("warehouse") List<Long> warehouse);
+
 }
 
 

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.xml

@@ -1,29 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.logpm.report.mapper.InLibraryDeliverMapper">
-    <select id="obtainTheNumberOfInventoryListings" resultType="java.lang.Integer">
-        select count(*) as con
-        from logpm_distribution_parcel_list
-        where
-         order_package_status = 20
-        and conditions = 1
-        <if test="warehouseId != null">
-            and warehouse_id = #{warehouseId}
-        </if>
-    </select>
-    <select id="theNumberOfShelvesInTheLibrary" resultType="java.lang.Integer">
-        select count(*) as con
-        from logpm_distribution_parcel_list
+
+    <!--获取在库数据-->
+    <select id="getIndexCount" resultType="java.lang.Integer">
+        select sum(hand_quantity) as con
+        from logpm_distribution_stock_article
         where
-            order_package_status = 20
-          and
-            conditions = 1
-          and
-            order_package_grounding_status = #{order_package_grounding_status}
-            <if test="warehouseId != null">
-                and warehouse_id = #{warehouseId}
+        order_status = 20
+        <where>
+            <if test="warehouse != null">
+                and  warehouse_id in
+                <foreach collection="warehouse" index="index" item="item">
+                    #{item}
+                </foreach>
             </if>
+        </where>
     </select>
+
     <!--获取在库零担数据-->
     <select id="getScatterCount" resultType="java.lang.Integer">
         select sum(hand_quantity) as con
@@ -33,7 +27,7 @@
           and
         order_status = 20
         <where>
-            <if test="item != null">
+            <if test="warehouse != null">
                 and  warehouse_id in
             <foreach collection="warehouse" index="index" item="item">
                        #{item}
@@ -46,13 +40,12 @@
         select sum(hand_quantity) as con
         from logpm_distribution_stock_article
         where
-        is_zero = 1
-        and
+
         type_service = 1
         and
         order_status = 20
         <where>
-            <if test="item != null">
+            <if test="warehouse != null">
                 and  warehouse_id in
                 <foreach collection="warehouse" index="index" item="item">
                     #{item}
@@ -64,13 +57,12 @@
         select sum(hand_quantity) as con
         from logpm_distribution_stock_article
         where
-        is_zero = 1
-        and
+
         type_service = 2
         and
         order_status = 20
         <where>
-            <if test="item != null">
+            <if test="warehouse != null">
                 and  warehouse_id in
                 <foreach collection="warehouse" index="index" item="item">
                     #{item}
@@ -83,13 +75,12 @@
         select sum(hand_quantity) as con
         from logpm_distribution_stock_article
         where
-        is_zero = 1
-        and
+
         type_service = 3
         and
         order_status = 20
         <where>
-            <if test="item != null">
+            <if test="warehouse != null">
                 and  warehouse_id in
                 <foreach collection="warehouse" index="index" item="item">
                     #{item}
@@ -99,4 +90,67 @@
 
     </select>
 
+    <!--库位数据-->
+    <select id="getFreightAll" resultType="java.lang.Integer">
+        select count(*) as con
+        from logpm_warehouse_goods_allocation
+        where
+            is_deleted = 0
+        and
+            enable_status = 1
+        <where>
+            <if test="warehouse != null">
+                and  warehouse_id in
+                <foreach collection="warehouse" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="getFreightShelves" resultType="java.lang.Integer">
+        select cpunt(*) as con
+        from logpm_warehouse_updown_type
+        where
+        is_deleted = 0
+        <where>
+            <if test="warehouse != null">
+                and  warehouse_id in
+                <foreach collection="warehouse" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+    <select id="getFreightIdle" resultType="java.lang.Integer">
+
+    </select>
+    <select id="getFreightShelvesCount" resultType="java.lang.Integer">
+        select sum(total_num+stock_num) as con
+        from logpm_warehouse_updown_type
+        where
+        is_deleted = 0
+        <where>
+            <if test="warehouse != null">
+                and  warehouse_id in
+                <foreach collection="warehouse" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="getFreightIdleCount" resultType="java.lang.Integer">
+
+    </select>
+
+    <!--干线数据-->
+    <select id="getMainLineAll" resultType="java.lang.Integer"></select>
+    <select id="getMainLineInWareCount" resultType="java.lang.Integer"></select>
+    <select id="getMainLineInWareWeight" resultType="java.lang.Integer"></select>
+    <select id="getMainLineInWareArea" resultType="java.lang.Integer"></select>
+    <select id="getMainLineAllCar" resultType="java.lang.Integer"></select>
+    <select id="getMainLineStreet" resultType="java.lang.Integer"></select>
+    <select id="getMainLineJob" resultType="java.lang.Integer"></select>
+    <select id="getMainLineEndCount" resultType="java.lang.Integer"></select>
+
 </mapper>

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/IndexCountMapper.xml

@@ -49,6 +49,6 @@
         and a.order_package_status <![CDATA[ <= ]]> #{orderPackageStatus}
         GROUP BY b.type_service
     </select>
-    <select id="numberOfAbnormalWorkOrdersInTheMonth" resultType="java.lang.Integer"></select>
+
 
 </mapper>

blade-service/logpm-report/src/main/java/com/logpm/report/service/InLibraryDeliverService.java

@@ -1,6 +1,10 @@
 package com.logpm.report.service;
 
 
+import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author wzy
@@ -8,17 +12,62 @@ package com.logpm.report.service;
  */
 public interface InLibraryDeliverService {
 
+//
+	 Integer getIndexCount(List<Long> warehouse);
 
-	 Integer indexCount(Long id);
-
-	 Integer theNumberOfShelvesInTheLibrary(Long id,Integer order_package_grounding_statu);
 
 	/**
 	 * 获取在库零担件数
 	 * @return
 	 */
-	Integer getScatterCount();
+	Integer getScatterCount(List<Long> warehouse);
+
+	/**
+	 * 获取中转仓件数
+	 * @return
+	 */
+	Integer getThirdParty(List<Long> warehouse);
+
+	/**
+	 * 获取商配件数
+	 * @return
+	 */
+	Integer getShoppData(List<Long> warehouse);
+
+	/**
+	 * 获取市配件数
+	 * @return
+	 */
+	Integer getCityData(List<Long> warehouse);
+
+	/**
+	 * 获取自提件数
+	 * @return
+	 */
+	Integer getSelfHelp(List<Long> warehouse);
+
+
+
+
+	/*获取库位数据*/
+
+	Integer  getFrightCount(List<Long> warehouse);
+	Integer  getFreightShelves(List<Long> warehouse);
+	Integer  getFreightIdle(List<Long> warehouse);
+	Integer  getFreightShelvesCount(List<Long> warehouse);
+	Integer  getFreightIdleCount(List<Long> warehouse);
+
+
+	/*获取干线数据*/
 
 
+	Integer getMainLineAll(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineInWareCount(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineInWareWeight(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineInWareArea(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineAllCar(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineStreet(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineJob(@Param("warehouse") List<Long> warehouse);
+	Integer getMainLineEndCount(@Param("warehouse") List<Long> warehouse);
 
 }

blade-service/logpm-report/src/main/java/com/logpm/report/service/IndexCountService.java

@@ -1,13 +1,48 @@
 package com.logpm.report.service;
 
 import com.logpm.report.vo.IndexCountVO;
-import com.logpm.report.vo.indexCount.InboundAndOutboundQuantityVO;
-import com.logpm.report.vo.indexCount.QuantityAbnormalWorkOrdersVO;
+import com.logpm.report.vo.indexCount.*;
+import org.checkerframework.checker.units.qual.A;
 
 /**
  * 首页统计
  */
 public interface IndexCountService {
 
-	IndexCountVO indexCount(Long warehouseId);
+	/**
+	 * 获取在库数据
+	 * @return
+	 */
+	IndexCountVO indexCount();
+
+	/**
+	 * 获取库位数据
+	 * @return
+	 */
+	FreightDataVo getFreightData();
+
+	/**
+	 * 获取干线数据
+	 * @return
+	 */
+	MainLineDataVo getMainLineData();
+
+	/**
+	 * 获取异常数据
+	 * @return
+	 */
+
+	AbnormalDataVo getAbnormalData();
+
+	/**
+	 * 获取配送数据
+	 * @return
+	 */
+	DeliveryDetailDataVo getDeliveryData();
+
+	/**
+	 * 获取签收数据
+	 * @return
+	 */
+    SignDataVo	getSignData();
 }

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/BillingServiceImpl.java

@@ -112,7 +112,7 @@ public class BillingServiceImpl  implements BillingService {
 	 * 获取用户仓库id
 	 * @return
 	 */
-	private List<Long> getWarehouse(){
+	public List<Long> getWarehouse(){
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 //		BasicdataWarehouseEntity myCurrentWarehouse = new BasicdataWarehouseEntity();
 		List<Long> ls = new ArrayList<>();

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java

@@ -7,6 +7,8 @@ import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @AllArgsConstructor
 public class InLibraryDeliverServiceImpl implements InLibraryDeliverService {
@@ -16,30 +18,117 @@ public class InLibraryDeliverServiceImpl implements InLibraryDeliverService {
 
 	/***
 	 * 总在库数
-	 * @param id
+	 * @param
 	 * @return
 	 */
 	@Override
-	public Integer indexCount(Long id) {
-		return 	inLibraryDeliverMapper.obtainTheNumberOfInventoryListings(id);
+	public Integer getIndexCount(List<Long> warehouse) {
+		return  inLibraryDeliverMapper.getIndexCount(warehouse);
 	}
 
+
 	/**
-	 * 上架数量
-	 * @param id
-	 * @param order_package_grounding_status 状态 ；2=已上架，1 = 未上架
+	 * 在库数据
+	 * @param warehouse
 	 * @return
 	 */
-	public Integer theNumberOfShelvesInTheLibrary(Long id, Integer order_package_grounding_status){
-		return  inLibraryDeliverMapper.theNumberOfShelvesInTheLibrary(id, order_package_grounding_status);
+	@Override
+	public Integer getScatterCount(List<Long> warehouse) {
+		return  inLibraryDeliverMapper.getScatterCount(warehouse);
+	}
+
+	@Override
+	public Integer getThirdParty(List<Long> warehouse) {
+		return  inLibraryDeliverMapper.getThirdParty(warehouse);
+	}
+
+	@Override
+	public Integer getShoppData(List<Long> warehouse) {
+		return  inLibraryDeliverMapper.getShoppData(warehouse);
+	}
+
+	@Override
+	public Integer getCityData(List<Long> warehouse) {
+		return  inLibraryDeliverMapper.getCityData(warehouse);
+	}
+
+	@Override
+	public Integer getSelfHelp(List<Long> warehouse) {
+		return  inLibraryDeliverMapper.getSelfHelp(warehouse);
 	}
 
+
 	/**
-	 * 获取在库零担数据
-	 * @return
+	 * 库位数据
 	 */
 	@Override
-	public Integer getScatterCount() {
-		return null;
+	public Integer getFrightCount(List<Long> warehouse){
+		return inLibraryDeliverMapper.getFreightIdleCount(warehouse);
+	}
+
+	@Override
+	public Integer getFreightShelves(List<Long> warehouse) {
+		return inLibraryDeliverMapper.getFreightShelves(warehouse);
+	}
+
+	@Override
+	public Integer getFreightIdle(List<Long> warehouse) {
+		return inLibraryDeliverMapper.getFreightIdle(warehouse);
+	}
+
+	@Override
+	public Integer getFreightShelvesCount(List<Long> warehouse) {
+		return inLibraryDeliverMapper.getFreightShelvesCount(warehouse);
+	}
+
+	@Override
+	public Integer getFreightIdleCount(List<Long> warehouse) {
+		return inLibraryDeliverMapper.getFreightIdleCount(warehouse);
 	}
+
+
+	/*干线数据*/
+
+
+	@Override
+	public Integer getMainLineAll(List<Long> warehouse) {
+		return inLibraryDeliverMapper.getMainLineAll(warehouse);
+	}
+
+	@Override
+	public Integer getMainLineInWareCount(List<Long> warehouse) {
+		return inLibraryDeliverMapper.getMainLineInWareCount(warehouse);
+	}
+
+	@Override
+	public Integer getMainLineInWareWeight(List<Long> warehouse) {
+		return inLibraryDeliverMapper.getMainLineInWareWeight(warehouse);
+	}
+
+	@Override
+	public Integer getMainLineInWareArea(List<Long> warehouse) {
+		return inLibraryDeliverMapper.getMainLineInWareArea(warehouse);
+	}
+
+	@Override
+	public Integer getMainLineAllCar(List<Long> warehouse) {
+		return inLibraryDeliverMapper.getMainLineAllCar(warehouse);
+	}
+
+	@Override
+	public Integer getMainLineStreet(List<Long> warehouse) {
+		return inLibraryDeliverMapper.getMainLineStreet(warehouse);
+	}
+
+	@Override
+	public Integer getMainLineJob(List<Long> warehouse) {
+		return inLibraryDeliverMapper.getMainLineJob(warehouse);
+	}
+
+	@Override
+	public Integer getMainLineEndCount(List<Long> warehouse) {
+		return inLibraryDeliverMapper.getMainLineStreet(warehouse);
+	}
+
+
 }

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/IndexCountServiceImpl.java

@@ -4,9 +4,7 @@ import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.report.mapper.IndexCountMapper;
 import com.logpm.report.service.IndexCountService;
 import com.logpm.report.vo.IndexCountVO;
-import com.logpm.report.vo.indexCount.InStoreDataVO;
-import com.logpm.report.vo.indexCount.InboundAndOutboundQuantityVO;
-import com.logpm.report.vo.indexCount.QuantityAbnormalWorkOrdersVO;
+import com.logpm.report.vo.indexCount.*;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.aftersales.WorkOrderStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
@@ -34,46 +32,111 @@ public class IndexCountServiceImpl implements IndexCountService {
 
 	private InLibraryDeliverServiceImpl inLibraryDeliverService;
 
-	@Autowired
-	private IBasicdataWarehouseClient warehouseClient;
+	private BillingServiceImpl billingService;
+
 
 
 	/**
-	 * 首页统计数据
+	 * 获取在库统计数据
 	 */
-	@Cacheable(value = "indexCount=10", key = "#warehouseId")
-	public IndexCountVO indexCount(Long warehouseId) {
-		// 这里需要换这里的代码，测试是模拟请求携带仓库ID参数
-		// Long warehouseId = AuthUtil.getWarehouseId();
+	@Cacheable(value = "indexCount=10")
+	public IndexCountVO indexCount() {
 		IndexCountVO indexCountVo = new IndexCountVO();
-		indexCountVo.setQuantityAbnormalWorkOrders(numberOfAbnormalWorkOrdersTheMonth(warehouseId));
-		indexCountVo.setInboundAndOutboundQuantity(inboundAndOutboundQuantityTheMonth(warehouseId));
-		indexCountVo.setInStoreData(inStoreData(warehouseId));
+		List<Long> warehouse = billingService.getWarehouse();
+		indexCountVo.setInStoreData(inStoreData(warehouse));
+		return indexCountVo;
+	}
 
+	/**
+	 *获取库位数据
+	 * @return
+	 */
+	@Override
+	public FreightDataVo getFreightData() {
+		FreightDataVo freightDataVo = new FreightDataVo();
+		List<Long> warehouse = billingService.getWarehouse();
+		freightDataVo.setAll(inLibraryDeliverService.getFrightCount(warehouse));
+		freightDataVo.setShelves(inLibraryDeliverService.getFreightShelves(warehouse));
+		freightDataVo.setIdle(inLibraryDeliverService.getFreightIdle(warehouse));
+		freightDataVo.setIdleCount(inLibraryDeliverService.getFreightIdleCount(warehouse));
+		freightDataVo.setShelvesCount(inLibraryDeliverService.getFreightShelvesCount(warehouse));
+
+		return freightDataVo;
+	}
 
+	/**
+	 * 获取干线数据
+	 * @return
+	 */
+	@Override
+	public MainLineDataVo getMainLineData() {
+		MainLineDataVo mainLineDataVo = new MainLineDataVo();
+		List<Long> warehouse = billingService.getWarehouse();
+		mainLineDataVo.setBillAll(inLibraryDeliverService.getMainLineAll(warehouse));
+		mainLineDataVo.setInWareCount(inLibraryDeliverService.getMainLineInWareCount(warehouse));
+		mainLineDataVo.setInWareWeight(inLibraryDeliverService.getMainLineInWareWeight(warehouse));
+		mainLineDataVo.setInWareArea(inLibraryDeliverService.getMainLineInWareArea(warehouse));
+		mainLineDataVo.setJob(inLibraryDeliverService.getMainLineJob(warehouse));
+		mainLineDataVo.setAllCar(inLibraryDeliverService.getMainLineAllCar(warehouse));
+		mainLineDataVo.setStreet(inLibraryDeliverService.getMainLineStreet(warehouse));
+		mainLineDataVo.setEndCount(inLibraryDeliverService.getMainLineEndCount(warehouse));
+
+		return  mainLineDataVo;
+	}
 
-		return indexCountVo;
+	/**
+	 * 获取异常数据
+	 * @return
+	 */
+	@Override
+	public AbnormalDataVo getAbnormalData() {
+		return null;
 	}
 
 	/**
-	 * 设置在库数据
-	 * @param warehouseId
+	 * 获取配送数据
 	 * @return
 	 */
-	private InStoreDataVO inStoreData(Long warehouseId) {
+	@Override
+	public DeliveryDetailDataVo getDeliveryData() {
+		return null;
+	}
+
+	/**
+	 * 获取签收数据
+	 * @return
+	 */
+	@Override
+	public SignDataVo getSignData() {
+		return null;
+	}
+
+	/**
+	 * 获取在库数据
+	 * @param
+	 * @return
+	 */
+	private InStoreDataVO inStoreData(List<Long> warehouse) {
 		InStoreDataVO inStoreDataVO = new InStoreDataVO();
 
-		Integer OnTheShelves = 2;    // 上架
-		Integer NotOnTheShelves = 1; // 未上架
+		inStoreDataVO.setAll(inLibraryDeliverService.getIndexCount(warehouse));
+//		inStoreDataVO.setThirdParty(inLibraryDeliverService.getThirdParty(warehouse));
+		inStoreDataVO.setCity(inLibraryDeliverService.getCityData(warehouse));
+		inStoreDataVO.setShopp(inLibraryDeliverService.getShoppData(warehouse));
+		inStoreDataVO.setSelfHelp(inLibraryDeliverService.getSelfHelp(warehouse));
+		inStoreDataVO.setScatter(inLibraryDeliverService.getScatterCount(warehouse));
 
-		inStoreDataVO.setAll(inLibraryDeliverService.indexCount(warehouseId));
-		inStoreDataVO.setOnTheShelves(inLibraryDeliverService.theNumberOfShelvesInTheLibrary(warehouseId, OnTheShelves));
-		inStoreDataVO.setNotOnTheShelves(inLibraryDeliverService.theNumberOfShelvesInTheLibrary(warehouseId, NotOnTheShelves));
 
 		return inStoreDataVO;
 	}
 
 
+
+
+
+
+
+
 	/**
 	 * 异常工单数据
 	 */
@@ -128,4 +191,5 @@ public class IndexCountServiceImpl implements IndexCountService {
 			}
 		});
 	}
+
 }

blade-service/logpm-report/src/main/java/com/logpm/report/vo/IndexCountVO.java

@@ -12,11 +12,11 @@ import lombok.Data;
 @ApiModel("首页统计数据")
 public class IndexCountVO {
 
-	@ApiModelProperty("异常工单数量")
-	private QuantityAbnormalWorkOrdersVO quantityAbnormalWorkOrders;
-
-	@ApiModelProperty("出入库数量")
-	private InboundAndOutboundQuantityVO inboundAndOutboundQuantity;
+//	@ApiModelProperty("异常工单数量")
+//	private QuantityAbnormalWorkOrdersVO quantityAbnormalWorkOrders;
+//
+//	@ApiModelProperty("出入库数量")
+//	private InboundAndOutboundQuantityVO inboundAndOutboundQuantity;
 
 	@ApiModelProperty("在库数量")
 	private InStoreDataVO inStoreData;

blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/AbnormalDataVo.java

@@ -2,10 +2,12 @@ package com.logpm.report.vo.indexCount;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.List;
 
 @ApiModel("异常数据")
+@Data
 public class AbnormalDataVo {
 
 

blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/AbnormalDetailDataVo.java

@@ -3,11 +3,13 @@ package com.logpm.report.vo.indexCount;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.List;
 
 @ApiModel("异常数据明细")
+@Data
 public class AbnormalDetailDataVo {
 
 	@ApiModelProperty("发起数")

blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/DeliveryDataVo.java

@@ -3,8 +3,10 @@ package com.logpm.report.vo.indexCount;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 @ApiModel("当前配送数据")
+@Data
 public class DeliveryDataVo {
 	@ApiModelProperty("商配")
 	private DeliveryDetailDataVo shopp;

blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/DeliveryDetailDataVo.java

@@ -3,8 +3,10 @@ package com.logpm.report.vo.indexCount;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 @ApiModel("异常数据")
+@Data
 public class DeliveryDetailDataVo {
 	@ApiModelProperty("配送计划总数")
 	private Integer all;

blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/DetailMoneyVo.java

@@ -1,10 +1,14 @@
 package com.logpm.report.vo.indexCount;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 
 import java.math.BigDecimal;
 
+@ApiModel("开单收入")
+@Data
 public class DetailMoneyVo {
 	@ApiModelProperty("干线")
 	private BigDecimal gan;

blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/FreightDataVo.java

@@ -2,13 +2,14 @@ package com.logpm.report.vo.indexCount;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 库位数据
  */
 
 @ApiModel("库位数据")
-
+@Data
 public class FreightDataVo {
 	@ApiModelProperty("总数")
 	private Integer all;

blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/InStoreDataVO.java

@@ -11,11 +11,11 @@ public class InStoreDataVO {
 	@ApiModelProperty("总数")
 	private Integer all;
 
-	@ApiModelProperty("已上架数量")
+/*	@ApiModelProperty("已上架数量")
 	private Integer onTheShelves;
 
 	@ApiModelProperty("未上架数量")
-	private Integer notOnTheShelves;
+	private Integer notOnTheShelves;*/
 	@ApiModelProperty("零担")
 	private Integer scatter;
 	@ApiModelProperty("三方中转")

blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/MainLineDataVo.java

@@ -3,8 +3,10 @@ package com.logpm.report.vo.indexCount;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 @ApiModel("干线数据")
+@Data
 public class MainLineDataVo {
 
 	@ApiModelProperty("运单总数")

blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/SignDataVo.java

@@ -2,8 +2,10 @@ package com.logpm.report.vo.indexCount;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 @ApiModel("签收数据")
+@Data
 public class SignDataVo {
 	@ApiModelProperty("当月")
 	private SignDetailDataVo moon;

blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/SignDetailDataVo.java

@@ -3,10 +3,12 @@ package com.logpm.report.vo.indexCount;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.math.BigDecimal;
 
 @ApiModel("已签收数据")
+@Data
 public class SignDetailDataVo {
 
 	@ApiModelProperty("已签收")