fix(wms):尺寸赋值修改
This commit is contained in:
+1
@@ -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);
|
||||
|
||||
+8
-2
@@ -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。
|
||||
*/
|
||||
private void applyForcedNullTotalMetrics(List<ReceiptMaterialDetail> receiptMaterialDetailList) {
|
||||
if (CollectionUtils.isEmpty(receiptMaterialDetailList)) {
|
||||
return;
|
||||
}
|
||||
// 列名组合 -> materialDetailId 列表(total_volume / total_area / 两者)
|
||||
// 列名组合 -> materialDetailId 列表(total_volume / total_area / dimensions / 任意组合)
|
||||
Map<String, List<Long>> columnsToIds = new HashMap<>();
|
||||
for (ReceiptMaterialDetail detail : receiptMaterialDetailList) {
|
||||
if (detail == null || detail.getMaterialDetailId() == null) {
|
||||
@@ -683,6 +683,12 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
|
||||
}
|
||||
columns.append("total_area");
|
||||
}
|
||||
if (detail.getDimensions() == null) {
|
||||
if (columns.length() > 0) {
|
||||
columns.append(",");
|
||||
}
|
||||
columns.append("dimensions");
|
||||
}
|
||||
if (columns.length() == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user