Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

buhuazhen

2026-05-09 7496e718f10286651b9e2d08a8b8548cd3b242b6

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

@@ -74,6 +74,15 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate planCompleteTime;

    @Schema(description = "状态（1.待开始 2.进行中 3.已完成 4.已取消）")
    @Schema(description = "状态（1.待开始 2.进行中 3.已完成 4.已取消 5.已结束）")
    private Integer status;

    @Schema(description = "是否结束）")
    @TableField("is_end_order")
    private Boolean endOrder;


    @TableField("workshop_id")
    @Schema(description = "车间id")
    private Long workshopId;
}