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

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

@@ -9,12 +9,12 @@
              logpm_platform.logpm_warehouse_waybill
         where  freeze_status = 0
         <where>
+            <if test="item != null">
+                and destination_warehouse_id in
                 <foreach collection="warehouseId" index="index" item="item">
-                    <if test="item != null">
-                        and  destination_warehouse_id = #{item}
-                    </if>
-
+                          #{item}
                 </foreach>
+            </if>
             <if test="timeType !=null ">
                 <choose>
                     <when test="timeType == 2">

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

@@ -1,7 +1,6 @@
 package com.logpm.report.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,11 +9,52 @@ import java.util.List;
 @Mapper
 public interface  InLibraryDeliverMapper  extends BaseMapper {
 
+	/**
+	 * 根据仓库ID获取在库总量数据
+	 * @param warehouseId
+	 * @return
+	 */
 	Integer obtainTheNumberOfInventoryListings (Long warehouseId);
 
+	/**
+	 * 根据仓库ID\1已上架 2未上架获取在库数
+	 * @param warehouseId
+	 * @param order_package_grounding_status
+	 * @return
+	 */
 	Integer theNumberOfShelvesInTheLibrary(Long warehouseId , Integer order_package_grounding_status);
 
-//	Integer quantityInTransit(@Param("id") Long id,)
+
+	/**
+	 * 获取零担件数
+	 * @param warehouse
+	 * @return
+	 */
+	Integer getScatterCount(@Param("warehouse") List<Long> warehouse);
+
+
+	/**
+	 * 获取中转仓数据
+	 * @param warehouse
+	 * @return
+	 */
+	Integer getThirdParty(@Param("warehouse") List<Long> warehouse);
+
+	/**
+	 * 获取商配数据
+	 * @param warehouse
+	 * @return
+	 */
+	Integer getShoppData(@Param("warehouse") List<Long> warehouse);
+
+	/**
+	 * 获取市配数据
+	 * @param warehouse
+	 * @return
+	 */
+	Integer getCityData(@Param("warehouse") List<Long> warehouse);
+	Integer getSelfHelp(@Param("warehouse") List<Long> warehouse);
+
 }
 
 

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

@@ -24,4 +24,79 @@
                 and warehouse_id = #{warehouseId}
             </if>
     </select>
+    <!--获取在库零担数据-->
+    <select id="getScatterCount" resultType="java.lang.Integer">
+        select sum(hand_quantity) as con
+        from logpm_distribution_stock_article
+        where
+            is_zero = 1
+          and
+        order_status = 20
+        <where>
+            <if test="item != null">
+                and  warehouse_id in
+            <foreach collection="warehouse" index="index" item="item">
+                       #{item}
+            </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="getThirdParty" resultType="java.lang.Integer"></select>
+    <select id="getShoppData" resultType="java.lang.Integer">
+        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">
+                and  warehouse_id in
+                <foreach collection="warehouse" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="getCityData" resultType="java.lang.Integer">
+        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">
+                and  warehouse_id in
+                <foreach collection="warehouse" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+    <select id="getSelfHelp" resultType="java.lang.Integer">
+        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">
+                and  warehouse_id in
+                <foreach collection="warehouse" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+
 </mapper>

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

@@ -13,6 +13,12 @@ public interface InLibraryDeliverService {
 
 	 Integer theNumberOfShelvesInTheLibrary(Long id,Integer order_package_grounding_statu);
 
+	/**
+	 * 获取在库零担件数
+	 * @return
+	 */
+	Integer getScatterCount();
+
 
 
 }

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

@@ -33,4 +33,13 @@ public class InLibraryDeliverServiceImpl implements InLibraryDeliverService {
 	public Integer theNumberOfShelvesInTheLibrary(Long id, Integer order_package_grounding_status){
 		return  inLibraryDeliverMapper.theNumberOfShelvesInTheLibrary(id, order_package_grounding_status);
 	}
+
+	/**
+	 * 获取在库零担数据
+	 * @return
+	 */
+	@Override
+	public Integer getScatterCount() {
+		return null;
+	}
 }

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

@@ -0,0 +1,16 @@
+package com.logpm.report.vo.indexCount;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+@ApiModel("异常数据")
+public class AbnormalDataVo {
+
+
+	@ApiModelProperty("当月")
+	private AbnormalDetailDataVo moon;
+	@ApiModelProperty("当日")
+	private AbnormalDetailDataVo day;
+}

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

@@ -0,0 +1,21 @@
+package com.logpm.report.vo.indexCount;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel("异常数据明细")
+public class AbnormalDetailDataVo {
+
+	@ApiModelProperty("发起数")
+	private Integer all;
+	@ApiModelProperty("待处理数")
+	private Integer notProcessed;
+
+	@ApiModelProperty("异常率")
+	private BigDecimal approximateRate;
+
+}

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

@@ -0,0 +1,16 @@
+package com.logpm.report.vo.indexCount;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel("当前配送数据")
+public class DeliveryDataVo {
+	@ApiModelProperty("商配")
+	private DeliveryDetailDataVo shopp;
+
+	@ApiModelProperty("市配")
+	private DeliveryDetailDataVo city;
+
+
+}

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

@@ -0,0 +1,21 @@
+package com.logpm.report.vo.indexCount;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel("异常数据")
+public class DeliveryDetailDataVo {
+	@ApiModelProperty("配送计划总数")
+	private Integer all;
+	@ApiModelProperty("总件数")
+	private Integer allCount;
+	@ApiModelProperty("总重量")
+	private Integer allWeight;
+	@ApiModelProperty("总方数")
+	private Integer allArea;
+	@ApiModelProperty("在途件数")
+	private Integer onTheWay;
+
+
+}

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

@@ -0,0 +1,27 @@
+package com.logpm.report.vo.indexCount;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 库位数据
+ */
+
+@ApiModel("库位数据")
+
+public class FreightDataVo {
+	@ApiModelProperty("总数")
+	private Integer all;
+	@ApiModelProperty("已上架库位数")
+	private Integer shelves;
+	@ApiModelProperty("闲置库位数")
+	private Integer idle;
+	@ApiModelProperty("已上架件数")
+	private Integer shelvesCount;
+	@ApiModelProperty("未上架件数")
+	private Integer idleCount;
+
+
+
+
+}

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

@@ -16,4 +16,18 @@ public class InStoreDataVO {
 
 	@ApiModelProperty("未上架数量")
 	private Integer notOnTheShelves;
+	@ApiModelProperty("零担")
+	private Integer scatter;
+	@ApiModelProperty("三方中转")
+	private Integer thirdParty;
+	@ApiModelProperty("商配")
+	private Integer shopp;
+	@ApiModelProperty("市配")
+	private Integer city;
+	@ApiModelProperty("自提")
+	private Integer selfHelp;
+
+
+
+
 }

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

@@ -0,0 +1,33 @@
+package com.logpm.report.vo.indexCount;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel("干线数据")
+public class MainLineDataVo {
+
+	@ApiModelProperty("运单总数")
+	private Integer billAll;
+	@ApiModelProperty("在库总件数")
+	private Integer  inWareCount;
+	@ApiModelProperty("在库总重量")
+	private Integer inWareWeight;
+	@ApiModelProperty("在库总方数")
+	private Integer inWareArea;
+
+	/**
+	 * 干线车次统计
+	 */
+	@ApiModelProperty("总车次")
+	private Integer allCar;
+	@ApiModelProperty("在途")
+	private Integer street;
+	@ApiModelProperty("作业")
+	private Integer job;
+	@ApiModelProperty("卸车完成数")
+	private Integer endCount;
+
+
+
+}

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

@@ -0,0 +1,12 @@
+package com.logpm.report.vo.indexCount;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel("签收数据")
+public class SignDataVo {
+	@ApiModelProperty("当月")
+	private SignDetailDataVo moon;
+	@ApiModelProperty("当日")
+	private SignDetailDataVo day;
+}

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

@@ -0,0 +1,33 @@
+package com.logpm.report.vo.indexCount;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+@ApiModel("已签收数据")
+public class SignDetailDataVo {
+
+	@ApiModelProperty("已签收")
+	private Integer endSign;
+	@ApiModelProperty("未签收")
+	private Integer noSign;
+
+	@ApiModelProperty("签收率")
+	private BigDecimal approximateRate;
+
+
+	@ApiModelProperty("文员签收数")
+	private Integer jobApproximateRate;
+	@ApiModelProperty("文员签收率")
+	private Integer jobNoSign;
+
+	@ApiModelProperty("超时签收")
+	private Integer timeEndSign;
+	@ApiModelProperty("超时签收率")
+	private Integer timeApproximateRate;
+
+
+
+}