From 42d9675e336b96ae0b0aa412e9ebf5000574fac9 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 2 Feb 2024 14:38:46 +0800 Subject: [PATCH] =?UTF-8?q?PDA=E7=AD=BE=E6=94=B6=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E5=A4=87=E8=B4=A7=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E5=8C=85=E4=BB=B6=E4=B8=8A=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/vo/UpDownStockupAreaVO.java | 5 ++ .../WarehouseUpdownStockupAreaEntity.java | 2 +- .../mapper/DisStockListDetailMapper.xml | 2 +- .../impl/DistributionSignforServiceImpl.java | 4 ++ .../dto/UpStockupAreaPackageDTO.java | 14 ++++- ...WarehouseUpdownStockupAreaServiceImpl.java | 53 +++++++++++++------ 6 files changed, 62 insertions(+), 18 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpDownStockupAreaVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpDownStockupAreaVO.java index 36004da15..eb27133b5 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpDownStockupAreaVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/UpDownStockupAreaVO.java @@ -26,9 +26,14 @@ public class UpDownStockupAreaVO { private String goodsType; private String orderCode; + private String materielCode; + + private String materielName; private Long orderId; + private Integer num; + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaEntity.java index 9c2a40abb..f06f0aaa0 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaEntity.java @@ -84,7 +84,7 @@ public class WarehouseUpdownStockupAreaEntity extends TenantEntity { private String materielCode ; /** 物料名称 */ @ApiModelProperty(name = "物料名称",notes = "") - private String materielName ; + private String materielName; /** 仓库id */ @ApiModelProperty(name = "仓库id",notes = "") private Long warehouseId; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DisStockListDetailMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DisStockListDetailMapper.xml index 466b2fa84..838cb0116 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DisStockListDetailMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DisStockListDetailMapper.xml @@ -61,7 +61,7 @@ ldsl.id AS orderId, ldsl.order_code AS orderCode, ldsl.incoming_batch AS incomingBatch, - #{warehouseId} AS warehouseId, + #{warehouseId} AS warehouseId FROM logpm_dis_stock_list_detail AS ldsld LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldsld.stock_list_id = ldsl.id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index a1cf6990a..efccb3d66 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -47,6 +47,7 @@ import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.util.Strings; import org.jetbrains.annotations.NotNull; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.DistributionTypeConstant; @@ -782,6 +783,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl details = baseMapper.signingPackageDetail(reservationId); + if (Func.isNotEmpty(details)){ + details = details.stream().filter(f-> !Strings.isBlank(f.getOrderPackageCode())).collect(Collectors.toList()); + } return R.data(details); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpStockupAreaPackageDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpStockupAreaPackageDTO.java index cb01be439..14339cc65 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpStockupAreaPackageDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpStockupAreaPackageDTO.java @@ -36,7 +36,7 @@ public class UpStockupAreaPackageDTO implements Serializable { /** * 绑定ID 与上方对应 */ - private String associationId; + private Long associationId; /** * 批次号 库存品专属 @@ -48,6 +48,18 @@ public class UpStockupAreaPackageDTO implements Serializable { */ private String goodsType; + /** + * 物料编码 + */ + private String materielCode; /** + * 物料名称 + */ + private String materielName; + /** + * 数量 + */ + private Integer num; + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java index 175a844ac..612fd4376 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java @@ -28,8 +28,10 @@ import com.logpm.basicdata.feign.IBasicdataGoodsAreaClient; import com.logpm.basicdata.feign.IBasicdataGoodsShelfClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.entity.DistributionParcelListEntity; +import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.feign.IDisStockListDetailClient; import com.logpm.distribution.feign.IDistributionParcelListClient; +import com.logpm.distribution.feign.IDistributionStockArticleClient; import com.logpm.distribution.vo.UpDownStockupAreaVO; import com.logpm.warehouse.dto.UpShelfPackageDTO; import com.logpm.warehouse.dto.UpStockupAreaPackageDTO; @@ -86,6 +88,8 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImplquery().lambda() + .eq(WarehouseUpdownStockupAreaEntity::getWarehouseId, warehouseId) + .eq(WarehouseUpdownStockupAreaEntity::getAssociationValue, upStockupAreaPackageDTO.getAssociationValue()) + .eq(WarehouseUpdownStockupAreaEntity::getAssociationType, upStockupAreaPackageDTO.getAssociationType()) + .eq(WarehouseUpdownStockupAreaEntity::getAllocationId, upStockupAreaPackageDTO.getAssociationId()) + .eq(WarehouseUpdownStockupAreaEntity::getGoodsType, upStockupAreaPackageDTO.getGoodsType()) + ); + if (Objects.isNull(isHave)){ + WarehouseUpdownStockupAreaEntity updownStockupAreaEntity = BeanUtil.copy(upStockupAreaPackageDTO, WarehouseUpdownStockupAreaEntity.class); + updownStockupAreaEntity.setAreaTitle(goodsAreaEntity.getHeadline()); + updownStockupAreaEntity.setAreaId(goodsAreaEntity.getId()); + updownStockupAreaEntity.setShelfId(goodsShelfEntity.getId()); + updownStockupAreaEntity.setShelfTitle(goodsShelfEntity.getGoodsShelfName()); + updownStockupAreaEntity.setAllocationId(goodsAllocationEntity.getId()); + updownStockupAreaEntity.setAllocationTitle(goodsAllocationEntity.getGoodsAllocationName()); + updownStockupAreaEntity.setPositionCode(goodsAllocationEntity.getQrCode()); + updownStockupAreaEntity.setWarehouseId(warehouseId); + updownStockupAreaEntity.setUpdownType("包条"); + waitSaveWarehouseUpdownStockupAreaEntity.add(updownStockupAreaEntity); + WarehouseUpdownStockupAreaLogEntity warehouseUpdownStockupAreaLogEntity = BeanUtil.copy(updownStockupAreaEntity, WarehouseUpdownStockupAreaLogEntity.class); + warehouseUpdownStockupAreaLogEntity.setRemark("扫描上架:包条上架"); + warehouseUpdownStockupAreaLogEntity.setBindingType(1); + waitSaveWarehouseUpdownStockupAreaLogEntity.add(warehouseUpdownStockupAreaLogEntity); + } //查询是否进行了上架，如果进行了上架需要进行对原库位进行下架, - } if (Func.isNotEmpty(waitUpShelfPackageDTO)){ //存在需要进行下架操作的包件