diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java index 7958e174b..137901031 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java @@ -86,4 +86,13 @@ public interface IWarehouseTrayGoodsClient { @GetMapping(GETTRAYLIST+"/getTrayNameByOrderPackageCode") String getTrayNameByOrderPackageCode(@RequestParam String orderCode,@RequestParam Integer type); + + /** + * 查询无数据托盘信息 + * @param marketId + * @param cargoNumber + * @return + */ + @GetMapping(GETTRAYLIST+"/getTrayInfoByInventory") + String getTrayInfoByInventory(@RequestParam Long marketId,@RequestParam String cargoNumber); } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java index 3469d0bc6..4f038d78d 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java @@ -93,4 +93,14 @@ public interface IWarehouseUpdownGoodsClient { */ @GetMapping(LOCATIONSTOCKLISTINFORMATION+"/getAllocationNameByOrderPackageCode") String getAllocationNameByOrderPackageCode(@RequestParam String orderPackageCode,@RequestParam Integer type); + + /** + * 查询无数据库存品库位信息 + * @param marketId + * @param cargoNumber + * @return + */ + @GetMapping(LOCATIONSTOCKLISTINFORMATION+"/getAllocationNameByInventory") + + String getAllocationNameByInventory(@RequestParam Long marketId,@RequestParam String cargoNumber); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupPackageListDetailExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupPackageListDetailExcel.java index deebb9f79..d7dbacb1f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupPackageListDetailExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupPackageListDetailExcel.java @@ -45,6 +45,10 @@ public class DistributionStockupPackageListDetailExcel { @ExcelProperty("产品名称") private String productName; + @ColumnWidth(20) + @ExcelProperty("物料编码") + private String cargoNumber; + @ColumnWidth(20) @ExcelProperty("备注") private String remarks; @@ -65,6 +69,9 @@ public class DistributionStockupPackageListDetailExcel { @ExcelIgnore private Integer isInventory; + @ExcelIgnore + private Long id; + @ExcelIgnore private String isZero; /** 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 8e37c9b1a..43a1145d8 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 @@ -1186,7 +1186,29 @@ 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 6ad5ec7d0..7b023604e 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 @@ -56,6 +56,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.CodeDesEnum; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.common.IsOrNoConstant; +import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant; import org.springblade.common.constant.pda.PdaAudioLingoStatus; import org.springblade.common.constant.stocklist.StockLockingStatusConstant; @@ -3137,6 +3138,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl exportStockUptDetail(List list) { + List detail = new ArrayList<>(); + + List stockupPackageListDetailExcels = baseMapper.exportStockUptOrderDetail(list); if (Func.isNotEmpty(stockupPackageListDetailExcels)){ for (DistributionStockupPackageListDetailExcel stockupPackageListDetailExcel : stockupPackageListDetailExcels) { @@ -3162,14 +3166,51 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl stockupInventoryListDetailExcels = baseMapper.exportStockUptInventoryDetail(list); + List stockupInventoryListDetailExcels = baseMapper.exportStockUptInventoryDetail(list); + if (Func.isNotEmpty(stockupInventoryListDetailExcels)){ + for (DistributionStockupPackageListDetailExcel stockupInventoryListDetailExcel : stockupInventoryListDetailExcels) { + //查询库存品托盘信息 + DistributionStockListEntity distributionStockLisEntity = distributionStockListMapper.selectById(stockupInventoryListDetailExcel.getId()); + if (distributionStockLisEntity.getSourceType().equals("1")){ + //转 + List parcelListEntities = distributionParcelListService.list(Wrappers.query().lambda() + .eq(DistributionParcelListEntity::getOrderCode, distributionStockLisEntity.getIncomingBatch()) + .eq(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.daibeihuo.getValue()) + .eq(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiruku.getValue()) + ); + if (Func.isNotEmpty(parcelListEntities)){ + String orderpackageCode = parcelListEntities.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(",")); + //订制品订单 查询托盘和库位 + String trayName = warehouseTrayGoodsClient.getTrayNameByOrderPackageCode(orderpackageCode,3); + if (Func.isNotBlank(trayName)){ + stockupInventoryListDetailExcel.setTrayNames(trayName); + } + String allocationName = warehouseUpdownGoodsClient.getAllocationNameByOrderPackageCode(orderpackageCode,3); + if (Func.isNotBlank(allocationName)){ + stockupInventoryListDetailExcel.setAllocationNames(allocationName); + } + } + }else { + //导 + String trayName = warehouseTrayGoodsClient.getTrayInfoByInventory(distributionStockLisEntity.getMarketId(),distributionStockLisEntity.getCargoNumber()); + if (Func.isNotBlank(trayName)){ + stockupInventoryListDetailExcel.setTrayNames(trayName); + } + String allocationName = warehouseUpdownGoodsClient.getAllocationNameByInventory(distributionStockLisEntity.getMarketId(),distributionStockLisEntity.getCargoNumber()); + if (Func.isNotBlank(allocationName)){ + stockupInventoryListDetailExcel.setAllocationNames(allocationName); + } + } + } - return stockupPackageListDetailExcels; + detail.addAll(stockupInventoryListDetailExcels); + } + return detail; } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java index 8bf1695ad..7ffa4183b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java @@ -84,4 +84,9 @@ public class WarehouseTrayGoodsClient implements IWarehouseTrayGoodsClient { return warehouseTrayGoodsService.getTrayNameByOrderPackageCode(orderCode,type); } + + @Override + public String getTrayInfoByInventory(Long marketId, String cargoNumber) { + return warehouseTrayGoodsService.getTrayInfoByInventory(marketId,cargoNumber); + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java index 2065e0b5d..4856afb2c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java @@ -96,4 +96,9 @@ public class WarehouseUpdownGoodsClient implements IWarehouseUpdownGoodsClient { public String getAllocationNameByOrderPackageCode(String orderPackageCode,Integer type) { return warehouseUpdownGoodsService.getAllocationNameByOrderPackageCode(orderPackageCode,type); } + + @Override + public String getAllocationNameByInventory(Long marketId, String cargoNumber) { + return warehouseUpdownGoodsService.getAllocationNameByInventory(marketId, cargoNumber); + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java index 42926ee8d..99ddf89df 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java @@ -66,4 +66,12 @@ public interface WarehouseTrayGoodsMapper extends BaseMapper + update logpm_warehouse_tray_goods diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java index 145c194ab..1c0f43e26 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java @@ -110,6 +110,14 @@ public interface WarehouseUpdownGoodsMapper extends BaseMapper + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java index b1e31df7d..17f33e2f8 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java @@ -92,4 +92,12 @@ public interface IWarehouseTrayGoodsService extends BaseService().lambda() diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java index 56ecd5310..8305eaac2 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java @@ -236,4 +236,9 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl