~zhoushihao/YiWuProject.git

			@@ -57,13 +57,22 @@
			public static final List<Integer> GLASS_STATE_IN_ALL_ZERO = Arrays.asList(0, 100, 102, 103, 104);

			/**
			* 卧式理片笼详情表玻璃状态
			* 进片任务1
			* 出片任务2
			* 卧离任务类型
			* 空任务 0
			* 进片任务 1
			* 出片任务 2
			* 直通任务 3
			* 进行中 4
			* 结束 5
			* 其他 6
			*/
			public static final Integer GLASS_CACHE_TYPE_EMPTY = 0;
			public static final Integer GLASS_CACHE_TYPE_IN = 1;
			public static final Integer GLASS_CACHE_TYPE_OUT = 2;
			public static final Integer GLASS_CACHE_TYPE_THROUGH = 3;
			public static final Integer GLASS_CACHE_TYPE_RUNNING = 4;
			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);

			/**
			@@ -76,7 +85,7 @@
			public static final Integer EDG_GLASS_SUCCESS = 2;

			/**
			* 磨边任务玻璃状态
			* 大理片笼状态
			* 1单机自动状态
			* 2联机自动状态
			* 3手动状态
			@@ -84,6 +93,18 @@
			public static final Integer BIG_STORAGE_STAND_ALONE = 1;
			public static final Integer BIG_STORAGE_ONLINE = 2;
			public static final Integer BIG_STORAGE_MT = 3;

			/**
			* 大理片笼任务类型
			* 1、钢化前进片
			* 2、钢化前出片
			* 3、钢化后进片
			* 4、钢化后出片
			*/
			public static final Integer BIG_STORAGE_BEFORE_IN = 1;
			public static final Integer BIG_STORAGE_BEFORE_OUT = 2;
			public static final Integer BIG_STORAGE_AFTER_IN = 3;
			public static final Integer BIG_STORAGE_AFTER_OUT = 4;

			/**
			* 大理片笼请求
			@@ -185,6 +206,9 @@
			* 原片仓储任务类型
			* 进片任务1
			* 出片任务2
			* 调度任务3
			* 进片请求4
			* 出片请求5
			*/
			public static final Integer RAW_GLASS_TASK_TYPE_IN = 1;
			public static final Integer RAW_GLASS_TASK_TYPE_OUT = 2;
			@@ -193,9 +217,9 @@
			public static final Integer RAW_GLASS_TASK_TYPE_OUT_REQUEST = 5;

			/**
			* 原片仓储任务类型
			* 进片任务1
			* 出片任务2
			* 原片仓储任务状态
			* 新建0
			* 已完成1
			*/
			public static final Integer ENGINEERING_NEW = 0;
			public static final Integer ENGINEERING_RUNNING = 1;
			@@ -224,5 +248,20 @@
			*/
			public static final List<Integer> RAW_GLASS_DEVICE = Arrays.asList(1, 2, 3);

			/**
			* 原片上片状态
			* 0 新增
			* 100 已完成
			*/
			public static final Integer LOAD_RAW_GLASS_NEW = 0;
			public static final Integer LOAD_RAW_GLASS_SUCCESS = 100;

			/**
			* 大理片笼任务启动信号
			* 0 空任务
			* 1 启动
			*/
			public static final Integer BIG_STORAGE_TASK_EMPTY = 0;
			public static final Integer BIG_STORAGE_TASK_RUNNING = 1;

			}