拣货尺寸修改修改
This commit is contained in:
+5
@@ -620,6 +620,11 @@ public class PickingOrderApplicationService {
|
|||||||
BeanUtils.copyProperties(pickingMaterialDetailPO, returnPickingMaterialDetailDO);
|
BeanUtils.copyProperties(pickingMaterialDetailPO, returnPickingMaterialDetailDO);
|
||||||
returnPickingMaterialDetailDO.setActualQuantity(pickingMaterialDetailDO.getActualQuantity());
|
returnPickingMaterialDetailDO.setActualQuantity(pickingMaterialDetailDO.getActualQuantity());
|
||||||
|
|
||||||
|
// 尺寸:优先使用前端传递的值(允许拣货确认时修改);否则沿用数据库值
|
||||||
|
if (StringUtils.isNotBlank(pickingMaterialDetailDO.getSize())) {
|
||||||
|
returnPickingMaterialDetailDO.setSize(pickingMaterialDetailDO.getSize());
|
||||||
|
}
|
||||||
|
|
||||||
// 毛重、净重、面积、体积:如果前端传递了值,使用前端传递的值(允许修改);否则从出库单明细中自动带出
|
// 毛重、净重、面积、体积:如果前端传递了值,使用前端传递的值(允许修改);否则从出库单明细中自动带出
|
||||||
Long outUniqueId = pickingMaterialDetailPO.getOutUniqueId();
|
Long outUniqueId = pickingMaterialDetailPO.getOutUniqueId();
|
||||||
OutMaterialDetail outMaterialDetail = null;
|
OutMaterialDetail outMaterialDetail = null;
|
||||||
|
|||||||
+2
@@ -272,9 +272,11 @@ public class PickingMaterialDetail extends BaseVOEntity {
|
|||||||
|
|
||||||
@ApiModelProperty("装卸费")
|
@ApiModelProperty("装卸费")
|
||||||
@Excel(name = "装卸费")
|
@Excel(name = "装卸费")
|
||||||
|
@TableField(exist = false)
|
||||||
private BigDecimal loadUnloadFee;
|
private BigDecimal loadUnloadFee;
|
||||||
|
|
||||||
@ApiModelProperty("贴标费")
|
@ApiModelProperty("贴标费")
|
||||||
@Excel(name = "贴标费")
|
@Excel(name = "贴标费")
|
||||||
|
@TableField(exist = false)
|
||||||
private BigDecimal stickerFee;
|
private BigDecimal stickerFee;
|
||||||
}
|
}
|
||||||
+4
@@ -165,6 +165,10 @@ public class PickingMaterialDetailImpl extends ServiceImpl<PickingMaterialDetail
|
|||||||
pickingMaterialDetail.setTotalGrossWeight(pickingMaterialDetailDO.getTotalGrossWeight());
|
pickingMaterialDetail.setTotalGrossWeight(pickingMaterialDetailDO.getTotalGrossWeight());
|
||||||
pickingMaterialDetail.setUnitCode(pickingMaterialDetailDO.getUnitCode());
|
pickingMaterialDetail.setUnitCode(pickingMaterialDetailDO.getUnitCode());
|
||||||
pickingMaterialDetail.setUnitName(pickingMaterialDetailDO.getUnitName());
|
pickingMaterialDetail.setUnitName(pickingMaterialDetailDO.getUnitName());
|
||||||
|
// 尺寸字段(SIZE):拣货确认时允许同步更新
|
||||||
|
if (pickingMaterialDetailDO.getSize() != null) {
|
||||||
|
pickingMaterialDetail.setSize(pickingMaterialDetailDO.getSize());
|
||||||
|
}
|
||||||
pickingMaterialDetail.setLoadUnloadFee(pickingMaterialDetailDO.getLoadUnloadFee());
|
pickingMaterialDetail.setLoadUnloadFee(pickingMaterialDetailDO.getLoadUnloadFee());
|
||||||
pickingMaterialDetail.setStickerFee(pickingMaterialDetailDO.getStickerFee());
|
pickingMaterialDetail.setStickerFee(pickingMaterialDetailDO.getStickerFee());
|
||||||
BigDecimal actualQuantity = pickingMaterialDetailDO.getActualQuantity();
|
BigDecimal actualQuantity = pickingMaterialDetailDO.getActualQuantity();
|
||||||
|
|||||||
Reference in New Issue
Block a user