拣货数量
This commit is contained in:
+4
@@ -528,4 +528,8 @@ public class OutMaterialDetailDO extends BaseVOEntity {
|
|||||||
@ApiModelProperty("出库体积")
|
@ApiModelProperty("出库体积")
|
||||||
@Excel(name = "出库体积")
|
@Excel(name = "出库体积")
|
||||||
private BigDecimal outVolume;
|
private BigDecimal outVolume;
|
||||||
|
|
||||||
|
@ApiModelProperty("出库数量")
|
||||||
|
@Excel(name = "出库数量")
|
||||||
|
private BigDecimal outQuantity;
|
||||||
}
|
}
|
||||||
+3
-3
@@ -887,7 +887,7 @@ public class StockOutOrderDomainService {
|
|||||||
throw new RuntimeException("出库单明细不存在!");
|
throw new RuntimeException("出库单明细不存在!");
|
||||||
}
|
}
|
||||||
List<OutMaterialDetailDO> pickingMaterialDetailList = materialDetailList.stream()
|
List<OutMaterialDetailDO> pickingMaterialDetailList = materialDetailList.stream()
|
||||||
.filter(m -> m.getOutWeight() != null || m.getOutVolume() != null)
|
.filter(m -> m.getOutWeight() != null || m.getOutVolume() != null || m.getOutQuantity() != null)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
if (pickingMaterialDetailList != null && pickingMaterialDetailList.size() > 0) {
|
if (pickingMaterialDetailList != null && pickingMaterialDetailList.size() > 0) {
|
||||||
for (OutMaterialDetailDO outMaterialDetailDO : pickingMaterialDetailList) {
|
for (OutMaterialDetailDO outMaterialDetailDO : pickingMaterialDetailList) {
|
||||||
@@ -903,8 +903,8 @@ public class StockOutOrderDomainService {
|
|||||||
pickingMaterialDetail.setTotalGrossWeight(outVolume);
|
pickingMaterialDetail.setTotalGrossWeight(outVolume);
|
||||||
pickingMaterialDetail.setVolumeLimit(outVolume);
|
pickingMaterialDetail.setVolumeLimit(outVolume);
|
||||||
pickingMaterialDetail.setTotalVolume(outVolume);
|
pickingMaterialDetail.setTotalVolume(outVolume);
|
||||||
pickingMaterialDetail.setPickingQuantity(pickingMaterialDetail.getQuantity());
|
pickingMaterialDetail.setPickingQuantity(outMaterialDetailDO.getOutQuantity());
|
||||||
pickingMaterialDetail.setAlreadyPickingQuantity(pickingMaterialDetail.getQuantity());
|
pickingMaterialDetail.setAlreadyPickingQuantity(outMaterialDetailDO.getOutQuantity());
|
||||||
pickingMaterialDetailService.updateById(pickingMaterialDetail);
|
pickingMaterialDetailService.updateById(pickingMaterialDetail);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user