Merge remote-tracking branch 'origin/dev' into dev

mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/po/InvestigationManagePO.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -155,4 +156,13 @@ public class InvestigationManagePO extends BaseVOEntity {
 
     @ApiModelProperty("按物料盘点详情")
     private List<InvestigetionMaterialPO> investigetionMaterialList;
+
+    @ApiModelProperty("盘点单库存总数量")
+    private BigDecimal totalInventoryQuantity;
+
+    @ApiModelProperty("已盘点状态的库存数量")
+    private BigDecimal investigatedInventoryQuantity;
+
+    @ApiModelProperty("盘点进度=已盘点状态的库存数量/盘点单库存总数量")
+    private BigDecimal investigationProgress;
 }