From 537d5d6a727c69a80e1a90f7910b5eb63eb8e1b8 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 4 Mar 2024 13:36:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9PDA=20=E4=B8=8A=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E5=85=B6=E5=AE=83=E4=BB=93=E7=9A=84=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/OldSystemDataPushConfig.java | 3 ++ .../impl/BasicdataVehicleServiceImpl.java | 1 + .../mapper/DistributionSignforMapper.java | 11 +++++-- .../mapper/DistributionSignforMapper.xml | 9 ++++++ .../impl/DistributionSignforServiceImpl.java | 29 +++++++++++++++++-- 5 files changed, 49 insertions(+), 4 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index 68ad6deec..393909632 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -19,6 +19,9 @@ public class OldSystemDataPushConfig { warehourseIds.add("124"); // 上海 warehourseIds.add("149"); + // 遵义 + //todo 老系统仓库ID + warehourseIds.add("33"); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java index 322a2d6cd..64c0083b3 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java @@ -246,6 +246,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl selectListbyInpack(IPage page,@Param("param") DistributionAppDeliveryListDTO distributionDeliveryList); + /** - * 查询签收列表 * + * @param page 分页参数 + * @param distributionAppDeliveryListDTO 查询条件 + * @param deliveryIds 司机ID集合 + * @param warehouseId 仓库ID集合 * @return */ - List selectDistributionAppDeliveryInListPage(IPage page,@Param("param") DistributionAppDeliveryListDTO distributionAppDeliveryListDTO,@Param("array") List deliveryIds); + List selectDistributionAppDeliveryInListPage(IPage page,@Param("param") DistributionAppDeliveryListDTO distributionAppDeliveryListDTO,@Param("array") List deliveryIds,@Param("warehouseIdList") List warehouseId); + + + /** * 客户查询库存品 * diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 922e4a3c9..5e19e7670 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -825,6 +825,15 @@ #{item} + + + and lddl.warehouse_id in + + #{item} + + + + and date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 6d02a533f..050f8de28 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -2915,12 +2915,18 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl deliveryIds = distributionDeliverySelfMapper.selectdeliveryList(driverArtery.getId()); if (!deliveryIds.isEmpty()) { - distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, deliveryIds); + distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, deliveryIds,null); } else { return page.setRecords(distributionAppDeliveryListVOS); } } else { - distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, null); + + /** + * 获取当前账号能看到的仓库列表 + */ + List warehouseIdList = getWarehouseIdList(); + + distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, null,warehouseIdList); } @@ -3074,6 +3080,25 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl getWarehouseIdList() { + List warehouseIdList = new ArrayList<>(); + // 获取当前登陆人能操作的仓库 + BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); + + if(Objects.isNull(myCurrentWarehouse)){ + // 获取能操作的仓库列表 + List myWarehouseList = basicdataWarehouseClient.getMyWarehouseList(); + for (BasicdataWarehouseEntity basicdataWarehouseEntity : myWarehouseList) { + warehouseIdList.add(basicdataWarehouseEntity.getId()); + } + + }else{ + warehouseIdList.add(myCurrentWarehouse.getId()); + } + return warehouseIdList; + } + @Override public List selectAppDeliveryInventory(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) { List distributionAppStockArticleVOS = baseMapper.selectAppDeliveryInventoryPage(distributionAppDeliveryListDTO);