weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(wms):尺寸赋值修改

Browse Source
This commit is contained in:
zhaoqing
2026-08-13 18:08:49 +08:00
parent 3240e57c3e
commit c80e4b3ca3
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
+1
View File
@@ -2915,6 +2915,7 @@ public class StockReceiptOrderApplicationService {
returnReceiptMaterialDetailDO.setTotalGrossWeight(receiptMaterialDetailDO.getTotalGrossWeight()); returnReceiptMaterialDetailDO.setTotalGrossWeight(receiptMaterialDetailDO.getTotalGrossWeight());
returnReceiptMaterialDetailDO.setTotalVolume(receiptMaterialDetailDO.getTotalVolume()); returnReceiptMaterialDetailDO.setTotalVolume(receiptMaterialDetailDO.getTotalVolume());
returnReceiptMaterialDetailDO.setTotalArea(receiptMaterialDetailDO.getTotalArea()); returnReceiptMaterialDetailDO.setTotalArea(receiptMaterialDetailDO.getTotalArea());
returnReceiptMaterialDetailDO.setDimensions(receiptMaterialDetailDO.getDimensions());
BigDecimal parentRetAlreadyQty = receiptMaterialDetailDO.getAlreadyReceiptQuantity() != null BigDecimal parentRetAlreadyQty = receiptMaterialDetailDO.getAlreadyReceiptQuantity() != null
? receiptMaterialDetailDO.getAlreadyReceiptQuantity() : BigDecimal.ZERO; ? receiptMaterialDetailDO.getAlreadyReceiptQuantity() : BigDecimal.ZERO;
returnReceiptMaterialDetailDO.setAlreadyReceiptQuantity(parentRetAlreadyQty); returnReceiptMaterialDetailDO.setAlreadyReceiptQuantity(parentRetAlreadyQty);
mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java
+8 -2
View File
@@ -660,14 +660,14 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
} }
/** /**
* total_volume / total_area 为空时强制 UPDATE 置 NULL。 * total_volume / total_area / dimensions 为空时强制 UPDATE 置 NULL。
* 仅对已存在明细（material_detail_id 非空）生效；新插入行由实体空值自然得到 null。 * 仅对已存在明细（material_detail_id 非空）生效；新插入行由实体空值自然得到 null。
*/ */
private void applyForcedNullTotalMetrics(List<ReceiptMaterialDetail> receiptMaterialDetailList) { private void applyForcedNullTotalMetrics(List<ReceiptMaterialDetail> receiptMaterialDetailList) {
if (CollectionUtils.isEmpty(receiptMaterialDetailList)) { if (CollectionUtils.isEmpty(receiptMaterialDetailList)) {
return; return;
} }
// 列名组合 -> materialDetailId 列表（total_volume / total_area / 两者） // 列名组合 -> materialDetailId 列表（total_volume / total_area / dimensions / 任意组合）
Map<String, List<Long>> columnsToIds = new HashMap<>(); Map<String, List<Long>> columnsToIds = new HashMap<>();
for (ReceiptMaterialDetail detail : receiptMaterialDetailList) { for (ReceiptMaterialDetail detail : receiptMaterialDetailList) {
if (detail == null || detail.getMaterialDetailId() == null) { if (detail == null || detail.getMaterialDetailId() == null) {
@@ -683,6 +683,12 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
} }
columns.append("total_area"); columns.append("total_area");
} }
if (detail.getDimensions() == null) {
if (columns.length() > 0) {
columns.append(",");
}
columns.append("dimensions");
}
if (columns.length() == 0) { if (columns.length() == 0) {
continue; continue;
} }