diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java index 8bcf0ba28..5ebedd8a5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java @@ -226,6 +226,7 @@ public class ReviewOrderDomainService { if (pending == null) { pending = BigDecimal.ZERO; } + d.setMaterialPlanQty(pending); d.setPendingReviewQty(pending); d.setReviewedQty(BigDecimal.ZERO); d.setCancelQty(BigDecimal.ZERO); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewMaterialDetail.java index b7ed7fb08..6430dbcb6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewMaterialDetail.java @@ -52,6 +52,9 @@ public class ReviewMaterialDetail extends BaseVOEntity { private BigDecimal cancelQty; + @ApiModelProperty("物料计划数量(拣货明细实际拣货数量快照,复核过程不修改)") + private BigDecimal materialPlanQty; + private String receiptOrderNumber; private String lotNo; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewMaterialDetailPO.java index 2cbf250bc..8eb89e324 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewMaterialDetailPO.java @@ -64,6 +64,9 @@ public class ReviewMaterialDetailPO extends BaseVOEntity { @ApiModelProperty("取消复核数量") private BigDecimal cancelQty; + @ApiModelProperty("物料计划数量(拣货实际拣货数量,生成复核明细时落库)") + private BigDecimal materialPlanQty; + @ApiModelProperty("入库单号") private String receiptOrderNumber; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewOrderPO.java index b463a38d9..6317e37ea 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewOrderPO.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -84,6 +85,15 @@ public class ReviewOrderPO extends BaseVOEntity { @ApiModelProperty("备注") private String remark; + @ApiModelProperty("物料种类(明细中不重复的物料基础信息数量)") + private Integer materialKindCount; + + @ApiModelProperty("物料总数量(各明细计划数量合计,计划量=待复核+已复核,来源于拣货数量)") + private BigDecimal totalPlanQty; + + @ApiModelProperty("复核总数量(各明细已复核数量合计)") + private BigDecimal totalReviewedQty; + /** 详情与上架单一致:头字段扁平 + 明细列表 */ @ApiModelProperty("复核明细") private List materialDetailList; diff --git a/mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml b/mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml index 258829902..934daca48 100644 --- a/mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml @@ -32,6 +32,9 @@ + + + @@ -50,6 +53,7 @@ + @@ -168,12 +172,25 @@ - +