From 8e8957633c2b4c1058d8d986170e4f2fb2ce14ec Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Mon, 30 Oct 2023 16:20:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=8C=85=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionParcelListVO.java | 1 + .../DistributionParcelListController.java | 20 +++---- .../dto/DistrilbutionBillLadingDTO.java | 7 ++- .../mapper/DistributionParcelListMapper.xml | 10 ++-- .../mapper/DistributionStockupMapper.xml | 22 ++++--- .../mapper/DistrilbutionBillStockMapper.xml | 57 +++++++++++-------- .../IDistributionParcelListService.java | 8 +++ .../IDistrilbutionBillLadingService.java | 5 ++ .../IDistrilbutionBillStockService.java | 6 ++ .../DistributionParcelListServiceImpl.java | 31 +++++++++- .../impl/DistributionStockupServiceImpl.java | 24 ++++---- .../DistrilbutionBillLadingServiceImpl.java | 31 +++++++--- 12 files changed, 150 insertions(+), 72 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java index 24a5f9496..1523e5f82 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java @@ -39,6 +39,7 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { private Date stockupDate; private String stockupArea; private String goodsAllocation; + private Boolean choice; //是否选择 /** * 包件状态名称 */ 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 54ba12e2b..a3c7321eb 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 @@ -149,16 +149,16 @@ public class DistributionParcelListController extends BladeController { } -// /** -// * -// */ -// @GetMapping("/zeroMaterial") -// @ApiOperationSupport(order = 2) -// @ApiOperation(value = "查询零担物料数据", notes = "传入distributionParcelList") -// public R> getZeroMaterial(@ApiIgnore @RequestParam Map distributionParcelList, Query query) { -// List pages = distributionParcelListService.getZeroMaterial(distributionParcelList); -// return R.data(pages); -// } + /** + * 查询自提包件 + */ + @GetMapping("/pickupPack") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "查询自提包件信息", notes = "传入distributionParcelList") + public R> getPickupPack(@ApiIgnore @RequestParam Map distributionParcelList, Query query) { + List list = distributionParcelListService.getPickupPack(distributionParcelList); + return R.data(list); + } /** * 修改零担在库数量 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java index 4a6cf5ed0..ce0ffd4d2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java @@ -145,10 +145,15 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity { private List stockArticleList; /** - * 自提包件数据 + * 自提新增包件数据 */ private List billPackageEntityList; + /** + * 自提取消包件数据 + */ + private List unBillPackageEntityList; + private List printList; private List warehouseIdList; 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 279a5ff9e..b478855fd 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 @@ -195,7 +195,8 @@ from logpm_warehouse_updown_goods where association_id = ldpl.id ) positionCode,lds.allocation_id allocationId - from logpm_distribution_parcel_list ldpl + from logpm_distrilbution_bill_package ldbp + LEFT JOIN logpm_distribution_parcel_list ldpl on ldbp.parce_list_id = ldpl.id and ldbp.packet_bar_status in (1,3) and ldbp.packet_bar_code is not null LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id @@ -222,7 +223,8 @@ from logpm_warehouse_updown_goods where association_id = ldpl.id ) positionCode,lds.allocation_id allocationId - from logpm_distribution_parcel_list ldpl + from logpm_distrilbution_bill_package ldbp + LEFT JOIN logpm_distribution_parcel_list ldpl on ldbp.parce_list_id = ldpl.id and ldbp.packet_bar_status in (1,3) and ldbp.packet_bar_code is not null LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id @@ -258,8 +260,8 @@ ) AS pallet, lds.coding stockupStatus,lds.create_time stockupDate ,lds.stockup_area stockupArea from logpm_distribution_stockup_info ldsi - LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id - LEFT JOIN logpm_distribution_parcel_list ldpl on ldbs.stock_article_id =ldpl.stock_article_id + LEFT JOIN logpm_distrilbution_bill_package ldbp on ldsi.reservation_id = ldbp.bill_lading_id and ldbp.packet_bar_status in (1,3) and ldbp.packet_bar_code is not null + LEFT JOIN logpm_distribution_parcel_list ldpl on ldbp.parce_list_id =ldpl.id LEFT JOIN logpm_distribution_stock lds on ldpl.id = lds.parcel_list_id and lds.stockup_id = ldsi.stockup_id ldsi.stockup_id = #{id} and ldpl.conditions = '1' and ldpl.order_package_code is not null 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 8f796cb38..fc2a80278 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 @@ -467,24 +467,22 @@ - select ldpl.id parcelListId,ldpl.order_package_code packetBarCode,ldbs.stock_article_id stockArticleId,ldbs.bill_lading_id reservationId,ldpl.order_code orderCode + SELECT + ldpl.id parcelListId, + ldpl.order_package_code packetBarCode, + ldbp.stock_article_id stockArticleId, + ldbp.bill_lading_id reservationId, + ldpl.order_code orderCode + FROM logpm_distrilbution_bill_package ldbp + LEFT JOIN logpm_distribution_parcel_list ldpl ON ldbp.parce_list_id = ldpl.id + AND ldpl.order_package_status != '70' + + ldbp.bill_lading_id = #{reservationId} and ldpl.order_package_code is NOT null and ldpl.conditions = '1' + and ldbp.packet_bar_status in (1,3) + - from logpm_distrilbution_bill_stock ldbs - LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id and ldpl.order_package_status != '70' - where ldbs.bill_lading_id = #{reservationId} and ldpl.order_package_code is NOT null and ldpl.conditions = '1' 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 72a414d54..6be0a3dad 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 @@ -147,4 +147,12 @@ public interface IDistributionParcelListService extends BaseService distributionParcelList); + + /** + * 查询自提包件 + * + * @param distributionParcelList + * @return + */ + List getPickupPack(Map distributionParcelList); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java index 974e81293..8bc46422a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java @@ -56,6 +56,11 @@ public interface IDistrilbutionBillLadingService extends BaseService exportDistrilbutionBillLading(Wrapper queryWrapper); + /** + * 提货单 新增或修改 + * @param distrilbutionBillLading + * @return + */ Boolean ownSaveOrUpdate(DistrilbutionBillLadingDTO distrilbutionBillLading); IPage pageList(IPage page, Map distrilbutionBillLading); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java index 5fcc7fc59..5e47da9ca 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java @@ -63,6 +63,12 @@ public interface IDistrilbutionBillStockService extends BaseService getBillOrderPack(Map distrilbutionBillStock, IPage page); + /** + * 查询客户数据 自提 + * @param reservationId + * @param isZero + * @return + */ List selectDistrilbutionBillSelf(Long reservationId,String isZero); /** 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 217d6b069..6aa500fa1 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 @@ -39,7 +39,6 @@ import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; import lombok.AllArgsConstructor; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.order.OrderStockupStatusConstant; -import org.springblade.common.constant.orderpackage.OrderPackageGroundingStatusConstant; import org.springblade.common.utils.CommonUtil; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; @@ -493,6 +492,36 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl getPickupPack(Map distributionParcelList) { + Object o = distributionParcelList.get("stockArticleId"); + Object reservationId = distributionParcelList.get("reservationId"); + List distributionParcelListEntities = baseMapper.selectList(Wrappers.query().lambda() + .eq(DistributionParcelListEntity::getStockArticleId, o) + .eq(DistributionParcelListEntity::getConditions, "1") + ); + List list = new ArrayList<>(); + distributionParcelListEntities.forEach( i ->{ + DistributionReservationZeroPackageEntity one = reservationZeroPackageService.getOne(Wrappers.query().lambda() + .eq(DistributionReservationZeroPackageEntity::getStockArticleId, i.getStockArticleId()) + .eq(DistributionReservationZeroPackageEntity::getReservationId, reservationId) + .eq(DistributionReservationZeroPackageEntity::getParcelListId, i.getId()) + .apply("zero_package_status in (1,3)") + ); + DistributionParcelListVO parcelListVO = new DistributionParcelListVO(); + BeanUtils.copyProperties(i,parcelListVO); + parcelListVO.setChoice(ObjectUtils.isNotNull(one) ? true : false); + list.add(parcelListVO); + }); + return list; + } + /** * @param distributionParcelList 包件信息 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 1979b154b..bcb2e9815 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 @@ -2135,6 +2135,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl zeroStockUpData;; + QueryWrapper queryWrapper = new QueryWrapper<>(); if(stockupDTO.getTypeService().equals("3")){ //自提 if(ObjectUtils.isNull(stockupDTO.getAllocationId())){ @@ -2145,7 +2146,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl collect = zeroStockUpData.stream().filter( //可以 - a -> stockupDTO.getList().stream().anyMatch(q -> a.getStockArticleId().equals(q.getStockArticleId()) && q.getQuantity() <= a.getQuantity() && q.getQuantity() > 0) + List collect = stockupDTO.getList().stream().filter( //可以 + a -> zeroStockUpData.stream().anyMatch(q -> q.getStockArticleId().equals(a.getStockArticleId()) && a.getQuantity() <= q.getQuantity() && a.getQuantity() > 0) ).collect(Collectors.toList()); //添加备货信息 List stockEntityList = new ArrayList<>(); for (StockupZeroVO i : collect) { + //查询是不是当前包件 + DistributionReservationZeroPackageEntity byId1 = reservationZeroPackageService.getById(i.getId()); + if(ObjectUtils.isNull(byId1)){ + continue; + } //查询有没有备货过 - DistributionStockEntity one = distributionStockService.getOne(Wrappers.query().lambda() - .eq(DistributionStockEntity::getStockArticle, i.getStockArticleId()) - .eq(DistributionStockEntity::getStockupId, stockupDTO.getStockupId()) - .eq(DistributionStockEntity::getReservationId, stockupDTO.getReservationId()) - .eq(DistributionStockEntity::getParcelListId, i.getParcelListId()) - ); + queryWrapper.eq("stock_article",i.getStockArticleId()); + queryWrapper.eq("stockup_id",stockupDTO.getStockupId()); + queryWrapper.eq("parcel_list_id", byId1.getParcelListId()); + DistributionStockEntity one = distributionStockService.getOne(queryWrapper ); //查询备货数量 DistributionReservationZeroPackageEntity byId = reservationZeroPackageService.getById(i.getId()); if(i.getQuantity() > byId.getQuantity()){ 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 9fa8e4e38..8cb640234 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 @@ -128,6 +128,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl collect = distrilbutionBillLading.getUnBillPackageEntityList().stream().map(e -> e.getParceListId()).collect(Collectors.toList()); + boolean update = distrilbutionBillPackageService.update(Wrappers.update() + .in("parce_list_id", collect) + .set("packet_bar_status", 2)); + if(!update){ + throw new ServiceException("修改失败！！！"); + } } }); return true;