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

zss

8 天以前 461fcac5e3089c4ba48e6e43b6bb88a88a1070d8

 src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java

@@ -66,6 +66,19 @@
    @Schema(description = "需求数量")
    private BigDecimal demandedQuantity;

    @Schema(description = "补料总量")
    private BigDecimal  feedingQty;

    @Schema(description = "退料数量")
    private BigDecimal  returnQty;

    @Schema(description = "实际数量")
    private BigDecimal  actualQty;

    @Schema(description = "是否已退料")
    @TableField("is_returned")
    private Boolean returned;

    @Schema(description = "是否bom领料")
    @TableField("is_bom")
    private Boolean bom;