|
@@ -63,7 +63,11 @@ public class SaveConstans {
|
|
|
*/
|
|
|
put("0001S31000000000J0TR", "BC");
|
|
|
}};
|
|
|
+ public static final List<String> MERGE_PRODUCE_PROCESS = new ArrayList<>();
|
|
|
|
|
|
+ static {
|
|
|
+ MERGE_PRODUCE_PROCESS.add("");
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 问卷调查状态
|
|
@@ -200,6 +204,10 @@ public class SaveConstans {
|
|
|
* 安全观察指标提醒
|
|
|
*/
|
|
|
public static final String OBSERVATION_AUDIT = "observation";
|
|
|
+ /**
|
|
|
+ * 安全附件
|
|
|
+ */
|
|
|
+ public static final String SAFETY_ATTACHMENT_VERIFICATION = "safeAttachments";
|
|
|
}
|
|
|
|
|
|
public static class NotifyTitle {
|
|
@@ -320,15 +328,19 @@ public class SaveConstans {
|
|
|
/**
|
|
|
* 特种设备提醒
|
|
|
*/
|
|
|
- public static final String SPECIALEQUIPMENT_TITLE="特种设备提醒";
|
|
|
+ public static final String SPECIALEQUIPMENT_TITLE = "特种设备提醒";
|
|
|
/**
|
|
|
* 报工不合格提醒
|
|
|
*/
|
|
|
- public static final String REPORTUNQUALIFY_TITLE="订单作业报工不合格";
|
|
|
+ public static final String REPORTUNQUALIFY_TITLE = "订单作业报工不合格";
|
|
|
/**
|
|
|
* 安全观察指标提醒
|
|
|
*/
|
|
|
- public static final String OBSERVATION_TITLE="安全观察指标提醒";
|
|
|
+ public static final String OBSERVATION_TITLE = "安全观察指标提醒";
|
|
|
+ /**
|
|
|
+ * 安全附件检验提醒
|
|
|
+ */
|
|
|
+ public static final String SAFETY_ATTACHMENT_VERIFICATION_TITLE = "安全附件检验提醒";
|
|
|
}
|
|
|
|
|
|
public static class NotifyContent {
|
|
@@ -444,11 +456,11 @@ public class SaveConstans {
|
|
|
/**
|
|
|
* 特种设备提醒内容前缀
|
|
|
*/
|
|
|
- public static final String SPECIALEQUIPMENT_CONTENT_PREFIX="【设备年检提醒】,您好,有如下设备即将年检到期,请及时处理";
|
|
|
+ public static final String SPECIALEQUIPMENT_CONTENT_PREFIX = "【设备年检提醒】,您好,有如下设备即将年检到期,请及时处理";
|
|
|
/**
|
|
|
* 特种设备提醒内容
|
|
|
*/
|
|
|
- public static final String SPECIALEQUIPMENT_CONTENT="设备类型:【%s】,设备编号:【%s】,设备名称:【%s】,年检日期:【%s】";
|
|
|
+ public static final String SPECIALEQUIPMENT_CONTENT = "设备类型:【%s】,设备编号:【%s】,设备名称:【%s】,年检日期:【%s】";
|
|
|
/**
|
|
|
* 报工不合格提醒
|
|
|
*/
|
|
@@ -458,6 +470,8 @@ public class SaveConstans {
|
|
|
* 安全观察指标提醒
|
|
|
*/
|
|
|
public static final String OBSERVATION_CONTENT = "新的安全观察目标值【%s】已下达,请及时完成!";
|
|
|
+
|
|
|
+ public static final String SAFETY_ATTACHMENT_VERIFICATION_CONTENT = " 名称:【%s】,编号:【%s】,检验/更换日期:【%tF】,下次检验/更换日期:【%tF】,负责人:【%s】";
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -562,12 +576,6 @@ public class SaveConstans {
|
|
|
public static final String HIDDEN_DANGER_STATUS = "hidden_danger_status";
|
|
|
}
|
|
|
|
|
|
- public static final List<String> MERGE_PRODUCE_PROCESS = new ArrayList<>();
|
|
|
-
|
|
|
- static {
|
|
|
- MERGE_PRODUCE_PROCESS.add("");
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 加工方式
|
|
|
*/
|
|
@@ -706,27 +714,27 @@ public class SaveConstans {
|
|
|
/**
|
|
|
* 工序作业所需的设备必须在工序的可选设备之内
|
|
|
*/
|
|
|
- public static final String EQ_TYPE_SAME="工序作业所需的设备必须在工序的可选设备之内";
|
|
|
+ public static final String EQ_TYPE_SAME = "工序作业所需的设备必须在工序的可选设备之内";
|
|
|
/**
|
|
|
* 第一步工序作业要小于开始排程时间
|
|
|
*/
|
|
|
- public static final String NO_PRE_GB_AFTER_NOW="第一步工序作业要小于开始排程时间";
|
|
|
+ public static final String NO_PRE_GB_AFTER_NOW = "第一步工序作业要小于开始排程时间";
|
|
|
/**
|
|
|
* 当前工序作业开始时间违反上一步工序作业最大等待时间限制
|
|
|
*/
|
|
|
- public static final String HAS_ONE_PRE_GB_AFTER_NOW="当前工序作业开始时间违反上一步工序作业最大等待时间限制";
|
|
|
+ public static final String HAS_ONE_PRE_GB_AFTER_NOW = "当前工序作业开始时间违反上一步工序作业最大等待时间限制";
|
|
|
/**
|
|
|
* 加工设备该加工时间段不可用
|
|
|
*/
|
|
|
- public static final String EQUIPMENT_RUN_TIME="加工设备该加工时间段不可用";
|
|
|
+ public static final String EQUIPMENT_RUN_TIME = "加工设备该加工时间段不可用";
|
|
|
/**
|
|
|
* 上一工序作业流转时间不能大于上一工序作业最大等待时间
|
|
|
*/
|
|
|
- public static final String LZ_TIME_LESS_MAX_WAIT="上一工序作业流转时间不能大于上一工序作业最大等待时间";
|
|
|
+ public static final String LZ_TIME_LESS_MAX_WAIT = "上一工序作业流转时间不能大于上一工序作业最大等待时间";
|
|
|
/**
|
|
|
* 与加工设备其他作业加工时间重叠
|
|
|
*/
|
|
|
- public static final String EQ_TIME_CROSS="与加工设备其他作业加工时间重叠";
|
|
|
+ public static final String EQ_TIME_CROSS = "与加工设备其他作业加工时间重叠";
|
|
|
|
|
|
}
|
|
|
|
|
@@ -737,12 +745,13 @@ public class SaveConstans {
|
|
|
/**
|
|
|
* 订单交货期不满足
|
|
|
*/
|
|
|
- public static final String DELIVERY_DATE="订单交货期不满足";
|
|
|
+ public static final String DELIVERY_DATE = "订单交货期不满足";
|
|
|
/**
|
|
|
* 订单的连续生产要求不满足
|
|
|
*/
|
|
|
- public static final String SERIES_PRODUCE="订单的连续生产要求不满足";
|
|
|
+ public static final String SERIES_PRODUCE = "订单的连续生产要求不满足";
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 产品类型的外观 字典ID
|
|
|
*/
|
|
@@ -758,23 +767,10 @@ public class SaveConstans {
|
|
|
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 初始化数量单位
|
|
|
- */
|
|
|
- public static final Map<String, String> QUANTITY_UNIT_MAP = new HashMap<String, String>() {{
|
|
|
- /**
|
|
|
- * 公斤
|
|
|
- */
|
|
|
- put("kg", "公斤");
|
|
|
- /**
|
|
|
- * 吨
|
|
|
- */
|
|
|
- put("ton", "吨");
|
|
|
- }};
|
|
|
/**
|
|
|
* 枚举数量单位
|
|
|
*/
|
|
|
- public static class CountUnit{
|
|
|
+ public static class CountUnit {
|
|
|
/**
|
|
|
* 千克、公斤
|
|
|
*/
|
|
@@ -788,7 +784,7 @@ public class SaveConstans {
|
|
|
/**
|
|
|
* 在制品状态
|
|
|
*/
|
|
|
- public static class WorkInProgressStatus{
|
|
|
+ public static class WorkInProgressStatus {
|
|
|
/**
|
|
|
* 待检验
|
|
|
*/
|
|
@@ -806,23 +802,48 @@ public class SaveConstans {
|
|
|
*/
|
|
|
public static final String WAITING = "备料中";
|
|
|
}
|
|
|
- public static class CheckLevel{
|
|
|
+
|
|
|
+ public static class CheckLevel {
|
|
|
/**
|
|
|
* B级
|
|
|
*/
|
|
|
- public static final String B="B级";
|
|
|
+ public static final String B = "B级";
|
|
|
/**
|
|
|
* BC级
|
|
|
*/
|
|
|
- public static final String B_C="BC级";
|
|
|
+ public static final String B_C = "BC级";
|
|
|
/**
|
|
|
* 待判
|
|
|
*/
|
|
|
- public static final String WAITING_JUDGMENT="待判";
|
|
|
+ public static final String WAITING_JUDGMENT = "待判";
|
|
|
}
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 初始化数量单位
|
|
|
+ */
|
|
|
+ public static final Map<String, String> QUANTITY_UNIT_MAP = new HashMap<String, String>() {{
|
|
|
+ /**
|
|
|
+ * 公斤
|
|
|
+ */
|
|
|
+ put("kg", "公斤");
|
|
|
+ /**
|
|
|
+ * 吨
|
|
|
+ */
|
|
|
+ put("ton", "吨");
|
|
|
+ }};
|
|
|
/**
|
|
|
* 初始化月份代号
|
|
|
*/
|
|
|
- public static final List<String> MONTH_CODE_LIST = Arrays.asList("1","2","3","4","5","6","7","8","9","X","Y","Z");
|
|
|
+ public static final List<String> MONTH_CODE_LIST = Arrays.asList("1", "2", "3", "4", "5", "6", "7", "8", "9", "X", "Y", "Z");
|
|
|
+ /**
|
|
|
+ * 高
|
|
|
+ */
|
|
|
+ public static final String HIGH = "高";
|
|
|
+ /**
|
|
|
+ * 中
|
|
|
+ */
|
|
|
+ public static final String MIDDLE = "中";
|
|
|
+ /**
|
|
|
+ * 低
|
|
|
+ */
|
|
|
+ public static final String LOW = "低";
|
|
|
}
|