Merge remote-tracking branch 'origin/master'

wangfei

2025-02-17 59ad6aed9fc23a494e597eb1dfc30d46dbdd068c

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java

@@ -84,6 +84,7 @@
    public static final Integer GLASS_CACHE_TYPE_FINISH = 5;
    public static final Integer GLASS_CACHE_TYPE_OTHER = 6;
    public static final List<Integer> GLASS_CACHE_TYPE_OUT_ALL = Arrays.asList(2, 3);
    public static final List<Integer> GLASS_CACHE_TYPE_IN_ALL = Arrays.asList(1, 3);

    /**
     * 磨边任务玻璃状态
@@ -231,11 +232,13 @@

    /**
     * 原片仓储任务状态
     * 新建0
     * 已完成1
     * 新建 0
     * 运行中 1
     * 已完成2
     */
    public static final Integer ENGINEERING_NEW = 0;
    public static final Integer ENGINEERING_RUNNING = 1;
    public static final Integer ENGINEERING_SUCCESS = 2;

    /**
     * 原片仓储任务类型