diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/TrunklineCarCostExcel.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/TrunklineCarCostExcel.java index a098c3c5a..bbf6855f7 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/TrunklineCarCostExcel.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/TrunklineCarCostExcel.java @@ -55,8 +55,8 @@ public class TrunklineCarCostExcel implements Serializable { * 车次类型 1外请 2自有 目前该字段不使用 * */ - @ExcelProperty(value = "车次类型 1外请 2自有 ") - private Integer carsNoType; + @ExcelProperty(value = "车次类型") + private String carsNoTypeString; /** * 调车员 @@ -78,7 +78,7 @@ public class TrunklineCarCostExcel implements Serializable { /** * 货物品牌，多个拼接在一起 */ - @ExcelProperty(value = "货物品牌,多个拼接在一起") + @ExcelProperty(value = "货物品牌") private String brands; /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index b04df26c8..f29e6077a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -343,7 +343,6 @@ group by ldsl.cargo_number ) t LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number and ldslNew.quantity_stock !=0 - LEFT JOIN logpm_distribution_stock ldss ON FIND_IN_SET(ldss.stock_list_id,t.aaa) LEFT JOIN ( SELECT ldpl.material_code, diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java index 54e725bb2..297015d77 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java @@ -73,7 +73,21 @@ public class MerchantStatisticsController { List ls = statisticsOrderInfoService.orderInfoListExport(merchantStatisticsDTO); //导出ls - ExcelUtil.export(response, "预对账单数据", "预对账单数据", ls, StatisticsOrderInfoExportVO.class); + ExcelUtil.export(response, "预对账单数据2B", "预对账单数据2B", ls, StatisticsOrderInfoExportVO.class); + } + + + @ResponseBody + @PostMapping("/orderInfoListExport2C") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "预对账单列表导出", notes = "传入merchantStatisticsDTO") + public void orderInfoListExport2C(@RequestBody MerchantStatisticsDTO merchantStatisticsDTO, HttpServletResponse response) { + String method = "############orderInfoListExport: "; + log.info(method + "请求参数{}", merchantStatisticsDTO); + + List ls = statisticsOrderInfoService.orderInfoListExport2C(merchantStatisticsDTO); + //导出ls + ExcelUtil.export(response, "预对账单数据2C", "预对账单数据2C", ls, StatisticsOrderInfoExportVO.class); } @ResponseBody @@ -157,9 +171,7 @@ public class MerchantStatisticsController { String method = "############pageReconciliationList: "; log.info(method + "请求参数{}", merchantStatisticsDTO); try { - IPage pages = reconciliationOrderInfoService.pageReconciliationList(merchantStatisticsDTO); - return R.data(pages); } catch (CustomerException e) { log.error(e.message, e); diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/TrunklineCarCostController.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/TrunklineCarCostController.java index f581348c9..fd20f0f80 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/TrunklineCarCostController.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/TrunklineCarCostController.java @@ -83,7 +83,7 @@ public class TrunklineCarCostController extends BladeController { List data = new ArrayList<>(); for (TrunklineCarCostEntity l : ls) { TrunklineCarCostExcel t =BeanUtil.copy(l, TrunklineCarCostExcel.class); - + t.setCarsNoTypeString(l.getCarsNoType()==1?"外请":"自有"); data.add(t); } return data; diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.java index 6a4a88978..8a0423f97 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.java @@ -20,6 +20,7 @@ import java.util.Set; public interface StatisticsOrderInfoMapper extends BaseMapper { IPage pageList(IPage page, @Param("param") MerchantStatisticsDTO merchantStatisticsDTO); + List pageList2CExport( @Param("param") MerchantStatisticsDTO merchantStatisticsDTO); List findStatementListByOrderInfoIds(@Param("orderInfoIds") List orderInfoIds); diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml index a98a45841..5c22aa35e 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml @@ -924,6 +924,130 @@ group by lsoi.waybill_id + diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java index ba9237674..3fe94e72f 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java @@ -62,4 +62,5 @@ public interface IStatisticsOrderInfoService extends BaseService orderInfoListExport2C(MerchantStatisticsDTO merchantStatisticsDTO); } 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 42d023405..9eae78a2f 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 @@ -289,7 +289,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillId)); + Map> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillNo)); Map orderPackageInfoMap; if (CollUtil.isNotEmpty(orderInfoIdList)) { @@ -331,7 +331,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillId()); + List waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillNo()); StringBuffer sb = new StringBuffer(); StringBuffer sb1 = new StringBuffer(); @@ -1311,7 +1311,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillId)); + Map> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillNo)); Map orderPackageInfoMap; if (CollUtil.isNotEmpty(waybillIds)) { @@ -1353,7 +1353,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillId()); + List waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillNo()); StringBuffer sb = new StringBuffer(); StringBuffer sb1 = new StringBuffer(); @@ -1429,9 +1429,9 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl orderInfoListExport2C(MerchantStatisticsDTO merchantStatisticsDTO) { + + List result = new ArrayList<>(); + List warehouseIds = warehouseClient.getWarehouseIds(); + if (!warehouseIds.isEmpty()) { + merchantStatisticsDTO.setWarehouseIds(warehouseIds); + } + List records = baseMapper.pageList2CExport(merchantStatisticsDTO); + + //把records中所有的orderInfoId放入一个集合 + List orderInfoIdList = records.stream().map(StatisticsOrderInfoVO::getOrderInfoId).collect(Collectors.toList()); + // 得到运单ID集合 + Set waybillIds = records.stream().map(StatisticsOrderInfoVO::getWaybillId).collect(Collectors.toSet()); + + // 查询运单明细集合 + List waybillDetailByWaybillId = baseMapper.findWaybillDetailByWaybillId(waybillIds); + + //得到运单号 + Set orderCodeSet = records.stream().map(StatisticsOrderInfoVO::getOrderCode).collect(Collectors.toSet()); + + // 通过运单号进行分组 + Map> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillNo)); + + Map orderPackageInfoMap; + if (CollUtil.isNotEmpty(orderInfoIdList)) { + List orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList); + //把orderPackageInfoList转化成以orderInfoId为key的Map + if (CollUtil.isNotEmpty(orderPackageInfoList)) { + orderPackageInfoMap = orderPackageInfoList.stream() + .collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getOrderInfoId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO)); + } else { + orderPackageInfoMap = null; + } + } else { + orderPackageInfoMap = null; + } + + List advanceDetailDTOS = baseMapper.selectAdvinceDetail(waybillIds, orderCodeSet); + records.forEach(statisticsOrderInfoVO -> { +// Long waybillId = statisticsOrderInfoVO.getWaybillId(); + + + Long waybillId = statisticsOrderInfoVO.getWaybillId(); + String orderCode = statisticsOrderInfoVO.getOrderCode(); + // 查询站存单上的 + + List advanceDetailDTOList = advanceDetailDTOS.stream(). + filter(advanceDetailDTO -> advanceDetailDTO.getWaybillId().equals(waybillId) && advanceDetailDTO.getOrderCode().equals(orderCode)).collect(Collectors.toList()); + + // 对advanceDetailDTOList 按照 incomeCategoryName 进分组 并统计数量 + Map> collect = advanceDetailDTOList.stream().filter(advanceDetailDTO -> !Objects.isNull(advanceDetailDTO.getIncomeCategoryName())).collect(Collectors.groupingBy(AdvanceDetailDTO::getIncomeCategoryName)); + + Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId(); + if (orderPackageInfoMap != null) { + StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(orderInfoId); + + if (statisticsPackageFeeInfoVO != null) { +// statisticsPackageFeeInfoVO.setGoodsName(statisticsOrderInfoVO.getGoodsName()); + BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO); + + if (StringUtil.isNotBlank(statisticsOrderInfoVO.getGoodsName())) { +// String[] split = statisticsOrderInfoVO.getGoodsName().split(","); + List waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillNo()); + + StringBuffer sb = new StringBuffer(); + StringBuffer sb1 = new StringBuffer(); + StringBuffer sb3 = new StringBuffer(); + + if (collect.isEmpty()) { + + if (waybillDetailByWaybillNoVos != null && !waybillDetailByWaybillNoVos.isEmpty()) { + + for (WaybillDetailByWaybillNoVo waybillDetailByWaybillNoVo : waybillDetailByWaybillNoVos) { + + if (!sb3.toString().isEmpty()) { + sb3.append(","); + } + sb3.append(waybillDetailByWaybillNoVo.getProductName()); + + if (!sb.toString().isEmpty()) { + sb.append(","); + } + sb.append(waybillDetailByWaybillNoVo.getNum()); + + if (!sb1.toString().isEmpty()) { + sb1.append(","); + } + sb1.append(waybillDetailByWaybillNoVo.getPrice()); + + } + + } + + } else { + collect.keySet().forEach(s -> { + if (!sb3.toString().isEmpty()) { + sb3.append(","); + } + sb3.append(s); + List advanceDetailDTOS1 = collect.get(s); + + if (waybillDetailByWaybillNoVos != null) { + Optional first = waybillDetailByWaybillNoVos.stream().filter(waybillDetailByWaybillNoVo -> waybillDetailByWaybillNoVo.getProductName().equals(s)).findFirst(); + + if (first.isPresent()) { + WaybillDetailByWaybillNoVo waybillDetailByWaybillNoVo = first.get(); + + if (!sb.toString().isEmpty()) { + sb.append(","); + } + + //统计 advanceDetailDTOS1 这个集合种 quantity 的和值 + int sum = advanceDetailDTOS1.stream().mapToInt(AdvanceDetailDTO::getQuantity).sum(); + sb.append(sum); + + if (!sb1.toString().isEmpty()) { + sb1.append(","); + } + sb1.append(waybillDetailByWaybillNoVo.getPrice()); + } + } + + + }); + + } + + statisticsOrderInfoVO.setGoodsName(sb3.toString()); + statisticsOrderInfoVO.setGoodsNum(sb.toString()); + statisticsOrderInfoVO.setGoodsPrice(sb1.toString()); + } + + } + } + StatisticsOrderInfoExportVO statisticsOrderInfoExportVO = new StatisticsOrderInfoExportVO(); + BeanUtil.copy(statisticsOrderInfoVO, statisticsOrderInfoExportVO); + statisticsOrderInfoExportVO.setTypeServiceName(DistributionTypeConstant.getName(statisticsOrderInfoVO.getTypeService())); + statisticsOrderInfoExportVO.setPayType(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_TYPE, statisticsOrderInfoVO.getPayType())); + statisticsOrderInfoExportVO.setPayWay(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_WAY, statisticsOrderInfoVO.getPayWay())); + + String signName = "未签收"; + if (1 == statisticsOrderInfoVO.getSignStatus()) { + signName = "部分签收"; + } else if (2 == statisticsOrderInfoVO.getSignStatus()) { + signName = "已签收"; + } +// statisticsOrderInfoExportVO.setSignStatus(); + statisticsOrderInfoExportVO.setSignStatusName(signName); + + result.add(statisticsOrderInfoExportVO); + + }); + return result; + } + @Override public Integer findBalanceOrderStatus(Long waybillId) { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 2c2230e2d..e49179184 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -1374,10 +1374,10 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl orderCodeSet = orderCodeMap.keySet(); //把advanceDetailEntities中所有元素的waybillId提取到一个Set中 - Set waybillIdSet = advanceDetailEntities.stream().map(TrunklineAdvanceDetailEntity::getWaybillId).collect(Collectors.toSet()); + Set waybillIdSet = advanceDetailEntities.stream().map(TrunklineAdvanceDetailEntity::getWaybillNo).collect(Collectors.toSet()); Map waybillEntityMap = new HashMap<>(); if (!waybillIdSet.isEmpty()) { - List waybillEntityList = warehouseWaybillClient.findListByWaybillIds(new ArrayList<>(waybillIdSet)); + List waybillEntityList = warehouseWaybillClient.findWaybillBilllByWaybillNos(new ArrayList<>(waybillIdSet)); //把waybillEntityList转化成以id为key的Map waybillEntityMap = waybillEntityList.stream().collect(Collectors.toMap(WarehouseWaybillEntity::getWaybillNo, Function.identity())); }