Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

@@ -3065,6 +3065,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 										mtReceiveImagesDTOS.add(mtReceiveImagesDTO);
 									}
 								}
+								if (!mtReceiveImagesDTOS.isEmpty()) {
+									mtReceiveDTO.setReceiveImagesList(mtReceiveImagesDTOS);
+								}
 								orderMainClinet.sendReceiveInfoByNewSystem(mtReceiveDTO);
 							}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -1186,7 +1186,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		}
 		if (!list.isEmpty()) {
 			for (Long l : list) {
-				distributionAsyncService.sendFactorySignforInfo(l + "", myCurrentWarehouse, AuthUtil.getUser());
+				DistrilbutionBillLadingEntity billLadingEntity = this.getById(l);
+				BasicdataWarehouseEntity entityWarehouse= warehouseClient.getEntityWarehouseId(billLadingEntity.getWarehouseId());
+				distributionAsyncService.sendFactorySignforInfo(l + "", entityWarehouse, AuthUtil.getUser());
 
 			}
 		}
@@ -2804,6 +2806,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		//查询图片
 		List<DistributionPrintEntity> list2 = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda()
 			.eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLadingEntity.getId())
+			.eq(DistributionPrintEntity::getIsDeleted, 0)
 		);
 		detailOne.setPrintVOS(list2);
 		//查询库存品
@@ -2890,6 +2893,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		String coding = distributionBillLading.get("coding").toString();
 		String type = distributionBillLading.get("type").toString();
 
+
 		try {
 			DistrilbutionBillLadingEntity billLadingEntity1 = baseMapper.selectById((Serializable) billLadingId);
 			DistrilbutionAppBillLadingOrderMainVO billLadingOrderMainVO = baseMapper.getBillLadingOrderMainVO(Long.parseLong(billLadingId.toString()));
@@ -2897,12 +2901,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			if (isTaskCompleted(billLadingOrderMainVO, billLadingEntity1)) {
 				return Resp.scanFail("提货任务已完成！", "提货任务已完成！");
 			}
-
 			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 			if (myCurrentWarehouse == null) {
 				return Resp.scanFail("请选择仓库！", "请选择仓库！");
 			}
 
+
 			if (isAlreadySigned(billLadingId, coding, type)) {
 				return Resp.scanFail("该包件已签收！", "该包件已签收！");
 			}
@@ -2914,7 +2918,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			distributionBillLadingScan.setScanType(1);
 			distributionBillLadingScan.setWarehouseId(myCurrentWarehouse.getId());
 			distributionBillLadingScan.setScanUser(AuthUtil.getUser().getNickName());
-			return processScan(type, billLadingId, coding, distributionBillLadingScan, myCurrentWarehouse, billLadingEntity1.getPickupBatch());
+
+
+			return processScan(type, distributionBillLadingScan.getBillLadingId(), coding, distributionBillLadingScan, myCurrentWarehouse, billLadingEntity1.getPickupBatch());
 
 //			return Resp.scanSuccess("签收成功", "签收成功");
 		} catch (Exception e) {
@@ -2944,7 +2950,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return !list3.isEmpty();
 	}
 
-	private Resp processScan(String type, Object billLadingId, String coding, DistributionBillLadingScanEntity distributionBillLadingScan, BasicdataWarehouseEntity warehouse, String pickupBatch) {
+	private Resp processScan(String type, Long billLadingId, String coding, DistributionBillLadingScanEntity distributionBillLadingScan, BasicdataWarehouseEntity warehouse, String pickupBatch) {
 		if ("1".equals(type)) {
 			// 处理库存品包件逻辑
 			return handleOrderProduct(type, billLadingId, coding, distributionBillLadingScan, warehouse, pickupBatch);
@@ -3032,7 +3038,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	}
 
 
-	private Resp handleInventoryProduct(String type, Object billLadingId, String coding, DistributionBillLadingScanEntity distributionBillLadingScan) {
+	private Resp handleInventoryProduct(String type, Long billLadingId, String coding, DistributionBillLadingScanEntity distributionBillLadingScan) {
 
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtils.isNull(myCurrentWarehouse)) {
@@ -3173,7 +3179,22 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				//订单
 				distributionBillLadingScan.setStockArticleId(one.getId());
 				distributionBillLadingScan.setQuantity(1);
-				distributionBillLadingScan.setBillLadingId(Long.parseLong((String) billLadingId));
+				distributionBillLadingScan.setBillLadingId( billLadingId);
+
+				//推送梦天
+				if (distributionParcelListEntity.getBrandName().equals("梦天")){
+					Map<String, Object> pushMap = new HashMap<>();
+					pushMap.put("orderPackageCode", coding);
+					pushMap.put("operationTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+					pushMap.put("distributionContactId", billLadingId);
+					pushMap.put("destinationWarehouse", myCurrentWarehouse.getName());
+
+					rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE, RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, pushMap, message -> {
+						message.getMessageProperties()
+							.setHeader("x-delay", 3000);
+						return message;
+					});
+				}
 
 			}
 
@@ -3196,6 +3217,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		});
 
 
+
 		return Resp.scanSuccess("签收成功", "签收成功");
 	}
 

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

@@ -115,28 +115,52 @@ public interface WarehouseIndexMapper {
 	 * @param indexDTO
 	 * @return
 	 */
-	IndexDeliveryDataVO findTripartiteTotal(@Param("param")IndexDTO indexDTO);
+	IndexDeliveryDataVO findTripartiteTotalByMerchant(@Param("param")IndexDTO indexDTO);
 
 	/**
-	 * 查询三方总件数
+	 * 查询三方配送信息
+	 * @param indexDTO
+	 * @return
+	 */
+	IndexDeliveryDataVO findTripartiteTotalByCity(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询三方商配总件数
 	 * @param indexDTO
 	 * @return
 	 */
-	Integer findTripartiteTotalNum(@Param("param")IndexDTO indexDTO);
+	Integer findTripartiteTotalNumByMerchant(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询三方市配总件数
+	 * @param indexDTO
+	 * @return
+	 */
+	Integer findTripartiteTotalNumByCity(@Param("param")IndexDTO indexDTO);
 
 	/**
 	 * 查询三方总重量
 	 * @param indexDTO
 	 * @return
 	 */
-	BigDecimal findTripartiteTotalWeight(@Param("param")IndexDTO indexDTO);
+	BigDecimal findTripartiteTotalWeightByMerchant(@Param("param")IndexDTO indexDTO);
+
+
+	BigDecimal findTripartiteTotalWeightByCity(@Param("param")IndexDTO indexDTO);
 
 	/**
 	 * 查询三方配送总体积
 	 * @param indexDTO
 	 * @return
 	 */
-	BigDecimal findTripartiteTotalVolume(@Param("param")IndexDTO indexDTO);
+	BigDecimal findTripartiteTotalVolumeByMerchant(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询三方配送市配总体积
+	 * @param indexDTO
+	 * @return
+	 */
+	BigDecimal findTripartiteTotalVolumeByCity(@Param("param")IndexDTO indexDTO);
 
 	/**
 	 * 查询当天的签收数量
@@ -207,4 +231,60 @@ public interface WarehouseIndexMapper {
 	 * @return
 	 */
 	Integer findClerkOverTimeNumByMonth(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询自提签收包件数
+	 * @param indexDTO
+	 * @return
+	 */
+	Integer findBillLadingSignforByDay(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询当月自提签收包件数
+	 * @param indexDTO
+	 * @return
+	 */
+	Integer findBillLadingSignforByMonth(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询当天自提未签收数
+	 * @param indexDTO
+	 * @return
+	 */
+	Integer findBillLadingUnSignforByDay(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询当月自提未签收数
+	 * @param indexDTO
+	 * @return
+	 */
+	Integer findBillLadingUnSignforByMonth(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询当天自提复核数
+	 * @param indexDTO
+	 * @return
+	 */
+	Integer findBillLadingSignForNumByDay(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询当天签收超时数
+	 * @param indexDTO
+	 * @return
+	 */
+	Integer findBillLadingOverTimeNumByDay(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询当月签收数
+	 * @param indexDTO
+	 * @return
+	 */
+	Integer findBillLadingSignForNumByMonth(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询当月计划自提总数
+	 * @param indexDTO
+	 * @return
+	 */
+	Integer findBillLadingPlanNumByDay(@Param("param")IndexDTO indexDTO);
 }

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

@@ -374,7 +374,7 @@
             </if>
         </where>
     </select>
-    <select id="findTripartiteTotal" resultType="com.logpm.report.vo.indexCount.IndexDeliveryDataVO">
+    <select id="findTripartiteTotalByMerchant" resultType="com.logpm.report.vo.indexCount.IndexDeliveryDataVO">
         SELECT
         4 AS type,
         count( 1 ) AS totalNum
@@ -383,6 +383,7 @@
         <where>
             is_deleted = 0 AND type IS NOT NULL
             AND kind = 2
+            AND type = 1
             <if test="param.warehouseIds != null">
                 and warehouse_id in
                 <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
@@ -392,7 +393,26 @@
         </where>
 
     </select>
-    <select id="findTripartiteTotalNum" resultType="java.lang.Integer">
+    <select id="findTripartiteTotalByCity" resultType="com.logpm.report.vo.indexCount.IndexDeliveryDataVO">
+        SELECT
+        5 AS type,
+        count( 1 ) AS totalNum
+        FROM
+        logpm_distribution_delivery_list
+        <where>
+            is_deleted = 0 AND type IS NOT NULL
+            AND kind = 2
+            AND type = 2
+            <if test="param.warehouseIds != null">
+                and warehouse_id in
+                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+    <select id="findTripartiteTotalNumByMerchant" resultType="java.lang.Integer">
         SELECT
         count(ldrp.id)
         FROM
@@ -403,6 +423,7 @@
             lddl.is_deleted = 0
             AND lddl.type IS NOT NULL
             AND lddl.kind = 2
+            AND lddl.type = 1
             AND ldrp.packet_bar_status != 2
             <if test="param.warehouseIds != null">
                 and lddl.warehouse_id in
@@ -412,7 +433,28 @@
             </if>
         </where>
     </select>
-    <select id="findTripartiteTotalWeight" resultType="java.math.BigDecimal">
+    <select id="findTripartiteTotalNumByCity" resultType="java.lang.Integer">
+        SELECT
+        count(ldrp.id)
+        FROM
+        logpm_distribution_delivery_list AS lddl
+        LEFT JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id
+        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldrp.reservation_id = lds.reservation_id
+        <where>
+            lddl.is_deleted = 0
+            AND lddl.type IS NOT NULL
+            AND lddl.kind = 2
+            AND lddl.type = 2
+            AND ldrp.packet_bar_status != 2
+            <if test="param.warehouseIds != null">
+                and lddl.warehouse_id in
+                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="findTripartiteTotalWeightByMerchant" resultType="java.math.BigDecimal">
         SELECT
         IFNULL(sum(ldpl.weight),0) AS weight
         FROM
@@ -424,6 +466,7 @@
             lddl.is_deleted = 0
             AND lddl.type IS NOT NULL
             AND lddl.kind = 2
+            AND lddl.type = 1
             AND ldrp.packet_bar_status != 2
             <if test="param.warehouseIds != null">
                 and lddl.warehouse_id in
@@ -433,7 +476,51 @@
             </if>
         </where>
     </select>
-    <select id="findTripartiteTotalVolume" resultType="java.math.BigDecimal">
+    <select id="findTripartiteTotalWeightByCity" resultType="java.math.BigDecimal">
+        SELECT
+        IFNULL(sum(ldpl.weight),0) AS weight
+        FROM
+        logpm_distribution_delivery_list AS lddl
+        LEFT JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id
+        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldrp.reservation_id = lds.reservation_id
+        LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
+        <where>
+            lddl.is_deleted = 0
+            AND lddl.type IS NOT NULL
+            AND lddl.kind = 2
+            AND lddl.type = 2
+            AND ldrp.packet_bar_status != 2
+            <if test="param.warehouseIds != null">
+                and lddl.warehouse_id in
+                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="findTripartiteTotalVolumeByMerchant" resultType="java.math.BigDecimal">
+        SELECT
+        IFNULL(sum(ldpl.volume),0) AS volume
+        FROM
+        logpm_distribution_delivery_list AS lddl
+        LEFT JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id
+        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldrp.reservation_id = lds.reservation_id
+        LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
+        <where>
+            lddl.is_deleted = 0
+            AND lddl.type IS NOT NULL
+            AND lddl.kind = 2
+            AND lddl.type = 1
+            AND ldrp.packet_bar_status != 2
+            <if test="param.warehouseIds != null">
+                and lddl.warehouse_id in
+                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="findTripartiteTotalVolumeByCity" resultType="java.math.BigDecimal">
         SELECT
         IFNULL(sum(ldpl.volume),0) AS volume
         FROM
@@ -445,6 +532,7 @@
             lddl.is_deleted = 0
             AND lddl.type IS NOT NULL
             AND lddl.kind = 2
+            AND lddl.type = 2
             AND ldrp.packet_bar_status != 2
             <if test="param.warehouseIds != null">
                 and lddl.warehouse_id in
@@ -671,5 +759,151 @@
             </if>
         </where>
     </select>
+    <select id="findBillLadingSignforByDay" resultType="java.lang.Integer">
+        SELECT
+        count( 1 ) AS num
+        FROM
+        logpm_distribution_bill_lading_scan
+        <where>
+            is_deleted = 0
+            AND DATE_FORMAT( create_time, '%y%m%d' ) = DATE_FORMAT(
+            #{param.dayStr},
+            '%y%m%d')
+            <if test="param.warehouseIds != null">
+                AND warehouse_id
+                <foreach collection="param.warehouseIds" item="item" open="in (" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+
+    <select id="findBillLadingSignforByMonth" resultType="java.lang.Integer">
+        SELECT
+        count( 1 ) AS num
+        FROM
+        logpm_distribution_bill_lading_scan
+        <where>
+            is_deleted = 0
+            AND DATE_FORMAT( create_time, '%y%m' ) = DATE_FORMAT(
+            #{param.dayStr},
+            '%y%m')
+            <if test="param.warehouseIds != null">
+                AND warehouse_id
+                <foreach collection="param.warehouseIds" item="item" open="in (" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="findBillLadingUnSignforByDay" resultType="java.lang.Integer">
+        SELECT
+        count( 1 )
+        FROM
+        logpm_distrilbution_bill_package AS ldbp
+        INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldbp.parce_list_id = ldpl.id
+        <where>
+            ldbp.is_deleted = 0
+            AND ldpl.order_package_status != 70
+            AND DATE_FORMAT( ldbp.create_time, '%y%m%d' ) = DATE_FORMAT( #{param.dayStr}, '%y%m%d' )
+            <if test="param.warehouseIds != null">
+                AND ldpl.warehouse_id
+                <foreach collection="param.warehouseIds" item="item" open="in (" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="findBillLadingUnSignforByMonth" resultType="java.lang.Integer">
+        SELECT
+        count( 1 ) AS num
+        FROM
+        logpm_distrilbution_bill_package AS ldbp
+        INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldbp.parce_list_id = ldpl.id
+        <where>
+            ldbp.is_deleted = 0
+            AND ldpl.order_package_status != 70
+            AND DATE_FORMAT( ldbp.create_time, '%y%m' ) = DATE_FORMAT( #{param.dayStr}, '%y%m' )
+            <if test="param.warehouseIds != null">
+                AND ldpl.warehouse_id
+                <foreach collection="param.warehouseIds" item="item" open="in (" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="findBillLadingSignForNumByDay" resultType="java.lang.Integer">
+        SELECT
+        count(1)  AS num
+        FROM
+        logpm_distrilbution_bill_lading
+        <where>
+            is_deleted = 0
+            AND conditions = 30
+            AND DATE_FORMAT( create_time, '%y%m%d' ) = DATE_FORMAT( #{param.dayStr}, '%y%m%d' )
+            <if test="param.warehouseIds != null">
+                AND warehouse_id
+                <foreach collection="param.warehouseIds" item="item" open="in (" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="findBillLadingOverTimeNumByDay" resultType="java.lang.Integer">
+        SELECT
+        count(1)  AS num
+        FROM
+        logpm_distrilbution_bill_lading
+        <where>
+            is_deleted = 0
+            AND conditions = 30
+            AND DATEDIFF (DATE_FORMAT(create_time,"%y%m%d"),DATE_FORMAT(update_time,"%y%m%d")) > 3
+            <if test="param.warehouseIds != null">
+                AND warehouse_id
+                <foreach collection="param.warehouseIds" item="item" open="in (" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+    <select id="findBillLadingSignForNumByMonth" resultType="java.lang.Integer">
+        SELECT
+        count(1)  AS num
+        FROM
+        logpm_distrilbution_bill_lading
+        <where>
+            is_deleted = 0
+            AND conditions = 30
+            AND DATE_FORMAT( create_time, '%y%m' ) = DATE_FORMAT( #{param.dayStr}, '%y%m' )
+            <if test="param.warehouseIds != null">
+                AND warehouse_id
+                <foreach collection="param.warehouseIds" item="item" open="in (" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="findBillLadingPlanNumByDay" resultType="java.lang.Integer">
+        SELECT
+        count(1)  AS num
+        FROM
+        logpm_distrilbution_bill_lading
+        <where>
+            is_deleted = 0
+            AND DATE_FORMAT( create_time, '%y%m' ) = DATE_FORMAT( #{param.dayStr}, '%y%m' )
+            <if test="param.warehouseIds != null">
+                AND warehouse_id
+                <foreach collection="param.warehouseIds" item="item" open="in (" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 
 </mapper>

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

@@ -277,19 +277,34 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 			indexDeliveryDataVO.setTotalVolume(billLadingTotalVolume);
 			indexDeliveryDataVOList.add(indexDeliveryDataVO);
 		}
-		//查询外协信息
-		IndexDeliveryDataVO indexTripartiteDeliveryDataVO = warehouseIndexMapper.findTripartiteTotal(indexDTO);
-		if (Func.isNotEmpty(indexTripartiteDeliveryDataVO)) {
-			//查询外协总件数
-			Integer tripartiteTotalNum = warehouseIndexMapper.findTripartiteTotalNum(indexDTO);
-			indexTripartiteDeliveryDataVO.setTotalDeliveryNum(tripartiteTotalNum);
-			//查询外协总重量
-			BigDecimal tripartiteTotalWeight = warehouseIndexMapper.findTripartiteTotalWeight(indexDTO);
-			indexTripartiteDeliveryDataVO.setTotalWeight(tripartiteTotalWeight);
-			//查询外协总包件体积
-			BigDecimal tripartiteTotalVolume = warehouseIndexMapper.findTripartiteTotalVolume(indexDTO);
-			indexTripartiteDeliveryDataVO.setTotalVolume(tripartiteTotalVolume);
-			indexDeliveryDataVOList.add(indexTripartiteDeliveryDataVO);
+		//查询商配外协信息
+		IndexDeliveryDataVO indexTripartiteDeliveryMerchantDataVO = warehouseIndexMapper.findTripartiteTotalByMerchant(indexDTO);
+		if (Func.isNotEmpty(indexTripartiteDeliveryMerchantDataVO)) {
+
+			//查询商配外协总件数
+			Integer tripartiteTotalNum = warehouseIndexMapper.findTripartiteTotalNumByMerchant(indexDTO);
+			indexTripartiteDeliveryMerchantDataVO.setTotalDeliveryNum(tripartiteTotalNum);
+			//查询商配外协总重量
+			BigDecimal tripartiteTotalWeight = warehouseIndexMapper.findTripartiteTotalWeightByMerchant(indexDTO);
+			indexTripartiteDeliveryMerchantDataVO.setTotalWeight(tripartiteTotalWeight);
+			//查询商配外协总包件体积
+			BigDecimal tripartiteTotalVolume = warehouseIndexMapper.findTripartiteTotalVolumeByMerchant(indexDTO);
+			indexTripartiteDeliveryMerchantDataVO.setTotalVolume(tripartiteTotalVolume);
+			indexDeliveryDataVOList.add(indexTripartiteDeliveryMerchantDataVO);
+		}
+		//查询市配外协信息
+		IndexDeliveryDataVO indexTripartiteDeliveryCityDataVO = warehouseIndexMapper.findTripartiteTotalByCity(indexDTO);
+		if (Func.isNotEmpty(indexTripartiteDeliveryCityDataVO)) {
+			//查询市配外协总件数
+			Integer tripartiteTotalNum = warehouseIndexMapper.findTripartiteTotalNumByCity(indexDTO);
+			indexTripartiteDeliveryCityDataVO.setTotalDeliveryNum(tripartiteTotalNum);
+			//查询市配外协总重量
+			BigDecimal tripartiteTotalWeight = warehouseIndexMapper.findTripartiteTotalWeightByCity(indexDTO);
+			indexTripartiteDeliveryCityDataVO.setTotalWeight(tripartiteTotalWeight);
+			//查询市配外协总包件体积
+			BigDecimal tripartiteTotalVolume = warehouseIndexMapper.findTripartiteTotalVolumeByCity(indexDTO);
+			indexTripartiteDeliveryCityDataVO.setTotalVolume(tripartiteTotalVolume);
+			indexDeliveryDataVOList.add(indexTripartiteDeliveryCityDataVO);
 		}
 		return indexDeliveryDataVOList;
 	}
@@ -310,10 +325,10 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 		Integer dayUnSignforNum = warehouseIndexMapper.findUnSignforDataByDay(indexDTO);
 		indexSignforDayDataVO.setUnSignNum(dayUnSignforNum);
 		//计算签收率
-		if (daySignforNum > 0 && (daySignforNum + dayUnSignforNum) >0){
+		if (daySignforNum > 0 && (daySignforNum + dayUnSignforNum) > 0) {
 			Double daySignforScale = (double) (daySignforNum / (daySignforNum + dayUnSignforNum) * 100);
 			indexSignforDayDataVO.setSignScale(daySignforScale);
-		}else {
+		} else {
 			indexSignforDayDataVO.setSignScale(0.00);
 		}
 		//查询当天文员复核数
@@ -322,7 +337,7 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 		//查询当天计划数
 		Integer dayPlanByday = warehouseIndexMapper.findPlanNumByDay(indexDTO);
 		//计算文员签收率
-		if (dayClerkSignforNum > 0 && (dayPlanByday + dayClerkSignforNum)>0){
+		if (dayClerkSignforNum > 0 && (dayPlanByday + dayClerkSignforNum) > 0) {
 			Double dayClerkSignforScale = (double) (dayClerkSignforNum / (dayPlanByday + dayClerkSignforNum));
 			indexSignforDayDataVO.setClerkSignforScale(dayClerkSignforScale);
 		} else {
@@ -332,8 +347,6 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 		//文员超时复核数
 		Integer dayClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByDay(indexDTO);
 		indexSignforDayDataVO.setClerkOverTimeSignfoNum(dayClerkOverTimeSignfoNum);
-
-
 		indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum);
 		list.add(indexSignforDayDataVO);
 		IndexSignforDataVO indexSignforMonthDataVO = new IndexSignforDataVO();
@@ -345,35 +358,94 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 		Integer monthUnSignforNum = warehouseIndexMapper.findUnSignforDataByMonth(indexDTO);
 		indexSignforMonthDataVO.setUnSignNum(monthUnSignforNum);
 		//计算签收率
-		if (monthSignforNum > 0  && (monthUnSignforNum + monthSignforNum) > 0){
+		if (monthSignforNum > 0 && (monthUnSignforNum + monthSignforNum) > 0) {
 			Double monthSignforScale = (double) (monthSignforNum / (monthUnSignforNum + monthSignforNum));
 			indexSignforMonthDataVO.setSignScale(monthSignforScale);
-		}else {
+		} else {
 			indexSignforMonthDataVO.setSignScale(0.00);
-
 		}
-
 		//查询当月文员复核数
 		Integer monthClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByMonth(indexDTO);
 		indexSignforMonthDataVO.setClerkSignNum(monthClerkSignforNum);
 		Integer monthPlanByday = warehouseIndexMapper.findPlanNumByMonth(indexDTO);
-		if (monthClerkSignforNum > 0 && (monthPlanByday + monthClerkSignforNum)>0){
+		if (monthClerkSignforNum > 0 && (monthPlanByday + monthClerkSignforNum) > 0) {
 			Double monthClerkSignforScale = (double) (monthClerkSignforNum / (monthPlanByday + monthClerkSignforNum));
 			indexSignforMonthDataVO.setClerkSignforScale(monthClerkSignforScale);
-		}else {
+		} else {
 			indexSignforMonthDataVO.setClerkSignforScale(0.00);
 		}
 		//查询当月文员复核
 		Integer monthClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByMonth(indexDTO);
 		indexSignforMonthDataVO.setClerkOverTimeSignfoNum(monthClerkOverTimeSignfoNum);
-		if (monthClerkOverTimeSignfoNum >0 && monthPlanByday>0){
+		if (monthClerkOverTimeSignfoNum > 0 && monthPlanByday > 0) {
 			Double monthClerkOverTimeScale = (double) (monthClerkOverTimeSignfoNum / monthPlanByday);
 			indexSignforMonthDataVO.setClerkOverTimeScale(monthClerkOverTimeScale);
 
-		}else {
+		} else {
 			indexSignforMonthDataVO.setClerkOverTimeScale(0.00);
 		}
 		list.add(indexSignforMonthDataVO);
+
+		//查询自提相关的签收信息
+
+		IndexSignforDataVO indexBillLadingSignforDayDataVO = new IndexSignforDataVO();
+		//查询自提签收包件信息
+		Integer dayBillLadingSignfor = warehouseIndexMapper.findBillLadingSignforByDay(indexDTO);
+		indexBillLadingSignforDayDataVO.setSignNum(dayBillLadingSignfor);
+		//查询自提未签收树
+		Integer dayBillLadingUnSignfor = warehouseIndexMapper.findBillLadingUnSignforByDay(indexDTO);
+		indexBillLadingSignforDayDataVO.setUnSignNum(dayBillLadingUnSignfor);
+		//计算当天的签收率
+		if (dayBillLadingSignfor > 0 && (dayBillLadingSignfor + dayBillLadingUnSignfor) > 0) {
+			Double dayBillLadingSignforScale = (double) (dayBillLadingSignfor / (dayBillLadingSignfor + dayBillLadingUnSignfor));
+			indexBillLadingSignforDayDataVO.setClerkSignforScale(dayBillLadingSignforScale);
+		} else {
+			indexBillLadingSignforDayDataVO.setClerkSignforScale(0.00);
+		}
+		//查询当天文员复核数
+		Integer dayBillLadingSignforNum = warehouseIndexMapper.findBillLadingSignForNumByDay(indexDTO);
+		indexBillLadingSignforDayDataVO.setClerkSignNum(dayBillLadingSignforNum);
+
+		//查询当天签收超时数
+		Integer dayBillLadingverTimeNum = warehouseIndexMapper.findBillLadingOverTimeNumByDay(indexDTO);
+		indexBillLadingSignforDayDataVO.setClerkOverTimeSignfoNum(dayBillLadingverTimeNum);
+		list.add(indexBillLadingSignforDayDataVO);
+
+
+		IndexSignforDataVO indexBillLadingSignforMonthDataVO = new IndexSignforDataVO();
+		//查询自提当月签收情况
+		Integer monthBillLadingSignfor = warehouseIndexMapper.findBillLadingSignforByMonth(indexDTO);
+		indexBillLadingSignforMonthDataVO.setSignNum(monthBillLadingSignfor);
+		//查询自提当月未签数量
+		Integer monthBillLadingUnSignfor = warehouseIndexMapper.findBillLadingUnSignforByMonth(indexDTO);
+		indexBillLadingSignforMonthDataVO.setUnSignNum(monthBillLadingSignfor);
+		//计算当月的签收率
+		if (monthBillLadingSignfor > 0 && (monthBillLadingSignfor + monthBillLadingUnSignfor) > 0) {
+			Double monthBillLadingSignforScale = (double) (dayBillLadingSignfor / (dayBillLadingSignfor + dayBillLadingUnSignfor));
+			indexBillLadingSignforMonthDataVO.setSignScale(monthBillLadingSignforScale);
+		} else {
+			indexBillLadingSignforMonthDataVO.setSignScale(0.00);
+		}
+
+		//查询当月文员签收数
+		Integer monthBillLadingSignforNum = warehouseIndexMapper.findBillLadingSignForNumByMonth(indexDTO);
+		indexBillLadingSignforMonthDataVO.setClerkSignNum(monthBillLadingSignforNum);
+		//查询当月文员超时签收数
+		Integer monthBillLadingOverTimeNum = warehouseIndexMapper.findBillLadingOverTimeNumByDay(indexDTO);
+		indexBillLadingSignforMonthDataVO.setClerkOverTimeSignfoNum(monthBillLadingOverTimeNum);
+		//查询当月计划总数
+		Integer monthBillLadingPlanNum = warehouseIndexMapper.findBillLadingPlanNumByDay(indexDTO);
+		if (monthBillLadingOverTimeNum > 0 && monthBillLadingPlanNum > 0) {
+			//计算当月的超时签收率
+			Double monthBillLadingClerkOverTimeSignfoNum = (double) (monthBillLadingOverTimeNum / monthBillLadingPlanNum);
+			indexBillLadingSignforMonthDataVO.setClerkOverTimeScale(monthBillLadingClerkOverTimeSignfoNum);
+
+		} else {
+			indexBillLadingSignforMonthDataVO.setClerkSignforScale(0.00);
+		}
+		list.add(indexBillLadingSignforMonthDataVO);
+
+
 		return list;
 	}
 }