首页配送内容更新代码

1 修改回传时修改的状态不正确的问题

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/FactoryNodePushServiceImpl.java

@@ -36,7 +36,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -264,17 +263,18 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl<FactoryNodePushM
 		log.info("推送工厂：{}", JSONUtil.toJsonStr(sendObj));
 		String url = linsyProperties.getHost() + linsyProperties.getPushNodeUrl();
 		try {
+			String result = "回传结果";
 			if (linsyProperties.getEnable()) {
-				String result = HttpUtil.post(url, JSONUtil.toJsonStr(sendObj));
+				result = HttpUtil.post(url, JSONUtil.toJsonStr(sendObj));
 				log.info("推送工厂结果：{}", result);
-				// 保存推送记录
-				this.save(FactoryNodePushEntity.builder()
-					.billCode(orderCode)
-					.node(factoryByNodeAndStatus.getCode().toString())
-					.content(JSONUtil.toJsonStr(sendObj))
-					.resultContent(result)
-					.build());
 			}
+			// 保存推送记录
+			this.save(FactoryNodePushEntity.builder()
+				.billCode(orderCode)
+				.node(factoryByNodeAndStatus.getCode().toString())
+				.content(JSONUtil.toJsonStr(sendObj))
+				.resultContent(result)
+				.build());
 		} catch (Exception e) {
 			log.error("推送工厂失败：{}", e);
 		}

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

@@ -285,7 +285,7 @@ public class WarehouseIndexController {
 	@ResponseBody
 	@PostMapping("/deliveryData")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "卸车异常数据", notes = "传入indexDTO")
+	@ApiOperation(value = "配送计划数据", notes = "传入indexDTO")
 	public R deliveryData(@RequestBody IndexDTO indexDTO) {
 		String method = "###########unloadAbnormalData: ";
 		log.info(method + "indexDTO={}", indexDTO);

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

@@ -66,34 +66,34 @@ public interface WarehouseIndexMapper {
 	 * @param indexDTO
 	 * @return
 	 */
-	IndexDeliveryDataVO findBillLadingTotal(@Param("param") IndexDTO indexDTO);
+	List<IndexDeliveryDataVO> findBillLadingTotal(@Param("param") IndexDTO indexDTO);
 
 	/**
 	 * 查询配送信息
 	 *
 	 * @param type
-	 * @param indexDTO
+	 * @param warehouseId
 	 * @return
 	 */
-	Integer findDeLiveryTotalNum(@Param("param") IndexDTO indexDTO, @Param("type") String type);
+	Integer findDeLiveryTotalNum( @Param("type") String type,@Param("warehouseId") Long warehouseId,@Param("kind")Integer kind);
 
 	/**
 	 * 查询当前配送总重量
 	 *
-	 * @param indexDTO
+	 * @param warehouseId
 	 * @param type
 	 * @return
 	 */
-	BigDecimal findDeliveryTotalWeight(@Param("param") IndexDTO indexDTO, @Param("type") String type);
+	BigDecimal findDeliveryTotalWeight( @Param("type") String type,@Param("warehouseId") Long warehouseId,@Param("kind")Integer kind);
 
 	/**
 	 * 查询当前配送总体积
 	 *
-	 * @param indexDTO
+	 * @param warehouseId
 	 * @param type
 	 * @return
 	 */
-	BigDecimal findDeliveryTotalVolume(@Param("param") IndexDTO indexDTO, @Param("type") String type);
+	BigDecimal findDeliveryTotalVolume( @Param("type") String type,@Param("warehouseId") Long warehouseId,@Param("kind")Integer kind);
 
 	/**
 	 * 查询当前配送总重量
@@ -102,30 +102,30 @@ public interface WarehouseIndexMapper {
 	 * @param type
 	 * @return
 	 */
-	Integer findDeLiveryTotalRoadNum(@Param("param") IndexDTO indexDTO, @Param("type") String type);
+	Integer findDeLiveryTotalRoadNum( @Param("type") String type,@Param("warehouseId") Long warehouseId);
 
 	/**
 	 * 查询自提总件数
 	 *
 	 * @return
 	 */
-	Integer findBillLadingTotalNum(@Param("param") IndexDTO indexDTO);
+	Integer findBillLadingTotalNum(@Param("warehouseId") Long warehouseId);
 
 	/**
 	 * 查询自提包件总重量
 	 *
-	 * @param indexDTO
+	 * @param warehouseId
 	 * @return
 	 */
-	BigDecimal findBillLadingTotalWeight(@Param("param") IndexDTO indexDTO);
+	BigDecimal findBillLadingTotalWeight(@Param("warehouseId") Long warehouseId);
 
 	/**
 	 * 查询自提包件总体积
 	 *
-	 * @param indexDTO
+	 * @param warehouseId
 	 * @return
 	 */
-	BigDecimal findBillLadingTotalVolume(@Param("param") IndexDTO indexDTO);
+	BigDecimal findBillLadingTotalVolume(@Param("warehouseId") Long warehouseId);
 
 
 	/**
@@ -346,4 +346,18 @@ public interface WarehouseIndexMapper {
 	List<WarehouseNumberVO> findUpshelfNumByWarehouseId(@Param("param") IndexDTO indexDTO);
 
 	List<WarehouseNumberVO> findTrayNumByWarehouseId(@Param("param") IndexDTO indexDTO);
+
+	/**
+	 * 查询自提在途件数
+	 * @param warehouseId
+	 * @return
+	 */
+	Integer findBillLadingRoadTotalNum(@Param("warehouseId")Long warehouseId);
+
+	/**
+	 * 查询外协配送信息
+	 * @param indexDTO
+	 * @return
+	 */
+	List<IndexDeliveryDataVO> findTripartiteDeliveryTotal(@Param("param")IndexDTO indexDTO);
 }

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

@@ -220,12 +220,16 @@
     </select>
     <select id="findDeliveryTotal" resultType="com.logpm.report.vo.indexCount.IndexDeliveryDataVO">
         SELECT
+        warehouse_name,
+        warehouse_id,
         type AS type,
         count( 1 ) AS totalNum
         FROM
         logpm_distribution_delivery_list
         <where>
-            is_deleted = 0 AND type IS NOT NULL
+            is_deleted = 0
+            AND type IS NOT NULL
+            AND kind = 1
             <if test="param.warehouseIds != null">
                 and warehouse_id in
                 <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
@@ -234,10 +238,12 @@
             </if>
         </where>
         GROUP BY
-        type
+        warehouse_id,type
     </select>
     <select id="findBillLadingTotal" resultType="com.logpm.report.vo.indexCount.IndexDeliveryDataVO">
         SELECT
+        warehouse_name,
+        warehouse_id,
         3 AS type,
         count( 1 ) AS totalNum
         FROM
@@ -251,23 +257,22 @@
                 </foreach>
             </if>
         </where>
+        GROUP BY
+        warehouse_id
     </select>
     <select id="findDeLiveryTotalNum" resultType="java.lang.Integer">
         SELECT
-        sum( reservation_num + reservation_stock_list_num ) AS num
+        IFNULL(sum( ldr.reservation_num + ldr.reservation_stock_list_num ),0) AS num
         FROM
-        logpm_distribution_reservation
+        logpm_distribution_reservation AS ldr
+        LEFT JOIN logpm_distribution_signfor AS lds ON lds.reservation_id = ldr.id AND lds.is_deleted = 0
+        LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id AND lddl.is_deleted = 0
         <where>
-            reservation_status != 40
-            AND is_deleted = 0
-            AND delivery_type = #{type}
-            <if test="param.warehouseIds != null">
-                AND warehouse_id IN
-                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-
+            ldr.reservation_status != 40
+            AND ldr.is_deleted = 0
+            AND ldr.delivery_type = #{type}
+            AND lddl.kind = #{kind}
+            AND ldr.warehouse_id = #{warehouseId}
         </where>
 
     </select>
@@ -276,20 +281,16 @@
         IFNULL(sum( ldpl.weight ),0) AS num
         FROM
         logpm_distribution_reservation AS ldr
-        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldr.id = ldrp.reservation_id
+        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldr.id = ldrp.reservation_id AND ldrp.packet_bar_status != 2
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.id = ldrp.parce_list_id
+        LEFT JOIN logpm_distribution_signfor AS lds ON lds.reservation_id = ldr.id AND lds.is_deleted = 0
+        LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id AND lddl.is_deleted = 0
         <where>
             ldr.reservation_status != 40
             AND ldr.is_deleted = 0
-            AND ldrp.packet_bar_status != 2
             AND ldr.delivery_type = #{type}
-            <if test="param.warehouseIds != null">
-                AND ldr.warehouse_id IN
-                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-
+            AND lddl.kind = #{kind}
+            AND ldr.warehouse_id = #{warehouseId}
         </where>
     </select>
     <select id="findDeliveryTotalVolume" resultType="java.math.BigDecimal">
@@ -297,41 +298,31 @@
         IFNULL(sum( ldpl.volume ),0) AS num
         FROM
         logpm_distribution_reservation AS ldr
-        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldr.id = ldrp.reservation_id
+        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldr.id = ldrp.reservation_id AND ldrp.packet_bar_status != 2
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.id = ldrp.parce_list_id
+        LEFT JOIN logpm_distribution_signfor AS lds ON lds.reservation_id = ldr.id AND lds.is_deleted = 0
+        LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id AND lddl.is_deleted = 0
         <where>
             ldr.reservation_status != 40
             AND ldr.is_deleted = 0
-            AND ldrp.packet_bar_status != 2
             AND ldr.delivery_type = #{type}
-            <if test="param.warehouseIds != null">
-                AND ldr.warehouse_id IN
-                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
+            AND lddl.kind = #{kind}
+            AND ldr.warehouse_id = #{warehouseId}
         </where>
     </select>
     <select id="findDeLiveryTotalRoadNum" resultType="java.lang.Integer">
         SELECT
-        IFNULL(sum( ldl.package_nub ),0) AS num
+        SUM((ldr.reservation_num + ldr.reservation_stock_list_num) - (lds.loaded_number+lds.loadedin_number))
         FROM
         logpm_distribution_reservation AS ldr
-        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldr.id = ldrp.reservation_id
-        LEFT JOIN logpm_distribution_loadscan AS ldl ON ldl.package_id = ldrp.parce_list_id
+        LEFT JOIN logpm_distribution_signfor AS lds ON lds.reservation_id = ldr.id AND lds.is_deleted = 0
+        LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id AND lddl.is_deleted = 0
         <where>
             ldr.reservation_status != 40
             AND ldr.is_deleted = 0
-            AND ldrp.packet_bar_status != 2
-            AND ldl.signfor_state = 1
-            AND ldl.is_deleted = 0
             AND ldr.delivery_type = #{type}
-            <if test="param.warehouseIds != null">
-                AND ldr.warehouse_id IN
-                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
+            AND lddl.kind = 1
+            AND ldr.warehouse_id  = #{warehouseId}
         </where>
     </select>
     <select id="findBillLadingTotalNum" resultType="java.lang.Integer">
@@ -339,17 +330,11 @@
         count(1) AS num
         FROM
         logpm_distrilbution_bill_package AS ldbp
-        LEFT JOIN logpm_distrilbution_bill_lading AS ldbl ON ldbp.bill_lading_id = ldbl.id
+        LEFT JOIN logpm_distrilbution_bill_lading AS ldbl ON ldbp.bill_lading_id = ldbl.id  AND ldbl.is_deleted = 0
         <where>
             ldbp.packet_bar_status != 2
             AND ldbp.is_deleted = 0
-            AND ldbl.is_deleted = 0
-            <if test="param.warehouseIds != null">
-                AND ldbl.warehouse_id IN
-                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
+            AND ldbl.warehouse_id = #{warehouseId}
         </where>
     </select>
     <select id="findBillLadingTotalWeight" resultType="java.math.BigDecimal">
@@ -357,18 +342,12 @@
         IFNULL(sum(ldpl.weight),0) AS weight
         FROM
         logpm_distrilbution_bill_package AS ldbp
-        LEFT JOIN logpm_distrilbution_bill_lading AS ldbl ON ldbp.bill_lading_id = ldbl.id
+        LEFT JOIN logpm_distrilbution_bill_lading AS ldbl ON ldbp.bill_lading_id = ldbl.id AND ldbl.is_deleted = 0
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.id = ldbp.parce_list_id
         <where>
             ldbp.packet_bar_status != 2
             AND ldbp.is_deleted = 0
-            AND ldbl.is_deleted = 0
-            <if test="param.warehouseIds != null">
-                AND ldbl.warehouse_id IN
-                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
+            AND ldbl.warehouse_id = #{warehouseId}
         </where>
     </select>
     <select id="findBillLadingTotalVolume" resultType="java.math.BigDecimal">
@@ -376,18 +355,12 @@
         IFNULL(sum(ldpl.volume),0) AS volume
         FROM
         logpm_distrilbution_bill_package AS ldbp
-        LEFT JOIN logpm_distrilbution_bill_lading AS ldbl ON ldbp.bill_lading_id = ldbl.id
+        LEFT JOIN logpm_distrilbution_bill_lading AS ldbl ON ldbp.bill_lading_id = ldbl.id AND ldbl.is_deleted = 0
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.id = ldbp.parce_list_id
         <where>
             ldbp.packet_bar_status != 2
             AND ldbp.is_deleted = 0
-            AND ldbl.is_deleted = 0
-            <if test="param.warehouseIds != null">
-                AND ldbl.warehouse_id IN
-                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
+            AND ldbl.warehouse_id = #{warehouseId}
         </where>
     </select>
     <select id="findTripartiteTotalByMerchant" resultType="com.logpm.report.vo.indexCount.IndexDeliveryDataVO">
@@ -1021,6 +994,42 @@
         </foreach>
         group by warehouse_id
     </select>
+    <select id="findBillLadingRoadTotalNum" resultType="java.lang.Integer">
+        SELECT
+        COUNT(1)
+        FROM
+        logpm_distrilbution_bill_lading AS  ldbl
+        LEFT JOIN logpm_distrilbution_bill_package AS ldbp ON ldbl.id = ldbp.bill_lading_id AND ldbp.packet_bar_status != 2
+        LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.id = ldbp.parce_list_id AND ldpl.order_package_status != 70
+        LEFT JOIN logpm_dis_stock_list_detail AS ldsld ON ldsld.reservation_id = ldbl.id AND ldsld.stock_signfo_status != 20 AND ldsld.stock_package_status != 2
+        WHERE
+        ldbl.is_deleted = 0
+        AND ldbl.warehouse_id = #{warehouseId}
+        GROUP BY
+        ldbl.warehouse_id
+    </select>
+    <select id="findTripartiteDeliveryTotal" resultType="com.logpm.report.vo.indexCount.IndexDeliveryDataVO">
+        SELECT
+        warehouse_name,
+        warehouse_id,
+        type AS type,
+        count( 1 ) AS totalNum
+        FROM
+        logpm_distribution_delivery_list
+        <where>
+            is_deleted = 0
+            AND type IS NOT NULL
+            AND kind = 2
+            <if test="param.warehouseIds != null">
+                and warehouse_id in
+                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY
+        warehouse_id,type
+    </select>
 
 
 </mapper>

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

@@ -499,7 +499,8 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 
 		BladeUser user = AuthUtil.getUser();
 		String key = CacheNames.tenantKey(user.getTenantId(), user.getUserId() + "", "deliveryData:" + indexDTO.toString());
-		List<IndexDeliveryDataVO> indexDeliveryDataVOList = bladeRedis.get(key);
+//		List<IndexDeliveryDataVO> indexDeliveryDataVOList = bladeRedis.get(key);
+		List<IndexDeliveryDataVO> indexDeliveryDataVOList= null;
 		if (Objects.isNull(indexDeliveryDataVOList)) {
 			//查询商市配的信息
 			indexDeliveryDataVOList = new ArrayList<>();
@@ -507,68 +508,59 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 			if (!indexDeliveryDataVOS.isEmpty()) {
 				for (IndexDeliveryDataVO indexDeliveryDataVO : indexDeliveryDataVOS) {
 					//总包件数量
-					Integer deLiveryTotalNum = warehouseIndexMapper.findDeLiveryTotalNum(indexDTO, indexDeliveryDataVO.getType());
+					Integer deLiveryTotalNum = warehouseIndexMapper.findDeLiveryTotalNum(indexDeliveryDataVO.getType(),indexDeliveryDataVO.getWarehouseId(),1);
 					indexDeliveryDataVO.setTotalDeliveryNum(deLiveryTotalNum);
 					//查询总重量
-					BigDecimal totalWeight = warehouseIndexMapper.findDeliveryTotalWeight(indexDTO, indexDeliveryDataVO.getType());
+					BigDecimal totalWeight = warehouseIndexMapper.findDeliveryTotalWeight( indexDeliveryDataVO.getType(),indexDeliveryDataVO.getWarehouseId(),1);
 					indexDeliveryDataVO.setTotalWeight(totalWeight);
 					//查询总包件体积
-					BigDecimal totalVolume = warehouseIndexMapper.findDeliveryTotalVolume(indexDTO, indexDeliveryDataVO.getType());
+					BigDecimal totalVolume = warehouseIndexMapper.findDeliveryTotalVolume( indexDeliveryDataVO.getType(),indexDeliveryDataVO.getWarehouseId(),1);
 					indexDeliveryDataVO.setTotalVolume(totalVolume);
 					//查询在途件数
-					Integer totalRoadNum = warehouseIndexMapper.findDeLiveryTotalRoadNum(indexDTO, indexDeliveryDataVO.getType());
-					indexDeliveryDataVO.setTotalRoadNum(totalRoadNum);
+//					Integer totalRoadNum = warehouseIndexMapper.findDeLiveryTotalRoadNum( indexDeliveryDataVO.getType(),indexDeliveryDataVO.getWarehouseId());
+//					indexDeliveryDataVO.setTotalRoadNum(totalRoadNum);
 				}
 				indexDeliveryDataVOList.addAll(indexDeliveryDataVOS);
 			}
 
 			//查询自提信息
-			IndexDeliveryDataVO indexDeliveryDataVO = warehouseIndexMapper.findBillLadingTotal(indexDTO);
+			List<IndexDeliveryDataVO> indexDeliveryDataVO = warehouseIndexMapper.findBillLadingTotal(indexDTO);
 			if (Func.isNotEmpty(indexDeliveryDataVO)) {
-				//查询自提总件数
-				Integer billLadingTotalNum = warehouseIndexMapper.findBillLadingTotalNum(indexDTO);
-				indexDeliveryDataVO.setTotalDeliveryNum(billLadingTotalNum);
-				//查询总重量
-				BigDecimal billLadingTotalWeight = warehouseIndexMapper.findBillLadingTotalWeight(indexDTO);
-				indexDeliveryDataVO.setTotalWeight(billLadingTotalWeight);
-				//查询总包件体积
-				BigDecimal billLadingTotalVolume = warehouseIndexMapper.findBillLadingTotalVolume(indexDTO);
-				indexDeliveryDataVO.setTotalVolume(billLadingTotalVolume);
-				indexDeliveryDataVOList.add(indexDeliveryDataVO);
-			}
-			//查询商配外协信息
-			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);
+				for (IndexDeliveryDataVO deliveryDataVO : indexDeliveryDataVO) {
+					//查询自提总件数
+					Integer billLadingTotalNum = warehouseIndexMapper.findBillLadingTotalNum(deliveryDataVO.getWarehouseId());
+					deliveryDataVO.setTotalDeliveryNum(billLadingTotalNum);
+					//查询总重量
+					BigDecimal billLadingTotalWeight = warehouseIndexMapper.findBillLadingTotalWeight(deliveryDataVO.getWarehouseId());
+					deliveryDataVO.setTotalWeight(billLadingTotalWeight);
+					//查询总包件体积
+					BigDecimal billLadingTotalVolume = warehouseIndexMapper.findBillLadingTotalVolume(deliveryDataVO.getWarehouseId());
+					deliveryDataVO.setTotalVolume(billLadingTotalVolume);
+					//查询在途件数
+//					Integer billLadingRoadTotalNum = warehouseIndexMapper.findBillLadingRoadTotalNum(deliveryDataVO.getWarehouseId());
+//					deliveryDataVO.setTotalRoadNum(billLadingRoadTotalNum);
+				}
+				indexDeliveryDataVOList.addAll(indexDeliveryDataVO);
 			}
-			//查询市配外协信息
-			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);
+			//查询尊外协信息
+			List<IndexDeliveryDataVO> indexTripartiteDeliveryDataVOS = warehouseIndexMapper.findTripartiteDeliveryTotal(indexDTO);
+			if (!indexTripartiteDeliveryDataVOS.isEmpty()) {
+				for (IndexDeliveryDataVO indexTripartiteDeliveryDataVO : indexTripartiteDeliveryDataVOS) {
+					//总包件数量
+					Integer deLiveryTotalNum = warehouseIndexMapper.findDeLiveryTotalNum(indexTripartiteDeliveryDataVO.getType(),indexTripartiteDeliveryDataVO.getWarehouseId(),2);
+					indexTripartiteDeliveryDataVO.setTotalDeliveryNum(deLiveryTotalNum);
+					//查询总重量
+					BigDecimal totalWeight = warehouseIndexMapper.findDeliveryTotalWeight( indexTripartiteDeliveryDataVO.getType(),indexTripartiteDeliveryDataVO.getWarehouseId(),2);
+					indexTripartiteDeliveryDataVO.setTotalWeight(totalWeight);
+					//查询总包件体积
+					BigDecimal totalVolume = warehouseIndexMapper.findDeliveryTotalVolume( indexTripartiteDeliveryDataVO.getType(),indexTripartiteDeliveryDataVO.getWarehouseId(),2);
+					indexTripartiteDeliveryDataVO.setTotalVolume(totalVolume);
+
+				}
 			}
+
 			bladeRedis.setEx(key, indexDeliveryDataVOList, 3600L);
 		}
-
-
 		return indexDeliveryDataVOList;
 	}
 

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

@@ -14,6 +14,7 @@ public class IndexDeliveryDataVO implements Serializable {
 	private BigDecimal totalWeight = BigDecimal.ZERO;
 	private BigDecimal totalVolume = BigDecimal.ZERO;
 	private Integer totalRoadNum = 0;
+	private Long warehouseId;
 
 
 }