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

zss

2026-04-25 a1a7bb5093d30397078ce42ef025cd07378d1e1c

 src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java

@@ -43,31 +43,37 @@

    @Schema(description = "顶部父产品id")
    private Long topParentProductId;
    

    @Schema(description = "库存类型：qualified(合格)、unqualified(不合格)")
    private String stockType;
    

    @Schema(description = "合格库存数量")
    private BigDecimal qualifiedQuantity;
    

    @Schema(description = "不合格库存数量")
    private BigDecimal unQualifiedQuantity;
    

    @Schema(description = "合格库存冻结数量")
    private BigDecimal qualifiedLockedQuantity;
    

    @Schema(description = "不合格库存冻结数量")
    private BigDecimal unQualifiedLockedQuantity;
    

    @Schema(description = "合格库存未冻结数量")
    private BigDecimal qualifiedUnLockedQuantity;
    

    @Schema(description = "不合格库存未冻结数量")
    private BigDecimal unQualifiedUnLockedQuantity;
    

    @Schema(description = "合格库存待审核出库数量（不占用库存但已申请出库）")
    private BigDecimal qualifiedPendingOutQuantity;

    @Schema(description = "不合格库存待审核出库数量")
    private BigDecimal unQualifiedPendingOutQuantity;

    @Schema(description = "合格库存ID")
    private Long qualifiedId;
    

    @Schema(description = "不合格库存ID")
    private Long unQualifiedId;
}
}