diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java index e90b63607..1dd52dac3 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java @@ -2915,6 +2915,7 @@ public class StockReceiptOrderApplicationService { returnReceiptMaterialDetailDO.setTotalGrossWeight(receiptMaterialDetailDO.getTotalGrossWeight()); returnReceiptMaterialDetailDO.setTotalVolume(receiptMaterialDetailDO.getTotalVolume()); returnReceiptMaterialDetailDO.setTotalArea(receiptMaterialDetailDO.getTotalArea()); + returnReceiptMaterialDetailDO.setDimensions(receiptMaterialDetailDO.getDimensions()); BigDecimal parentRetAlreadyQty = receiptMaterialDetailDO.getAlreadyReceiptQuantity() != null ? receiptMaterialDetailDO.getAlreadyReceiptQuantity() : BigDecimal.ZERO; returnReceiptMaterialDetailDO.setAlreadyReceiptQuantity(parentRetAlreadyQty); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java index ae0bfd10f..78ad82483 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java @@ -660,14 +660,14 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl receiptMaterialDetailList) { if (CollectionUtils.isEmpty(receiptMaterialDetailList)) { return; } - // 列名组合 -> materialDetailId 列表(total_volume / total_area / 两者) + // 列名组合 -> materialDetailId 列表(total_volume / total_area / dimensions / 任意组合) Map> columnsToIds = new HashMap<>(); for (ReceiptMaterialDetail detail : receiptMaterialDetailList) { if (detail == null || detail.getMaterialDetailId() == null) { @@ -683,6 +683,12 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl 0) { + columns.append(","); + } + columns.append("dimensions"); + } if (columns.length() == 0) { continue; }