From 617db1fb848f17af9dfd5dbfd44c05d65a83714d Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 19 Apr 2024 15:06:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=AD=BE=E6=94=B6=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E5=B7=B2=E8=A3=85=E8=BD=A6=E5=8C=85=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseUpdownStockupAreaEntity.java | 4 +- .../IWarehouseUpdownStockUpAreaClient.java | 12 ++++ .../impl/DistributionSignforServiceImpl.java | 18 +++++- .../impl/DistributionStockupServiceImpl.java | 4 +- .../DistrilbutionBillStockServiceImpl.java | 3 +- .../WarehouseUpdownStockupAreaClient.java | 13 +++++ .../IWarehouseUpdownStockupAreaService.java | 10 ++++ ...WarehouseUpdownStockupAreaServiceImpl.java | 55 +++++++++++++++++++ 8 files changed, 113 insertions(+), 6 deletions(-) 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 c83d3fc30..30f1b9d98 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 @@ -61,8 +61,8 @@ public class WarehouseUpdownStockupAreaEntity extends TenantEntity { /** 关联值 */ @ApiModelProperty(name = "关联值",notes = "") private String associationValue ; - /** 关联类型;1.订单号 2运单号 3包件码 */ - @ApiModelProperty(name = "关联类型",notes = "1.订单号 2运单号 3包件码 4库存品") + /** 1.包件 2库存品 3订单 4托盘 */ + @ApiModelProperty(name = "关联类型",notes = "1.包件 2库存品 3订单 4托盘") private String associationType ; /** 货物名称 */ @ApiModelProperty(name = "货物名称",notes = "") diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownStockUpAreaClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownStockUpAreaClient.java index dfbbc2b60..227be1536 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownStockUpAreaClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownStockUpAreaClient.java @@ -46,4 +46,16 @@ public interface IWarehouseUpdownStockUpAreaClient { @GetMapping(TOP+"/upStockUpShelf") Boolean upStockUpShelf(@RequestParam String code,@RequestParam Long stockUpAllocationId,@RequestParam Long warehouseId,@RequestParam Integer type,@RequestParam Integer num); + + + /** + * 备货库位下架接口 + * @param code + * @param warehouseId + * @param type + * @param num + * @return + */ + @GetMapping(TOP+"/downStockUpShelf") + Boolean downStockUpShelf(@RequestParam String code,@RequestParam Long warehouseId,@RequestParam Integer type,@RequestParam Integer num); } 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 99f4f7438..a077841f0 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 @@ -2816,6 +2816,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelListEntities = distributionDeliveryListMapper.selectPackageListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId()); boolean flag = parcelListEntities.stream().anyMatch(p -> p.getOrderPackageStatus().equals(distrilbutionloadingscanDTO.getBarcode())); @@ -2840,11 +2841,24 @@ public class DistributionSignforServiceImpl extends BaseServiceImplquery().lambda() + List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda() .eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) - .eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) +// .eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) .eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()) .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); + + DistributionLoadscanEntity loadscanEntity = null; + if (loadscanEntityList.isEmpty()){ + if (loadscanEntityList.size() > 1){ + log.error("##############异常签收包件在其他车次进行装车reservationId:{}", loadscanEntityList.stream().map(DistributionLoadscanEntity::getReservationId).map(String::valueOf).collect(Collectors.joining(","))); + return Resp.scanFail("操作失败", "包件已出库"); + } + + if (loadscanEntityList.size() == 1){ + loadscanEntity = loadscanEntityList.get(0); + } + } + if (Func.isNotEmpty(loadscanEntity)) { if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) { return Resp.scanFail("重复操作!!", "重复操作"); 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 080af4d1e..26ea1673b 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 @@ -2720,7 +2720,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl map = new HashMap<>(); - map.put("allocation",updownGoodsEntity.getPositionCode()); + map.put("allocationName",updownGoodsEntity.getPositionCode()); + map.put("allocationid",updownGoodsEntity.getAllocationId()); map.put("num",updownGoodsEntity.getNum()); allocationMapList.add(map); } @@ -2744,6 +2745,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl map = new HashMap<>(); map.put("trayCode",next.getTrayCode()); + map.put("trayId",next.getTrayId()); map.put("trayName",trayByTrayCode.getPalletName()); map.put("num",next.getNum()); trayMapList.add(map); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java index dc332c14d..2e2ae5ccc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java @@ -36,6 +36,7 @@ import com.logpm.distribution.vo.*; import lombok.AllArgsConstructor; import org.springblade.common.constant.DictBizConstant; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.system.cache.DictBizCache; @@ -47,6 +48,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 提货单订单信息关联 服务实现类 @@ -110,7 +112,6 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl warehouseUpdownStockupAreaEntityList = this.list(Wrappers.query().lambda() + .eq(WarehouseUpdownStockupAreaEntity::getAssociationValue, code) + .eq(WarehouseUpdownStockupAreaEntity::getWarehouseId, warehouseId) + ); + if (warehouseUpdownStockupAreaEntityList.isEmpty()){ + log.error(method+"无上架记录AssociationValue:{},warehouseId:{}",code,warehouseId); + return false; + } + if (warehouseUpdownStockupAreaEntityList.size() > 1){ + log.error(method+"多条上架记录AssociationValue:{},warehouseId:{}",code,warehouseId); + return false; + } + WarehouseUpdownStockupAreaEntity warehouseUpdownStockupArea = warehouseUpdownStockupAreaEntityList.get(0); + switch (warehouseUpdownStockupArea.getAssociationType()){ + case "1" : + case "2" : + case "4" : + //库存品包件 + //订制品 + this.removeById(warehouseUpdownStockupArea.getId()); + break; + case "3": + //零担 + int i = warehouseUpdownStockupArea.getNum() - num; + warehouseUpdownStockupArea.setNum(i); + if (i == 0){ + this.removeById(warehouseUpdownStockupArea.getId()); + }else { + this.updateById(warehouseUpdownStockupArea); + } + break; + default: + log.error(method+"type错误type:{}",type); + return false; + } + WarehouseUpdownStockupAreaLogEntity warehouseUpdownStockupAreaLogEntity = Func.copy(warehouseUpdownStockupArea, WarehouseUpdownStockupAreaLogEntity.class); + warehouseUpdownStockupAreaLogEntity.setNum(num); + warehouseUpdownStockupAreaLogEntity.setBindingType(2); + warehouseUpdownStockupAreaLogService.save(warehouseUpdownStockupAreaLogEntity); + return true; + } }