From 6169e288abc8fb366273a682c196538f93a58885 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 12 Aug 2024 10:24:00 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=A4=8D=E6=A0=B8BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/service/impl/DistributionAsyncServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index fcd79f390..6c064993a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -1854,7 +1854,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { List ids = list.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList()); //查询包件 List distributionParcelListEntities = distributionParcelListService.listByIds(ids); - List packageIds = distributionParcelListEntities.stream().filter(f -> OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(f.getOrderPackageLoadingStatus()) || !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getId).collect(Collectors.toList()); + List packageIds = distributionParcelListEntities.stream().filter(f -> !OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(f.getOrderPackageLoadingStatus()) || !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getId).collect(Collectors.toList()); if (Func.isNotEmpty(packageIds)) { distributionParcelListService.update(new UpdateWrapper().lambda() .set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue()) From f97bfd9af4692b715293f05c3f97812beaef51aa Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Mon, 12 Aug 2024 10:51:04 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/report/service/impl/ReportDeliverServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index 63b77380c..e62f16a56 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java @@ -196,7 +196,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { trainCustomQuery(query, queryWrapper); // 仓库权限 ReportUtil.buildReportWarehouseAuth(vo.getWarehouseName(), query.getWarehouseNameRange(), queryWrapper, warehouseClient); - reportExcelUtil.export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表"); + reportExcelUtil.export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表",20L, ReportExcelUtil.SHEETDATANUM); } @Override From ee30d431f4c33cad765ddc4c22d673982aed8766 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 12 Aug 2024 14:16:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=87=AA=E6=8F=90=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E7=BB=B4=E6=8A=A4=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E6=8F=90=E5=88=97=E8=A1=A8=E6=8F=90?= =?UTF-8?q?=E8=B4=A7=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E6=97=A5=E5=BF=97?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BasicdataStoreContactServiceImpl.java | 2 +- .../impl/BasicdataTripartiteMallServiceImpl.java | 2 +- .../mapper/DistrilbutionBillLadingMapper.xml | 6 ++++++ .../impl/DistrilbutionBillStockServiceImpl.java | 12 ++++++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java index 415d1e311..5a2f53f94 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java @@ -158,7 +158,7 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpland dbl.pickup_batch like concat('%',#{param.pickupBatch},'%') + and + DATE_FORMAT(pick_up_time,'%y%m%d') = DATE_FORMAT(#{param.pickUpTime},'%y%m%d') + + and + AND DATE_FORMAT(pick_up_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.pickUpTimeStart},'%y%m%d') AND DATE_FORMAT(#{param.pickUpTimeEnd},'%y%m%d') + and dbl.warehouse_id in diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java index 1a3b4cc74..b128104d9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java @@ -53,6 +53,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -254,6 +255,7 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl ids = new ArrayList<>(); + List completeIds = new ArrayList<>(); if (Func.isNotEmpty(entityList)){ for (DistrilbutionBillStockEntity distrilbutionBillStockEntity : entityList) { List packageEntities = distrilbutionBillPackageService.list(Wrappers.query().lambda() @@ -266,9 +268,13 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl().lambda() + .set(DistrilbutionBillStockEntity::getConditions, "30") + .in(DistrilbutionBillStockEntity::getId, completeIds) + ); + } } @Override From 911cf85b4e0e649b061b816301222a16df527c31 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 12 Aug 2024 15:39:02 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=88=97=E8=A1=A8BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionReservationMapper.xml | 2 ++ 1 file changed, 2 insertions(+) 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 c4eb4799f..350a6a210 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 @@ -365,6 +365,8 @@ association_value ) AS t2 ON t.cargo_number = t2.association_value where ldslNew.is_deleted = 0 AND ldslNew.warehouse_id=#{warehouseId} + GROUP BY + ldslNew.cargo_number + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index e0060202f..e6efc7869 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -2353,18 +2353,20 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl collect = null; - + IPage distrilbutionBillLadingVOIPage = null; if (Func.isNotEmpty(myCurrentWarehouse)) { collect = new ArrayList<>(); collect.add(myCurrentWarehouse.getId()); + distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect); + } else { + distrilbutionBillLadingVOIPage = baseMapper.getAllBillLadingByView(page, distrilbutionBillLadingDTO, collect); collect = warehouseList.stream() .map(BasicdataWarehouseEntity::getId) .collect(Collectors.toList()); } - IPage distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect); List records = distrilbutionBillLadingVOIPage.getRecords(); // 获取所有的提货单ID @@ -2403,8 +2405,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl { if (groupedEntities != null) { List list = groupedEntities.get(i.getId()); - list.forEach(ii -> ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST, ii.getCost()))); - i.setList(list); + if (!Func.isEmpty(groupedEntities.get(i.getId()))){ + list.forEach(ii -> ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST, ii.getCost()))); + i.setList(list); + } + } if (groupDistributionPrintEntityEntities != null) { List list1 = groupDistributionPrintEntityEntities.get(i.getId()); From 260e0fb8e3e581d390cc56629dcc7483ba6a0203 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 12 Aug 2024 18:01:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=88=97=E8=A1=A8BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistrilbutionBillLadingMapper.xml | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index 2824292d7..56da2bbe5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -986,7 +986,27 @@ ldsld.id