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

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -2308,7 +2308,7 @@
         select order_package_code
         from logpm_distribution_parcel_list
         where order_package_code in
-        <foreach collection="orderPackageCodes" item="item" separator="," open="(" close=")">
+        <foreach collection="orderPackageCodeList" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
         and order_package_status = '70'

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

@@ -3176,6 +3176,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				reservationEntity.setServiceNumber(String.join(",", serviceNumber));
 				reservationEntity.setWarehouseName(String.join(",", warehouseName));
 				reservationEntity.setMallName(String.join(",", mallName));
+				reservationEntity.setReservationStockListNum(0);
 				if (Func.isNotEmpty(mallId)) {
 					reservationEntity.setMallId(mallId.get(0));
 				}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java

@@ -575,6 +575,12 @@ public class WaybillCheckListener {
 						Integer systemChargeType = warehouseWayBillDetail.getSystemChargeType();//系统运费计算方式
 						Integer systemPickupChargeType = warehouseWayBillDetail.getSystemPickupChargeType();//系统提货计算方式 默认案件数分摊
 
+						if(Objects.isNull(systemChargeType)){
+							systemChargeType = chargeType;
+						}
+
+
+
 						BigDecimal productTotalWeight = warehouseWayBillDetail.getWeight();//运单品类的总重量
 						Integer num = warehouseWayBillDetail.getNum();//运单品类的总数量
 						BigDecimal productTotalVolume = warehouseWayBillDetail.getVolume();//运单品类总体积

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@@ -37,6 +37,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -90,10 +91,12 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 			merchantStatisticsDTO.setWarehouseIds(warehouseIds);
 		}
 
-
 		IPage<StatisticsOrderInfoVO> statisticsOrderInfoVOIPage = baseMapper.pageList(page, merchantStatisticsDTO);
-
 		List<StatisticsOrderInfoVO> records = statisticsOrderInfoVOIPage.getRecords();
+		if(CollUtil.isEmpty(records)){
+			return statisticsOrderInfoVOIPage;
+		}
+
 		//把records中所有的orderInfoId放入一个集合
 		List<Long> orderInfoIdList = records.stream().map(StatisticsOrderInfoVO::getOrderInfoId).collect(Collectors.toList());
 		// 得到运单ID
@@ -105,8 +108,6 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		// 通过运单号进行分组
 		Map<Long, List<WaybillDetailByWaybillNoVo>> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillId));
 
-
-
 		Map<Long, StatisticsPackageFeeInfoVO> orderPackageInfoMap;
 		if(CollUtil.isNotEmpty(orderInfoIdList)){
 			List<StatisticsPackageFeeInfoVO> orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList);
@@ -125,9 +126,6 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
         records.forEach(statisticsOrderInfoVO -> {
 //			Long waybillId = statisticsOrderInfoVO.getWaybillId();
 
-
-
-
 			Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId();
 			if(orderPackageInfoMap!=null){
 
@@ -138,33 +136,35 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 //					statisticsPackageFeeInfoVO.setGoodsName(statisticsOrderInfoVO.getGoodsName());
 					BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO);
 
-					String[] split = statisticsOrderInfoVO.getGoodsName().split(",");
-					List<WaybillDetailByWaybillNoVo> waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillId());
+					if(StringUtil.isNotBlank(statisticsOrderInfoVO.getGoodsName())){
+						String[] split = statisticsOrderInfoVO.getGoodsName().split(",");
+						List<WaybillDetailByWaybillNoVo> waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillId());
 
-					StringBuffer sb = new StringBuffer();
-					StringBuffer sb1 = new StringBuffer();
+						StringBuffer sb = new StringBuffer();
+						StringBuffer sb1 = new StringBuffer();
 
-					for (String s : split) {
+						for (String s : split) {
 
-						Optional<WaybillDetailByWaybillNoVo> first = waybillDetailByWaybillNoVos.stream().filter(waybillDetailByWaybillNoVo -> waybillDetailByWaybillNoVo.getProductName().equals(s)).findFirst();
+							Optional<WaybillDetailByWaybillNoVo> first = waybillDetailByWaybillNoVos.stream().filter(waybillDetailByWaybillNoVo -> waybillDetailByWaybillNoVo.getProductName().equals(s)).findFirst();
 
-						if(first.isPresent()){
-							WaybillDetailByWaybillNoVo waybillDetailByWaybillNoVo = first.get();
+							if(first.isPresent()){
+								WaybillDetailByWaybillNoVo waybillDetailByWaybillNoVo = first.get();
 
-							if(!sb.toString().isEmpty()){
-								sb.append(",");
-							}
-							sb.append(waybillDetailByWaybillNoVo.getNum());
+								if(!sb.toString().isEmpty()){
+									sb.append(",");
+								}
+								sb.append(waybillDetailByWaybillNoVo.getNum());
 
-							if(!sb1.toString().isEmpty()){
-								sb1.append(",");
+								if(!sb1.toString().isEmpty()){
+									sb1.append(",");
+								}
+								sb1.append(waybillDetailByWaybillNoVo.getPrice());
 							}
-							sb1.append(waybillDetailByWaybillNoVo.getPrice());
 						}
-					}
 
-					statisticsOrderInfoVO.setGoodsNum(sb.toString());
-					statisticsOrderInfoVO.setGoodsPrice(sb1.toString());
+						statisticsOrderInfoVO.setGoodsNum(sb.toString());
+						statisticsOrderInfoVO.setGoodsPrice(sb1.toString());
+					}
 
 				}
 			}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java

@@ -197,4 +197,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 	List<TrunklineCarsLoadScanEntity> findUnloadNoDataList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 
 	void updateReserve1ByOrderPackageCode(@Param("orderPackageCode") String orderPackageCode, @Param("reseve1") String reseve1);
+
+    List<TrunklineCarsLoadScanEntity> findListByIdsAndType(@Param("carsLoadScanIdList") List<Long> carsLoadScanIdList, @Param("type") int type);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -1180,4 +1180,14 @@
         where scan_code = #{orderPackageCode}
     </update>
 
+    <select id="findListByIdsAndType" resultType="com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity">
+        select *
+        from logpm_trunkline_cars_load_scan
+        where id in
+        <foreach collection="carsLoadScanIdList" item="id" separator="," open="(" close=")">
+            #{id}
+        </foreach>
+        and type = #{type}
+    </select>
+
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java

@@ -199,4 +199,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	List<TrunklineCarsLoadScanEntity> findUnloadNoDataList(Long loadId, Long warehouseId);
 
 	void updateReserve1ByOrderPackageCode(String orderPackageCode, String reseve1);
+
+	List<TrunklineCarsLoadScanEntity> findListByIdsAndType(List<Long> carsLoadScanIdList, int type);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java

@@ -494,4 +494,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		baseMapper.updateReserve1ByOrderPackageCode(orderPackageCode,reseve1);
 	}
 
+	@Override
+	public List<TrunklineCarsLoadScanEntity> findListByIdsAndType(List<Long> carsLoadScanIdList, int type) {
+		return baseMapper.findListByIdsAndType(carsLoadScanIdList,type);
+	}
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

@@ -1177,25 +1177,6 @@
             </foreach>
         </if>
         group by lww.id
-        <if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
-            HAVING
-            <foreach collection="param.warehouseIds" item="item" index="index" open="(" close=")">
-                <if test="index == 0">
-                    GROUP_CONCAT(DISTINCT ltwt.warehouse_id) like CONCAT('%',#{item},'%')
-                </if>
-                <if test="index != 0">
-                    or GROUP_CONCAT(DISTINCT ltwt.warehouse_id) like CONCAT('%',#{item},'%')
-                </if>
-            </foreach>
-            or group_concat(lww.departure_warehouse_id) in
-            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-            or group_concat(lww.destination_warehouse_id) in
-            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
         order by lww.create_time desc
     </select>