Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
+4
@@ -571,6 +571,10 @@ public class PickingOrderApplicationService {
|
|||||||
PickingMaterialDetailDO returnPickingMaterialDetailDO = new PickingMaterialDetailDO();
|
PickingMaterialDetailDO returnPickingMaterialDetailDO = new PickingMaterialDetailDO();
|
||||||
BeanUtils.copyProperties(pickingMaterialDetailPO, returnPickingMaterialDetailDO);
|
BeanUtils.copyProperties(pickingMaterialDetailPO, returnPickingMaterialDetailDO);
|
||||||
returnPickingMaterialDetailDO.setActualQuantity(pickingMaterialDetailDO.getActualQuantity());
|
returnPickingMaterialDetailDO.setActualQuantity(pickingMaterialDetailDO.getActualQuantity());
|
||||||
|
returnPickingMaterialDetailDO.setTotalArea(pickingMaterialDetailDO.getTotalArea());
|
||||||
|
returnPickingMaterialDetailDO.setTotalVolume(pickingMaterialDetailDO.getTotalVolume());
|
||||||
|
returnPickingMaterialDetailDO.setTotalGrossWeight(pickingMaterialDetailDO.getTotalGrossWeight());
|
||||||
|
returnPickingMaterialDetailDO.setTotalNetWeight(pickingMaterialDetailDO.getTotalNetWeight());
|
||||||
//是否开启了序列号管理
|
//是否开启了序列号管理
|
||||||
if (pickingMaterialDetailPO.getSerialNumberManage() == 1){
|
if (pickingMaterialDetailPO.getSerialNumberManage() == 1){
|
||||||
if (CollectionUtils.isEmpty(pickingMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
if (CollectionUtils.isEmpty(pickingMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||||
|
|||||||
Reference in New Issue
Block a user