From 61406324a1bff8e2dba14602d42942337b708bae Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Mon, 21 Aug 2023 16:13:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistrilbutionBillLadingEntity.java | 3 ++ .../DistributionParcelListController.java | 11 +++++++ .../DistributionStockupController.java | 20 +++++++++++ .../mapper/DistributionParcelListMapper.java | 2 ++ .../mapper/DistributionParcelListMapper.xml | 12 +++++++ .../mapper/DistributionStockupMapper.java | 4 +++ .../mapper/DistributionStockupMapper.xml | 33 +++++++++++++++++++ .../mapper/DistrilbutionBillLadingMapper.xml | 3 +- .../IDistributionParcelListService.java | 2 ++ .../service/IDistributionStockupService.java | 3 +- .../DistributionParcelListServiceImpl.java | 10 ++++++ .../impl/DistributionStockupServiceImpl.java | 23 +++++++++++++ .../DistrilbutionBillLadingServiceImpl.java | 7 +++- 13 files changed, 130 insertions(+), 3 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java index e789fd40d..e41039ab8 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java @@ -123,6 +123,9 @@ public class DistrilbutionBillLadingEntity extends TenantEntity { @ApiModelProperty("通知状态") private String notificationStatus; + @ApiModelProperty("提货批次") + private String pickupBatch; + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java index e30d84e10..12d6e7839 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java @@ -107,6 +107,17 @@ public class DistributionParcelListController extends BladeController { IPage pages = distributionParcelListService.getParcelListOwn(Condition.getPage(query), distributionParcelList); return R.data(pages); } + /** + * 在库订单包件清单 自提分页 + */ + @GetMapping("/parcelListOwnSelf") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionParcelList") + public R> getParcelListOwnSelf(@ApiIgnore @RequestParam Map distributionParcelList, Query query) { + + IPage pages = distributionParcelListService.getParcelListOwnSelf(Condition.getPage(query), distributionParcelList); + return R.data(pages); + } /** * 在库订单包件清单 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java index b74562105..080d0d627 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java @@ -122,6 +122,16 @@ public class DistributionStockupController extends BladeController { IPage detail = distributionStockupService.getInventoryOwn(Condition.getPage(query),Long.parseLong((String) o)); return R.data(detail); } + /** + * 备货信息表 库存品信息自提 详情 + */ + @GetMapping("/inventoryOwnSelf") + @ApiOperation(value = "详情", notes = "传入distributionStockup") + public R> getInventoryOwnSelf(@ApiIgnore @RequestParam Map distributionStockup, Query query) { + Object o = distributionStockup.get("id"); + IPage detail = distributionStockupService.getInventoryOwnSelf(Condition.getPage(query),Long.parseLong((String) o)); + return R.data(detail); + } /** * 备货信息表 订单信息 详情 */ @@ -132,6 +142,16 @@ public class DistributionStockupController extends BladeController { IPage detail = distributionStockupService.detailOrderOwn(Condition.getPage(query),Long.parseLong((String) o)); return R.data(detail); } + /** + * 备货信息表 订单信息 自提详情 + */ + @GetMapping("/detailOrderOwnSelf") + @ApiOperation(value = "详情", notes = "传入distributionStockup") + public R> detailOrderOwnSelf(@ApiIgnore @RequestParam Map distributionStockup, Query query) { + Object o = distributionStockup.get("id"); + IPage detail = distributionStockupService.detailOrderOwnSelf(Condition.getPage(query),Long.parseLong((String) o)); + return R.data(detail); + } /** * 备货信息表 分页 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index 6a1abcf54..04acd2ab9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -77,4 +77,6 @@ public interface DistributionParcelListMapper extends BaseMapper getParcelListOwnSelf(IPage page,@Param("id") long parseLong); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index 75c1dab28..fe4b62497 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -60,6 +60,18 @@ where stock_article_id = #{id} + + 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 5ed60b373..e1850cfa8 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 @@ -111,4 +111,8 @@ public interface DistributionStockupMapper extends BaseMapper detailOrderOwnSelf(IPage page,@Param("id") long parseLong); + + List getInventoryCheSelf(@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 063501e5b..0a14ba7ea 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 @@ -276,6 +276,7 @@ ldsi.stockup_id =#{id} + @@ -287,5 +288,37 @@ where ldsi.reservation_id = #{reservationId} and ldsi.is_deleted = 0 + + 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 92e2744a7..aa8e79a78 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 @@ -249,7 +249,8 @@ WHERE ldbl.id = #{id} GROUP BY ldbl.id; dbl.conditions, dbl.notification_status, dbl.total_cost totalCost, - dbl.pick_up_plate pickUpPlate + dbl.pick_up_plate pickUpPlate, + dbl.pickup_batch pickupBatch FROM logpm_distrilbution_bill_lading dbl LEFT JOIN logpm_distribution_stock_article dsa ON dbl.stock_article_id = dsa.id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java index 74c4a9320..ba8496914 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java @@ -68,6 +68,8 @@ public interface IDistributionParcelListService extends BaseService getParcelListOwn(IPage page, Map distributionParcelList); + IPage getParcelListOwnSelf(IPage page, Map distributionParcelList); + /** * 根据包件状态维护订单的状态 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java index 21af4fa83..71aa616a4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java @@ -96,6 +96,7 @@ public interface IDistributionStockupService extends BaseService getInventoryOwn(IPage page, Long id); + IPage getInventoryOwnSelf(IPage page, long parseLong); List createPackageCode(Long reservationId, Long stockListId, Integer packageNum); @@ -104,6 +105,6 @@ public interface IDistributionStockupService extends BaseService detailOrderOwnSelf(IPage page, long parseLong); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 549cd070c..cb0805677 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -103,6 +103,16 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl getParcelListOwnSelf(IPage page, Map distributionParcelList) { + Object o = distributionParcelList.get("id"); + IPage parcelListOwn = baseMapper.getParcelListOwnSelf(page, Long.parseLong((String) o)); + parcelListOwn.getRecords().forEach(i ->{ + i.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,i.getStockupStatus())); + }); + return parcelListOwn; + } + @Override public void updateOrderStatus(String orderPackageCode, String type) { 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 35366cbee..e0fd675e4 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 @@ -408,6 +408,19 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl getInventoryOwnSelf(IPage page, long id) { + IPage l = new Page<>(); + List inventoryChe = baseMapper.getInventoryCheSelf(id); + boolean b = inventoryChe.stream().anyMatch(i -> i.getReservationStockListNum() > 0); + if (b) { + //查询库存品 + return baseMapper.getInventoryOwn(page, id); + } else { + return l; + } + } + /** * 查询预约信息 @@ -476,5 +489,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl detailOrderOwnSelf(IPage page, long parseLong) { + IPage distributionStockupVOIPage = baseMapper.detailOrderOwnSelf(page, parseLong); + distributionStockupVOIPage.getRecords().forEach( o ->{ + Integer integer = distributionStockService.selectCount(Long.parseLong(o.getStockArticleId())); + o.setNumber(integer); + }); + return distributionStockupVOIPage; + } + } 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 ad2bf96f4..ad1d11e7c 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 @@ -48,6 +48,7 @@ import org.springblade.common.constant.order.OrderStatusConstant; import org.springblade.common.constant.stockup.StockAssignStatusConstant; import org.springblade.common.constant.stockup.StockupStatusConstant; import org.springblade.common.constant.stockup.StockupTypeConstant; +import org.springblade.common.serviceConstant.ServiceConstant; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; @@ -61,6 +62,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; @@ -267,6 +269,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl