From bc378d7ce53f04f95976fc039f24a768408ce743 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 1 Nov 2023 18:29:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7=E6=89=98?= =?UTF-8?q?=E7=9B=98=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionStockupVO.java | 1 + .../mapper/DistributionStockupMapper.xml | 4 +- .../service/IDistributionStockupService.java | 5 ++ .../DistributionParcelListServiceImpl.java | 12 +-- .../impl/DistributionStockupServiceImpl.java | 34 +++---- .../DistrilbutionBillLadingServiceImpl.java | 88 +++++-------------- 6 files changed, 56 insertions(+), 88 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java index e2b2f0d32..b7f18520b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java @@ -71,6 +71,7 @@ public class DistributionStockupVO extends DistributionStockupEntity { private Date stockupDate; private Integer number; private String goodsAllocation; //货位 + private String stockipAllocation; //货位 private Integer reservationStockListNum; //数量 private String reservationId; //预约ID private String stockListId; //库存品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 fc2a80278..d7c346bac 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 @@ -183,7 +183,7 @@ lds.assign_status assignStatus, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName, 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, - (GROUP_CONCAT(lwug.position_code)) stockipAllocation + (GROUP_CONCAT(DISTINCT lwug.position_code)) stockipAllocation from logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id =lds.id LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id @@ -246,7 +246,7 @@ select DISTINCT lds.id,lds.stockup_date stockupDate, lds.stockup_user stockupUser, lds.stockup_status stockupStatus, lds.stockup_area stockupArea, lds.assign_status assignStatus, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName, 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,(GROUP_CONCAT(lwtg.tray_code)) stockipAllocation + lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,(GROUP_CONCAT(DISTINCT lwtg.tray_code)) stockipAllocation 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 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 946e02481..d664c67de 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 @@ -55,6 +55,11 @@ public interface IDistributionStockupService extends BaseService exportDistributionStockup(Wrapper queryWrapper); + /** + * 指派备货人员信息 + * @param distributionStockup + * @return + */ Boolean saveAssign(DistributionStockupEntity distributionStockup); IPage pageList(IPage page, Map distributionStockup); 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 2f09df4b5..623285aeb 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 @@ -80,6 +80,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList) { List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); @@ -510,11 +512,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl distributionParcelListEntityIPage = baseMapper.pageOweList(page, parcelListEntity); List list = new ArrayList<>(); distributionParcelListEntityIPage.getRecords().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)") + DistrilbutionBillPackageEntity one = distrilbutionBillPackageService.getOne(Wrappers.query().lambda() + .eq(DistrilbutionBillPackageEntity::getStockArticleId, i.getStockArticleId()) + .eq(DistrilbutionBillPackageEntity::getBillLadingId, reservationId) + .eq(DistrilbutionBillPackageEntity::getParceListId, i.getId()) + .apply("packet_bar_status in (1,3)") ); DistributionParcelListEntity parcelListVO = new DistributionParcelListEntity(); BeanUtils.copyProperties(i,parcelListVO); 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 d5648f8de..586a6c759 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 @@ -204,7 +204,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl distributionStockListSelfNumVOS = distributionStockupInfoService.selectStockListSelfNum(s); if (!distributionStockListSelfNumVOS.isEmpty()) { @@ -748,15 +748,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl 0){ //部分 distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue()); - }else if(1 == 0){ - //全部 - distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue()); } }else{ //没有包件 查询包件信息 - /*List list1 = distributionParcelListService.list(Wrappers.query().lambda() - .eq(DistributionParcelListEntity::getStockArticleId, s) - .eq(DistributionParcelListEntity::getConditions, 1) - ); - list1.stream().forEach(ss ->{ - DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity(); - billPackageEntity.setBillLadingId(distrilbutionBillLading.getId()); - billPackageEntity.setPacketBarCode(ss.getOrderPackageCode()); - billPackageEntity.setPacketBarStatus(1); - billPackageEntity.setParceListId(ss.getId()); - billPackageEntity.setStockArticleId(ss.getStockArticleId()); - - if(byId.getIsZero().equals("1")){ - //零担 - Optional first = parcelLisList.stream().filter(i -> i.getStockArticleId().equals(ss.getStockArticleId()) && i.getId().equals(ss.getId())).findFirst(); - billPackageEntity.setBillType("2"); - billPackageEntity.setPacketNumber(first.get().getQuantity()); - }else{ - billPackageEntity.setBillType("1"); - billPackageEntity.setPacketNumber(ss.getQuantity()); - } - packageEntityList.add(billPackageEntity); - });*/ - - packageEntityList.addAll(billPackInfo(s,distrilbutionBillLading.getId(),parcelLisList,byId)); distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue()); } }else{ //没有包件 查询包件信息 - /*List list1 = distributionParcelListService.list(Wrappers.query().lambda() - .eq(DistributionParcelListEntity::getStockArticleId, s) - .eq(DistributionParcelListEntity::getConditions, 1) - ); - list1.stream().forEach(ss ->{ - - DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity(); - billPackageEntity.setBillLadingId(distrilbutionBillLading.getId()); - billPackageEntity.setPacketBarCode(ss.getOrderPackageCode()); - billPackageEntity.setPacketBarStatus(1); - billPackageEntity.setParceListId(ss.getId()); - billPackageEntity.setStockArticleId(ss.getStockArticleId()); - if(byId.getIsZero().equals("1")){ - //零担 - Optional first = parcelLisList.stream().filter(i -> i.getStockArticleId().equals(ss.getStockArticleId()) && i.getId().equals(ss.getId())).findFirst(); - billPackageEntity.setBillType("2"); - billPackageEntity.setPacketNumber(first.get().getQuantity()); - }else{ - billPackageEntity.setBillType("1"); - billPackageEntity.setPacketNumber(ss.getQuantity()); - } - - packageEntityList.add(billPackageEntity); - });*/ - packageEntityList.addAll(billPackInfo(s,distrilbutionBillLading.getId(),parcelLisList,byId)); distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue()); } + +// int i1 = byId.getHandQuantity() + byId.getSigninQuantity(); //总数 + if(byId.getCompleteSet().equals("1")){ + //部分 + distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue()); + }else{ + //全部 + distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue()); + } + //判断是否改为已预约 List parcelNumberList = distributionParcelNumberService.list(Wrappers.query().lambda() .eq(DistributionParcelNumberEntity::getStockArticleId, s) @@ -576,21 +533,24 @@ 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("修改失败！！！"); - } - } + }); + //删除包件 + if(!distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()){ + List 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; }