From 2d0a6e0dba5ee2fef8c7054566d92489117772b3 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 2 Aug 2023 15:50:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E4=BB=B6=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionParcelListEntity.java | 10 +++++----- .../mapper/DistributionStockListMapper.xml | 14 +------------- .../service/impl/DistributionAsyncServiceImpl.java | 6 +++--- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index 6cf97424d..034377395 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -173,11 +173,11 @@ public class DistributionParcelListEntity extends TenantEntity { */ @ApiModelProperty(value = "品牌名称") private String brandName; - /** - * 配送状态 - */ - @ApiModelProperty(value = "配送状态") - private String deliveryState; +// /** +// * 配送状态 +// */ +// @ApiModelProperty(value = "配送状态") +// private String deliveryState; /** * 包件状态 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 1afdcbd9d..2aff5b83e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -55,18 +55,6 @@ where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id and l.pid = ldsi.pid and l.pid is not null ) END 'quantityStock', CASE WHEN ldsi.pid is null THEN - (select count(ldrs.reservation_num) - FROM logpm_distribution_reservation_stocklist ldrs - where ldrs.stocklist_id in (select l.id - from logpm_distribution_stock_list l - where l.market_id =ldsi.market_id and l.material_id = ldsi.material_id and l.pid is null)) - ELSE (select count(ldrs.reservation_num) - FROM logpm_distribution_reservation_stocklist ldrs - where ldrs.stocklist_id in (select l.id - from logpm_distribution_stock_list l - where l.market_id =ldsi.market_id and l.material_id = ldsi.material_id and l.pid = ldsi.pid and l.pid is not null)) - END 'quantityOccupied', - CASE WHEN ldsi.pid is null THEN (select sum(l.outbound_quantity) from logpm_distribution_stock_list l where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id AND l.pid is null) @@ -87,7 +75,7 @@ from logpm_distribution_stock_list l where l.market_id =ldsi.market_id and l.material_id = ldsi.material_id and l.pid = ldsi.pid and l.pid is not null )) END 'unpack', - ldsi.market_id marketId,ldsi.store_id storeId,ldsi.material_id materialId,ldsi.id,ldsi.unpacking_quantity unpackingQuantity + ldsi.market_id marketId,ldsi.store_id storeId,ldsi.material_id materialId,ldsi.id,ldsi.unpacking_quantity unpackingQuantity,ldsi.quantity_occupied quantityOccupied from logpm_distribution_stock_list ldsi ldsi.is_deleted = 0 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 fadd038e9..1b6c20352 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 @@ -56,7 +56,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { //修改状态包条状态 distributionParcelListService.update(new UpdateWrapper().lambda() .in(DistributionParcelListEntity::getId,PackageIdList) - .set(DistributionParcelListEntity::getDeliveryState,"5") + .set(DistributionParcelListEntity::getOrderPackageStatus,ServiceConstant.PACKAGE_STATUS_LOADING) ); //提取订单Id(去重) List OrderList = distributionLoadscanEntities.stream().map(DistributionLoadscanEntity::getOrderId).distinct().collect(Collectors.toList()); @@ -78,7 +78,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { public Boolean getSelfPickup(Long id) { DistributionParcelListEntity entity = new DistributionParcelListEntity(); entity.setId(id); - entity.setDeliveryState("40"); + entity.setOrderPackageStatus(ServiceConstant.PACKAGE_STATUS_SING_FOR); return distributionParcelListService.updateById(entity); } /** @@ -92,7 +92,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { public Boolean getOrderSelfPickup(Long id) { DistributionStockArticleEntity entity = new DistributionStockArticleEntity(); entity.setId(id); - entity.setOrderStatus(ServiceConstant.ORDER_STATE_SIX); + entity.setOrderStatus(ServiceConstant.ORDER_STATE_SEVEN); return distributionStockArticleService.updateById(entity); }