diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index 2b04c9d50..1c8026612 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/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 - + #{item} and order_package_status = '70' diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java index 2a0d24e91..6357b17ff 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java +++ b/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();//运单品类总体积 diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java index 9aa741ce0..7108ab03d 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java +++ b/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 statisticsOrderInfoVOIPage = baseMapper.pageList(page, merchantStatisticsDTO); - List records = statisticsOrderInfoVOIPage.getRecords(); + if(CollUtil.isEmpty(records)){ + return statisticsOrderInfoVOIPage; + } + //把records中所有的orderInfoId放入一个集合 List orderInfoIdList = records.stream().map(StatisticsOrderInfoVO::getOrderInfoId).collect(Collectors.toList()); // 得到运单ID @@ -105,8 +108,6 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillId)); - - Map orderPackageInfoMap; if(CollUtil.isNotEmpty(orderInfoIdList)){ List orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList); @@ -125,9 +126,6 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl { // Long waybillId = statisticsOrderInfoVO.getWaybillId(); - - - Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId(); if(orderPackageInfoMap!=null){ @@ -138,33 +136,35 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillId()); + if(StringUtil.isNotBlank(statisticsOrderInfoVO.getGoodsName())){ + String[] split = statisticsOrderInfoVO.getGoodsName().split(","); + List 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 first = waybillDetailByWaybillNoVos.stream().filter(waybillDetailByWaybillNoVo -> waybillDetailByWaybillNoVo.getProductName().equals(s)).findFirst(); + Optional 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()); + } } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java index a25e60827..308839037 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java @@ -197,4 +197,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper findUnloadNoDataList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); void updateReserve1ByOrderPackageCode(@Param("orderPackageCode") String orderPackageCode, @Param("reseve1") String reseve1); + + List findListByIdsAndType(@Param("carsLoadScanIdList") List carsLoadScanIdList, @Param("type") int type); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index 71ad5f499..a30ff4dab 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -1180,4 +1180,14 @@ where scan_code = #{orderPackageCode} + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java index f0ae3aff5..83f0c9812 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java @@ -199,4 +199,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService findUnloadNoDataList(Long loadId, Long warehouseId); void updateReserve1ByOrderPackageCode(String orderPackageCode, String reseve1); + + List findListByIdsAndType(List carsLoadScanIdList, int type); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java index e63b5ee12..f638d1f30 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java @@ -494,4 +494,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl findListByIdsAndType(List carsLoadScanIdList, int type) { + return baseMapper.findListByIdsAndType(carsLoadScanIdList,type); + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml index 1af0248be..6aa317d3b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml @@ -1177,25 +1177,6 @@ group by lww.id - - HAVING - - - GROUP_CONCAT(DISTINCT ltwt.warehouse_id) like CONCAT('%',#{item},'%') - - - or GROUP_CONCAT(DISTINCT ltwt.warehouse_id) like CONCAT('%',#{item},'%') - - - or group_concat(lww.departure_warehouse_id) in - - #{item} - - or group_concat(lww.destination_warehouse_id) in - - #{item} - - order by lww.create_time desc