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

gongchunyi

2026-04-13 f4d6d9d7ae1d0f1af6937dd7a2761056e46611c2

 src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java

@@ -23,9 +23,22 @@
    @ApiModelProperty(value = "销售产品ID")
    private Long salesLedgerProductId;

    @ApiModelProperty(value = "生产总量(单位kg)")
    private BigDecimal totalProduction;

    @ApiModelProperty(value = "销售台账ID")
    private Long salesLedgerId;

    /**
     * 生产炒机
     */
    @Excel(name = "生产炒机")
    private String speculativeTradingName;

    @ApiModelProperty(value = "产线")
    @Excel(name = "产线")
    private String productionLine;

    @ApiModelProperty(value = "开始时间")
    private String entryDateStart;