diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java index a7b26dd55..0a9cbbabf 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java @@ -53,6 +53,6 @@ public interface IBasicdataGoodsAreaClient { Long addCargo(@RequestBody BasicdataGoodsAreaEntity goodsAreaEntity); @GetMapping(API_PREFIX+"/getEntityByGoodsAreaId") - BasicdataGoodsAreaEntity getEntityByGoodsAreaId(Long goodsAreaId); + BasicdataGoodsAreaEntity getEntityByGoodsAreaId(@RequestParam Long goodsAreaId); } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java index 5f7e6fc26..15d90db36 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java @@ -99,7 +99,7 @@ public interface IBasicdataWarehouseClient { * @return */ @GetMapping(API_PREFIX+"/getMyCurrentWarehouse") - Object getMyCurrentWarehouse(); + BasicdataWarehouseEntity getMyCurrentWarehouse(); diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionLoadscanClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionLoadscanClient.java index 1191618e5..e370b281a 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionLoadscanClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionLoadscanClient.java @@ -47,4 +47,7 @@ public interface IDistributionLoadscanClient { @GetMapping(TOP) BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + @GetMapping(API_PREFIX+"/getByOrderPackageCode") + DistributionLoadscanEntity getByOrderPackageCode(@RequestParam("orderPackageCode") String orderPackageCode); + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java index 0005f4d6a..b346fcc89 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java @@ -63,6 +63,13 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity { */ @ApiModelProperty(value = "订单") private String orderIds; + + /** + * 商场名称 + */ + @ApiModelProperty(value = "商场名称") + private String storeName; + /** * 状态 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockVO.java index 81e969e92..187fbda66 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockVO.java @@ -41,6 +41,7 @@ public class DistributionStockVO extends DistributionStockEntity { private Long stockArticleId; private Integer scanned;//已扫 + private Integer whole;//全部 } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseTaryAllocationEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseTaryAllocationEntity.java index fa39eb6b1..2366d04ff 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseTaryAllocationEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseTaryAllocationEntity.java @@ -30,7 +30,7 @@ public class WarehouseTaryAllocationEntity extends TenantEntity { private String reserve5 ; /** 托盘id */ @ApiModelProperty(name = "托盘id",notes = "") - private Long taryId ; + private Long trayId ; /** 货位Id */ @ApiModelProperty(name = "货位Id",notes = "") private Long allocationId ; diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java index 04edc5f76..c17a6a0cf 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java @@ -17,5 +17,6 @@ public class UpShelfDataVO implements Serializable { private String marketName;//商场名称 private String materialCode;//物料编码 private String materialName;//物料名称 + private Integer goodsType;//货物类型 } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java index 676e2e32d..9af8f7b8d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java @@ -136,7 +136,6 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl collect = list1.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); sendWarehouseIds = collect.stream().map(String::valueOf).collect(Collectors.toList()); } - }else{ sendWarehouseIds = basicdataStorageServices.getSendWarehouseIds(); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionLoadscanClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionLoadscanClient.java index 556ed0962..ba7d9263d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionLoadscanClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionLoadscanClient.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.feign; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.BladePage; @@ -50,4 +51,12 @@ public class DistributionLoadscanClient implements IDistributionLoadscanClient { return BladePage.of(page); } + @Override + public DistributionLoadscanEntity getByOrderPackageCode(String orderPackageCode) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("order_package_code",orderPackageCode) + .ne("scan_status",1); + return distributionLoadscanService.getOne(queryWrapper); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index f32d66c43..3e379480c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -66,6 +66,7 @@ ldr.id id, ldr.is_urgent isUrgent, lds.id deliveryId, + ldr.store_name, ldr.consignee consignee, lds.signing_type signingType, lds.train_number trainNumber, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java index 95022aed1..93c04bcf9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -269,7 +269,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper selectStockArticleById(@Param("deliveryListId")Long id); + List selectStockArticleById(@Param("deliveryListId")Long id,@Param("consignee")String consignee); /** * 查询配送下的预约信息 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 9df0d3b95..526b0e7f7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -84,9 +84,9 @@ SELECT COALESCE (COUNT(*), 0) FROM - logpm_distribution_signfor lds + logpm_distribution_signfor lds INNER JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id WHERE - lds.delivery_id = lddl.id + lds.delivery_id = lddl.id and ldr.reservation_status != '40' ) customersNumber, lddl.price price, lddl.added_services_id addedServicesId, @@ -98,7 +98,7 @@ JOIN logpm_distribution_reservation ldr ON lds.reservation_id = ldr.id JOIN logpm_distribution_reservation_stockarticle ldrs ON ldrs.reservation_id = ldr.id WHERE - lds.delivery_id = lddl.id + lds.delivery_id = lddl.id and ldrs.stock_article_status != 2 ) orderNumber, ( SELECT @@ -107,7 +107,7 @@ logpm_distribution_signfor lds JOIN logpm_distribution_reservation ldr ON lds.reservation_id = ldr.id WHERE - lds.delivery_id = lddl.id + lds.delivery_id = lddl.id and ldr.reservation_status != '40' ) deliveryNumber, ( SELECT @@ -1028,11 +1028,16 @@ b.* FROM logpm_distribution_signfor a + INNER JOIN logpm_distribution_reservation AS lds ON a.reservation_id = lds.id INNER JOIN logpm_distribution_reservation_stockarticle b ON a.reservation_id = b.reservation_id + b.stock_article_status != 2 and a.delivery_id = #{deliveryListId} + + and lds.consignee = #{consignee} + 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 a3fb3e20f..a5381a695 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 @@ -3,6 +3,7 @@ package com.logpm.distribution.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.*; import com.logpm.distribution.mapper.DistributionLoadscanMapper; @@ -53,11 +54,17 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { if (distributionLoadscanEntities.size()<0){log.info("[makeSureByPackage]包条无数据"); return;} // 使用流式操作和映射，提取包条Id并创建新的列表 List PackageIdList = distributionLoadscanEntities.stream().map(DistributionLoadscanEntity::getPackageId).collect(Collectors.toList()); + List parcelListEntityList = distributionParcelListMapper.selectList(Wrappers.query().lambda().in(DistributionParcelListEntity::getId, PackageIdList)); + // + //TODO 包件状态变更 //修改状态包条状态 distributionParcelListService.update(new UpdateWrapper().lambda() .in(DistributionParcelListEntity::getId,PackageIdList) .set(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yizhuangche.getValue()) ); + + + //提取订单Id(去重) List OrderList = distributionLoadscanEntities.stream().map(DistributionLoadscanEntity::getOrderId).distinct().collect(Collectors.toList()); //查询修改订单状态 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 818d69aa1..25496b023 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -1202,38 +1202,43 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl stockArticleVOS = distributionDeliveryListMapper.getDeliveryDisuccStockArticleInfo(id); - List stockArticleVOList = DistributionStockArticleWrapper.build().listVO(stockArticleVOS); - stockArticleVOList.forEach(s -> { - //这里查询出订单选取的包件信息 - DistributionReservationPackageDTO reservationPackageDTO = new DistributionReservationPackageDTO(); - reservationPackageDTO.setReservationId(reservationVOS.getId()); - reservationPackageDTO.setStockArticleId(s.getId()); - List parcelListEntities = distributionReservationPackageMapper.getDeliveryReservationPackage(deliveryListEntity.getId(), s.getId()); - List distributionParcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntities); - if (Func.isNotEmpty(distributionParcelListVOS)){ - //查询出订单的所有包件信息 - List parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId())); - List parcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntityList); - s.setPackageList(distributionParcelListVOS); - s.setParcelListVOS(parcelListVOS); - } - }); - deliveryListVO.setStockArticleList(stockArticleVOList); + if (Func.isNotEmpty(reservationVOS)){ + deliveryListVO.setReservationInfo(reservationVOS); + //1、查询出订单信息 + List stockArticleVOS = distributionDeliveryListMapper.getDeliveryDisuccStockArticleInfo(id); + List stockArticleVOList = DistributionStockArticleWrapper.build().listVO(stockArticleVOS); + stockArticleVOList.forEach(s -> { + //这里查询出订单选取的包件信息 + DistributionReservationPackageDTO reservationPackageDTO = new DistributionReservationPackageDTO(); + reservationPackageDTO.setReservationId(reservationVOS.getId()); + reservationPackageDTO.setStockArticleId(s.getId()); + List parcelListEntities = distributionReservationPackageMapper.getDeliveryReservationPackage(deliveryListEntity.getId(), s.getId()); + List distributionParcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntities); + if (Func.isNotEmpty(distributionParcelListVOS)){ + //查询出订单的所有包件信息 + List parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId())); + List parcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntityList); + s.setPackageList(distributionParcelListVOS); + s.setParcelListVOS(parcelListVOS); + } + }); + deliveryListVO.setStockArticleList(stockArticleVOList); + } + //2、查询出备货信息 DistributionStockupVO stockupEntity = distributionStockupMapper.getDeliveryStockupInfo(id); - deliveryListVO.setStockupInfo(stockupEntity); - //3、查询司机信息 - if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) { - //自主配送 - List deliverySelfVO = distributionDeliverySelfMapper.getDeliverySelfInfo(id); - deliveryListVO.setDeliverySelfVO(deliverySelfVO); - } else { - //外协配送 - DistributionDeliveryTripartiteVO deliveryTripartiteVO = distributionDeliveryTripartiteMapper.getDeliveryTripartiteInfo(id); - deliveryListVO.setDeliveryTripartiteVO(deliveryTripartiteVO); + if (Func.isNotEmpty(stockupEntity)){ + deliveryListVO.setStockupInfo(stockupEntity); + //3、查询司机信息 + if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) { + //自主配送 + List deliverySelfVO = distributionDeliverySelfMapper.getDeliverySelfInfo(id); + deliveryListVO.setDeliverySelfVO(deliverySelfVO); + } else { + //外协配送 + DistributionDeliveryTripartiteVO deliveryTripartiteVO = distributionDeliveryTripartiteMapper.getDeliveryTripartiteInfo(id); + deliveryListVO.setDeliveryTripartiteVO(deliveryTripartiteVO); + } } //4、结果封装 return deliveryListVO; @@ -1382,6 +1387,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationStockarticleEntityList = distributionReservationMapper.selectStockArticleByReservationId(reservationEntity.getId()); - List reservationStockarticleEntityList = distributionDeliveryListMapper.selectStockArticleById(deliveryListEntityId); + List reservationStockarticleEntityList = distributionDeliveryListMapper.selectStockArticleById(deliveryListEntityId,k); Map> oldStockArticle = reservationStockarticleEntityList.stream().collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getStockArticleId)); v.forEach(s -> { //根据配送和客户名称查询预约 @@ -1447,20 +1453,22 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl entities = distributionReservationStockarticleMapper.selectList(Wrappers.query().lambda() + .ne(DistributionReservationStockarticleEntity::getStockArticleStatus, "2") + .eq(DistributionReservationStockarticleEntity::getReservationId, reservationEntity.getId())); + entities.forEach(e->{ + e.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue()); + distributionReservationStockarticleService.updateById(e); + //这个订单的包件预约进行取消 + List packageEntityList = distributionReservationPackageMapper.selectList(Wrappers.query().lambda().eq(DistributionReservationPackageEntity::getStockArticleId, e.getStockArticleId()).ne(DistributionReservationPackageEntity::getPacketBarStatus, "2")); + packageEntityList.forEach(p->{ + p.setPacketBarStatus(ReservationPackageStatusConstant.quxiao.getValue()); + distributionReservationPackageService.updateById(p); + DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(p.getParceListId()); + parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue()); + distributionParcelListService.updateById(parcelListEntity); + }); + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(e.getStockArticleId()); + stockArticleEntity.setReservationStatus(distributionReservationPackageService.judgmentStatus(Func.copy(stockArticleEntity,DistributionStockArticleDTO.class))); + distributionStockArticleService.updateById(stockArticleEntity); + //修改预约状态和包件状态 + }); }); String kind = deliveryListEntity.getKind(); switch (kind) { @@ -1827,6 +1856,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl select lwt.* from logpm_warehouse_tary_allocation lwta - left join logpm_warehouse_tray lwt on lwta.tary_id = lwt.id and lwt.is_deleted = 0 + left join logpm_warehouse_tray lwt on lwta.tray_id = lwt.id and lwt.is_deleted = 0 where lwta.is_deleted = 0 and lwta.allocation_id = #{allocationId} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml index 7909db4fb..b3d8407e8 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml @@ -100,7 +100,7 @@ select ldsa.order_code orderCode, ldsa.total_number totalNum, + 2 goodsType, lwug.num shelfNum, ldsa.complete_set completeSet from logpm_warehouse_updown_goods lwug @@ -112,6 +114,7 @@ ldsl.market_id marketId, ldsl.market_name marketName, ldsl.quantity_stock totalNum, + 3 goodsType, lwug.num shelfNum from logpm_warehouse_updown_goods lwug left join logpm_basicdata_material lbm on lbm.id = lwug.association_id and lbm.is_deleted = 0 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java index db264b7d6..1e353048a 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java @@ -16,18 +16,13 @@ */ package com.logpm.warehouse.service.impl; -import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity; -import com.logpm.warehouse.vo.WarehouseRetentionRecordVO; -import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel; -import com.logpm.warehouse.mapper.WarehouseRetentionRecordMapper; -import com.logpm.warehouse.service.IWarehouseRetentionRecordService; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseServiceImpl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.logpm.distribution.entity.DistributionLoadscanEntity; +import com.logpm.distribution.entity.DistributionParcelListEntity; +import com.logpm.distribution.feign.IDistributionLoadscanClient; +import com.logpm.distribution.feign.IDistributionParcelListClient; import com.logpm.warehouse.dto.RetentionDTO; import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity; import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel; @@ -36,11 +31,13 @@ import com.logpm.warehouse.service.IWarehouseRetentionRecordService; import com.logpm.warehouse.vo.WarehouseRetentionRecordVO; import com.logpm.warehouse.vo.WarehouseWaybillDetentionVO; import com.logpm.warehouse.wrapper.WarehouseRetentionRecordWrapper; +import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 滞留记录 服务实现类 @@ -48,9 +45,13 @@ import java.util.List; * @author BladeX * @since 2023-08-09 */ +@AllArgsConstructor @Service public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl implements IWarehouseRetentionRecordService { + private final IDistributionLoadscanClient distributionLoadscanClient; + private final IDistributionParcelListClient distributionParcelListClient; + @Override public IPage selectWarehouseRetentionRecordPage(IPage page, WarehouseRetentionRecordVO warehouseRetentionRecord) { return page.setRecords(baseMapper.selectWarehouseRetentionRecordPage(page, warehouseRetentionRecord)); @@ -88,6 +89,30 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl trayGoodsQueryWrapper = new QueryWrapper<>(); trayGoodsQueryWrapper.eq("tray_type_id",trayTypeId); List trayGoodsList = warehouseTrayGoodsService.list(trayGoodsQueryWrapper); //把托盘绑定关系转成货位绑定关系 changeTrayGoodsToUpdownGoodsAndLog(trayGoodsList,updownTypeEntity); + //绑定托盘与库位关系 + WarehouseTaryAllocationEntity taryAllocationEntity = new WarehouseTaryAllocationEntity(); + taryAllocationEntity.setTrayId(trayId); + taryAllocationEntity.setAllocationId(allocationId); + taryAllocationEntity.setBindStatus("0"); + warehouseTaryAllocationService.save(taryAllocationEntity); + //更新打托方式上的数量 updateUpdownTypeNum(updownTypeEntity); return Resp.scanSuccess("上架成功","整托上架成功");