Merge branch 'dev_New_pro' into dev_pro_河南鹤壁

gongchunyi

2026-05-15 1debc99339176e80b3baaf72b55032d191e99f6f

 src/main/java/com/ruoyi/production/bean/dto/ProductionOrderPickDto.java

@@ -33,6 +33,12 @@
    @Schema(description = "备注")
    private String remark;

    @Schema(description = "补料原因")
    private String feedingReason;

    @Schema(description = "本次补料数量")
    private BigDecimal feedingQuantity;

    @Schema(description = "领料明细列表")
    @JsonAlias({"dto", "productionOrderPickDto"})
    private List<ProductionOrderPickDto> pickList;