diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java index 48325915c..2e62c68fa 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java @@ -444,4 +444,8 @@ public class OutMaterialDetail extends BaseVOEntity { @ApiModelProperty("复核总面积(SQM)") @Excel(name = "复核总面积(SQM)") private BigDecimal checkArea; + + @ApiModelProperty("是否已分配") + @Excel(name = "是否已分配") + private String isAllocated; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 26cf0e4f5..fb841f5af 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -299,10 +299,14 @@ public class OutMaterialDetailImpl extends ServiceImpl { + outMaterialDetail.setIsAllocated("1"); + }); + saveOrUpdateBatch(outMaterialDetailList); return stockOutOrderPO; } @@ -416,10 +420,11 @@ public class OutMaterialDetailImpl extends ServiceImpl().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber)); for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) { BigDecimal alreadyAllocationQuantity = outMaterialDetail.getAlreadyAllocationQuantity(); - // 如果已经分配数量大于0,则跳过本次循环(该明细已分配过,不再重复处理) - /*if (alreadyAllocationQuantity != null && alreadyAllocationQuantity.compareTo(BigDecimal.ZERO) > 0) { + String isAllocated = outMaterialDetail.getIsAllocated(); + // 如果已经分配过,则跳过本次循环(该明细已分配过,不再重复处理) + if (isAllocated != null && "1".equals(isAllocated)) { continue; - }*/ + } Long materialInventoryId = outMaterialDetail.getMaterialInventoryId(); BigDecimal allocationQuantity = outMaterialDetail.getAllocationQuantity(); if (ObjectUtils.isEmpty(allocationQuantity)) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java index 5f0e3ee21..932903cf6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java @@ -462,4 +462,8 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO { @ApiModelProperty("复核总面积(SQM)") @Excel(name = "复核总面积(SQM)") private BigDecimal checkArea; + + @ApiModelProperty("是否已分配") + @Excel(name = "是否已分配") + private String isAllocated; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java index a67396c86..2b17ee536 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java @@ -420,4 +420,7 @@ public class OutMaterialDetailDO extends BaseVOEntity { @Excel(name = "复核总面积(SQM)") private BigDecimal checkArea; + @ApiModelProperty("是否已分配") + @Excel(name = "是否已分配") + private String isAllocated; } \ No newline at end of file