From 318e6f9de2a419e5d42568eafba0ee0132739c94 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 26 Sep 2023 09:13:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=E5=86=85=E4=BD=9C=E4=B8=9A=EF=BC=8C?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionParcelListMapper.java | 2 +- .../impl/WarehouseUpdownTypeServiceImpl.java | 28 +++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index dd4850544..f5149bada 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -96,7 +96,7 @@ public interface DistributionParcelListMapper extends BaseMapper selectOrderInfoAllocationList(@Param("param") StockupDTO stockupDTO); - List findALLNoUpShelfPackageByOrderCode(@Param("orderCode") String orderCode,@Param("orderCode") Long warehouseId); + List findALLNoUpShelfPackageByOrderCode(@Param("orderCode") String orderCode,@Param("warehouseId") Long warehouseId); IPage pageOweList(IPage page,@Param("param") DistributionParcelListDTO parcelListEntity); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 8cb5d1d6f..445def0c3 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -1881,23 +1881,29 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl newList = new ArrayList<>(); + for(WarehouseUpdownGoodsEntity updownGoodsEntity:list){ + WarehouseUpdownGoodsEntity newUpdownGoods = new WarehouseUpdownGoodsEntity(); + BeanUtil.copy(updownGoodsEntity,newUpdownGoods); + newUpdownGoods.setId(null); + newUpdownGoods.setUpdownTypeId(targetUpdownTypeEntity.getId()); + newUpdownGoods.setAreaId(goodsAreaId); + newUpdownGoods.setAreaTitle(goodsAreaEntity.getHeadline()); + newUpdownGoods.setShelfId(goodsShelfId); + newUpdownGoods.setShelfTitle(goodsShelfEntity.getGoodsShelfName()); + newUpdownGoods.setAllocationId(allocationId); + newUpdownGoods.setAllocationTitle(goodsAllocationEntity.getGoodsAllocationName()); + newUpdownGoods.setPositionCode(goodsAreaEntity.getHeadline()+"-"+goodsShelfEntity.getGoodsShelfName()+"-"+goodsAllocationEntity.getGoodsAllocationName()); + newList.add(newUpdownGoods); } //货物重新绑定 - warehouseUpdownGoodsService.saveOrUpdateBatch(list); + warehouseUpdownGoodsService.saveOrUpdateBatch(newList); - saveUpdownGoodsLog(list,"1",0,"移库:整库移库",targetUpdownTypeEntity.getWarehouseId()); + saveUpdownGoodsLog(newList,"1",0,"移库:整库移库上架",targetUpdownTypeEntity.getWarehouseId()); }