diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index cf7755904..b4b3bd9d1 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -541,53 +541,56 @@ public class StockOutOrderDomainService { List pickingMaterialDetailList = new ArrayList<>(); if (!CollectionUtils.isEmpty(outMaterialDetailPOS)){ outMaterialDetailPOS.forEach(outMaterialDetailPO -> { - PickingMaterialDetailDO pickingMaterialDetailDO = new PickingMaterialDetailDO(); - BeanUtils.copyProperties(outMaterialDetailPO, pickingMaterialDetailDO); - pickingMaterialDetailDO.setPickingOrderNumber(pickingOrderDO.getPickingOrderNumber()); - pickingMaterialDetailDO.setQuantity(outMaterialDetailPO.getAllocationQuantity()); - //设置出库明细关联id - pickingMaterialDetailDO.setOutUniqueId(outMaterialDetailPO.getUniqueId()); - pickingMaterialDetailDO.setMaterialCode(outMaterialDetailPO.getMaterialNo()); - pickingMaterialDetailDO.setMaterialName(outMaterialDetailPO.getCommodityName()); - pickingMaterialDetailDO.setBarCode(outMaterialDetailPO.getBarCode()); - //设置批次属性字段(从出库单明细中获取) - pickingMaterialDetailDO.setBatchRefNo(outMaterialDetailPO.getBatchRefNo()); - pickingMaterialDetailDO.setSheetRefNo(outMaterialDetailPO.getSheetRefNo()); - pickingMaterialDetailDO.setBoxPalletNo(outMaterialDetailPO.getBoxPalletNo()); - pickingMaterialDetailDO.setExtAttr1(outMaterialDetailPO.getExtAttr1()); - pickingMaterialDetailDO.setExtAttr2(outMaterialDetailPO.getExtAttr2()); - pickingMaterialDetailDO.setProductionDate(outMaterialDetailPO.getProductionDate()); - pickingMaterialDetailDO.setExpiryDate(outMaterialDetailPO.getExpiryDate()); - pickingMaterialDetailDO.setInventoryDate(outMaterialDetailPO.getInventoryDate()); - pickingMaterialDetailDO.setExtAttr3(outMaterialDetailPO.getExtAttr3()); - pickingMaterialDetailDO.setExtAttr4(outMaterialDetailPO.getExtAttr4()); - pickingMaterialDetailList.add(pickingMaterialDetailDO); - List outMaterialDetailPOListChildren = outMaterialDetailPO.getChildren(); - if (!CollectionUtils.isEmpty(outMaterialDetailPOListChildren)){ - outMaterialDetailPOListChildren.forEach(outMaterialDetailPOChildren -> { - PickingMaterialDetailDO pickingMaterialDetailDOChildren = new PickingMaterialDetailDO(); - BeanUtils.copyProperties(pickingMaterialDetailDO, pickingMaterialDetailDOChildren); - BeanUtils.copyProperties(outMaterialDetailPOChildren, pickingMaterialDetailDOChildren); - pickingMaterialDetailDOChildren.setPickingOrderNumber(pickingOrderDO.getPickingOrderNumber()); - pickingMaterialDetailDOChildren.setQuantity(outMaterialDetailPOChildren.getAllocationQuantity()); - //设置出库明细关联id - pickingMaterialDetailDOChildren.setOutUniqueId(outMaterialDetailPOChildren.getUniqueId()); - pickingMaterialDetailDOChildren.setMaterialCode(outMaterialDetailPOChildren.getMaterialNo()); - pickingMaterialDetailDOChildren.setMaterialName(outMaterialDetailPOChildren.getCommodityName()); - pickingMaterialDetailDOChildren.setBarCode(outMaterialDetailPOChildren.getBarCode()); - //设置批次属性字段(从出库单明细中获取) - pickingMaterialDetailDOChildren.setBatchRefNo(outMaterialDetailPOChildren.getBatchRefNo()); - pickingMaterialDetailDOChildren.setSheetRefNo(outMaterialDetailPOChildren.getSheetRefNo()); - pickingMaterialDetailDOChildren.setBoxPalletNo(outMaterialDetailPOChildren.getBoxPalletNo()); - pickingMaterialDetailDOChildren.setExtAttr1(outMaterialDetailPOChildren.getExtAttr1()); - pickingMaterialDetailDOChildren.setExtAttr2(outMaterialDetailPOChildren.getExtAttr2()); - pickingMaterialDetailDOChildren.setProductionDate(outMaterialDetailPOChildren.getProductionDate()); - pickingMaterialDetailDOChildren.setExpiryDate(outMaterialDetailPOChildren.getExpiryDate()); - pickingMaterialDetailDOChildren.setInventoryDate(outMaterialDetailPOChildren.getInventoryDate()); - pickingMaterialDetailDOChildren.setExtAttr3(outMaterialDetailPOChildren.getExtAttr3()); - pickingMaterialDetailDOChildren.setExtAttr4(outMaterialDetailPOChildren.getExtAttr4()); - pickingMaterialDetailList.add(pickingMaterialDetailDOChildren); - }); + BigDecimal allocationQuantity = outMaterialDetailPO.getAllocationQuantity(); + if (allocationQuantity != null && allocationQuantity.compareTo(BigDecimal.ZERO) > 0) { + PickingMaterialDetailDO pickingMaterialDetailDO = new PickingMaterialDetailDO(); + BeanUtils.copyProperties(outMaterialDetailPO, pickingMaterialDetailDO); + pickingMaterialDetailDO.setPickingOrderNumber(pickingOrderDO.getPickingOrderNumber()); + pickingMaterialDetailDO.setQuantity(outMaterialDetailPO.getAllocationQuantity()); + //设置出库明细关联id + pickingMaterialDetailDO.setOutUniqueId(outMaterialDetailPO.getUniqueId()); + pickingMaterialDetailDO.setMaterialCode(outMaterialDetailPO.getMaterialNo()); + pickingMaterialDetailDO.setMaterialName(outMaterialDetailPO.getCommodityName()); + pickingMaterialDetailDO.setBarCode(outMaterialDetailPO.getBarCode()); + //设置批次属性字段(从出库单明细中获取) + pickingMaterialDetailDO.setBatchRefNo(outMaterialDetailPO.getBatchRefNo()); + pickingMaterialDetailDO.setSheetRefNo(outMaterialDetailPO.getSheetRefNo()); + pickingMaterialDetailDO.setBoxPalletNo(outMaterialDetailPO.getBoxPalletNo()); + pickingMaterialDetailDO.setExtAttr1(outMaterialDetailPO.getExtAttr1()); + pickingMaterialDetailDO.setExtAttr2(outMaterialDetailPO.getExtAttr2()); + pickingMaterialDetailDO.setProductionDate(outMaterialDetailPO.getProductionDate()); + pickingMaterialDetailDO.setExpiryDate(outMaterialDetailPO.getExpiryDate()); + pickingMaterialDetailDO.setInventoryDate(outMaterialDetailPO.getInventoryDate()); + pickingMaterialDetailDO.setExtAttr3(outMaterialDetailPO.getExtAttr3()); + pickingMaterialDetailDO.setExtAttr4(outMaterialDetailPO.getExtAttr4()); + pickingMaterialDetailList.add(pickingMaterialDetailDO); + List outMaterialDetailPOListChildren = outMaterialDetailPO.getChildren(); + if (!CollectionUtils.isEmpty(outMaterialDetailPOListChildren)){ + outMaterialDetailPOListChildren.forEach(outMaterialDetailPOChildren -> { + PickingMaterialDetailDO pickingMaterialDetailDOChildren = new PickingMaterialDetailDO(); + BeanUtils.copyProperties(pickingMaterialDetailDO, pickingMaterialDetailDOChildren); + BeanUtils.copyProperties(outMaterialDetailPOChildren, pickingMaterialDetailDOChildren); + pickingMaterialDetailDOChildren.setPickingOrderNumber(pickingOrderDO.getPickingOrderNumber()); + pickingMaterialDetailDOChildren.setQuantity(outMaterialDetailPOChildren.getAllocationQuantity()); + //设置出库明细关联id + pickingMaterialDetailDOChildren.setOutUniqueId(outMaterialDetailPOChildren.getUniqueId()); + pickingMaterialDetailDOChildren.setMaterialCode(outMaterialDetailPOChildren.getMaterialNo()); + pickingMaterialDetailDOChildren.setMaterialName(outMaterialDetailPOChildren.getCommodityName()); + pickingMaterialDetailDOChildren.setBarCode(outMaterialDetailPOChildren.getBarCode()); + //设置批次属性字段(从出库单明细中获取) + pickingMaterialDetailDOChildren.setBatchRefNo(outMaterialDetailPOChildren.getBatchRefNo()); + pickingMaterialDetailDOChildren.setSheetRefNo(outMaterialDetailPOChildren.getSheetRefNo()); + pickingMaterialDetailDOChildren.setBoxPalletNo(outMaterialDetailPOChildren.getBoxPalletNo()); + pickingMaterialDetailDOChildren.setExtAttr1(outMaterialDetailPOChildren.getExtAttr1()); + pickingMaterialDetailDOChildren.setExtAttr2(outMaterialDetailPOChildren.getExtAttr2()); + pickingMaterialDetailDOChildren.setProductionDate(outMaterialDetailPOChildren.getProductionDate()); + pickingMaterialDetailDOChildren.setExpiryDate(outMaterialDetailPOChildren.getExpiryDate()); + pickingMaterialDetailDOChildren.setInventoryDate(outMaterialDetailPOChildren.getInventoryDate()); + pickingMaterialDetailDOChildren.setExtAttr3(outMaterialDetailPOChildren.getExtAttr3()); + pickingMaterialDetailDOChildren.setExtAttr4(outMaterialDetailPOChildren.getExtAttr4()); + pickingMaterialDetailList.add(pickingMaterialDetailDOChildren); + }); + } } }); pickingOrderDO.setMaterialDetailList(pickingMaterialDetailList);