From a8da37cd564fce2b69b8d824ffabc086b4bee512 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 18 Jul 2024 16:25:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:1.=E4=BF=AE=E5=A4=8D=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E5=92=8C=E6=89=98=E7=9B=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=20refact?= =?UTF-8?q?or:1.=E4=BC=98=E5=8C=96=E4=B8=8A=E5=95=86=E5=B8=82=E9=85=8D?= =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=9A=84=E5=A4=87=E8=B4=A7=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockupMapper.java | 4 +- .../mapper/DistributionStockupMapper.xml | 78 +++++++------------ .../impl/DistributionStockupServiceImpl.java | 11 +-- .../DistrilbutionBillLadingServiceImpl.java | 7 +- .../impl/PackageTrackLogAsyncServiceImpl.java | 11 +-- 5 files changed, 44 insertions(+), 67 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java index 4d38140a3..a8dffeb45 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java @@ -57,7 +57,7 @@ public interface DistributionStockupMapper extends BaseMapper pageList(IPage page,@Param("param") DistributionStockupEntity distributionStockupEntity); + IPage pageList(IPage page,@Param("param") DistributionStockupEntity distributionStockupEntity,@Param("warehouseIdList") List warehouseIdList); IPage selectStockupPage(IPage page, @Param("param") StockupDTO stockupDTO); @@ -168,7 +168,7 @@ public interface DistributionStockupMapper extends BaseMapper pageOweList(IPage page,@Param("param")DistributionStockupEntity distributionStockupEntity); + IPage pageOweList(IPage page,@Param("param")DistributionStockupEntity distributionStockupEntity ,@Param("warehouseIdList") List warehouseIdList); IPage getInventoryOwnSelf(IPage page,@Param("id") Long id); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index d4c56d1a5..8e62ecb86 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -248,41 +248,18 @@ lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime, lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode, - COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '') stockipAllocation, - COALESCE(GROUP_CONCAT(DISTINCT lwt.pallet_name SEPARATOR ','), '') pallet, + COALESCE(GROUP_CONCAT(DISTINCT ldpl.goods_allocation SEPARATOR ','), '') stockipAllocation, + COALESCE(GROUP_CONCAT(DISTINCT ldpl.pallet SEPARATOR ','), '') pallet, COALESCE ( group_concat( DISTINCT ldr.consignee SEPARATOR ',' ), '' ) AS consignee from logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id =lds.id LEFT JOIN logpm_distribution_reservation ldr ON ldsi.reservation_id = ldr.id LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id - LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id - LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldrp.parce_list_id - LEFT JOIN logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id - LEFT JOIN ( - SELECT - IFNULL(COUNT( b.reservation_id ),0 )AS aaa, - b.stockup_id AS stockup_id - FROM - logpm_distribution_stockup AS a - LEFT JOIN logpm_distribution_stockup_info AS b ON a.id = b.stockup_id - - b.stock_status != 4 - and a.warehouse_id = - #{param.warehouseId} - - - and a.warehouse_id in - - #{a} - - - - GROUP BY b.stockup_id - ) AS aa ON aa.stockup_id = lds.id + LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id + lds.is_deleted = 0 AND ldsi.stock_status != 4 - - + and lds.type_service = #{param.typeService} and @@ -295,9 +272,13 @@ and lds.stockup_user like concat('%',#{param.stockupUser},'%') - and lds.stockip_allocation + and ldpl.goods_allocation like concat('%',#{param.stockipAllocation},'%') + and ldpl.pallet + like concat('%',#{param.pallet},'%') + + and lds.stockup_code like concat('%',#{param.stockupCode},'%') @@ -316,14 +297,14 @@ and lds.loader_name like concat('%', #{param.loaderName},'%') - - - and lds.warehouse_id = - #{param.warehouseId} - - + + and lds.warehouse_id in - + + #{a} + + and ldpl.warehouse_id in + #{a} @@ -368,16 +349,15 @@ lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime, lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode, - COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '')stockipAllocation, - COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet, + COALESCE(GROUP_CONCAT(DISTINCT ldpl.goods_allocation SEPARATOR ','), '')stockipAllocation, + COALESCE(GROUP_CONCAT(DISTINCT ldpl.pallet SEPARATOR ','), '') pallet, COALESCE(group_concat(DISTINCT ldsa.mall_name separator ','), '') as consignee from logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id and ldbs.order_status in (1,2) LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id - LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id - LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id + LEFT JOIN ( SELECT IFNULL(COUNT( b.reservation_id ),0 )AS aaa, @@ -404,9 +384,13 @@ and lds.stockup_user like concat('%',#{param.stockupUser},'%') - and lds.stockip_allocation + and ldpl.goods_allocation like concat('%',#{param.stockipAllocation},'%') + and ldpl.pallet + like concat('%',#{param.pallet},'%') + + and lds.stockup_code like concat('%',#{param.stockupCode},'%') @@ -425,19 +409,13 @@ and lds.loader_name like concat('%', #{param.loaderName},'%') - and lds.type_service = - #{param.typeService} - - and lds.warehouse_id = - #{param.warehouseId} - - + + and lds.warehouse_id in - + #{a} - GROUP BY lds.id ORDER By lds.create_time Desc diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 59b13a84f..a4405af43 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -291,24 +291,25 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl pageList(IPage page, Map distributionStockup) { DistributionStockupEntity distributionStockupEntity = JSON.parseObject(JSON.toJSONString(distributionStockup), DistributionStockupEntity.class); BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); + + List warehouseIdList = new ArrayList<>(); if (ObjectUtils.isNotNull(myCurrentWarehouse)) { //获取当前登录人仓库 - distributionStockupEntity.setWarehouseId(myCurrentWarehouse.getId()); + warehouseIdList.add(myCurrentWarehouse.getId()); } else { //获取当前登录人仓库 List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); //取出id List collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); - distributionStockupEntity.setWarehouseIdList(collect); + warehouseIdList.addAll(collect); } - distributionStockupEntity.setTenantId(AuthUtil.getTenantId()); if ("3".equals(distributionStockupEntity.getTypeService())) { //自 - return baseMapper.pageOweList(page, distributionStockupEntity); + return baseMapper.pageOweList(page, distributionStockupEntity,warehouseIdList); } else { //商 市 - return baseMapper.pageList(page, distributionStockupEntity); + return baseMapper.pageList(page, distributionStockupEntity,warehouseIdList); } } 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 dcfd0aec9..5807c3e76 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 @@ -3093,12 +3093,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl> stockListMap = inventoryAppVO.stream().collect(Collectors.groupingBy(DistrilbutionBillLadingInventoryAppVO::getStockListId)); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/PackageTrackLogAsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/PackageTrackLogAsyncServiceImpl.java index fda6216ef..7a67324a0 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/PackageTrackLogAsyncServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/PackageTrackLogAsyncServiceImpl.java @@ -61,11 +61,12 @@ public class PackageTrackLogAsyncServiceImpl implements IPackageTrackLogAsyncSer @LogpmAsync("asyncExecutor") @Override public void addBatchPackageTrackLog(List addPackageTrackLogList, List orderPackageCodes, Integer workNode, Map map) { - warehousePackageTrackLogClient.addLogList(addPackageTrackLogList); - WarehousePackageTrackLogEntity warehousePackageTrackLogEntity = addPackageTrackLogList.get(0); - Long warehouseId = warehousePackageTrackLogEntity.getWarehouseId(); - - waybillPackageService.updatePackageStatus(orderPackageCodes, workNode,warehouseId, map); + if(CollUtil.isNotEmpty(addPackageTrackLogList)){ + warehousePackageTrackLogClient.addLogList(addPackageTrackLogList); + WarehousePackageTrackLogEntity warehousePackageTrackLogEntity = addPackageTrackLogList.get(0); + Long warehouseId = warehousePackageTrackLogEntity.getWarehouseId(); + waybillPackageService.updatePackageStatus(orderPackageCodes, workNode,warehouseId, map); + } } @LogpmAsync("asyncExecutor")