canrd-outside / order-erp · Commits

Commit 61f9a2553d692e1ff2ac2229f58d948819a1ddbf

Authored by 谢茂盛
1 parent 9c316be6
build: skipped

feat: ERP升级 

1、订单超期事件-邮件模块基础类
2、订单 产品意见更新记录与一次性通过率基础类
Inline Side-by-side
Showing 2 changed files with 18 additions and 18 deletions
src/main/java/com/order/erp/domain/ConfigItemFieldEnum.java
  View file @61f9a25
@@ -13,23 +13,23 @@ import lombok.Getter; @@ -13,23 +13,23 @@ import lombok.Getter;
13 @AllArgsConstructor 13 @AllArgsConstructor
14 public enum ConfigItemFieldEnum { 14 public enum ConfigItemFieldEnum {
15 15
16 - CONFIRM_SAMPLE("确认样品确认状态", "configSample", OrderEventEnum.CONFIRM_SAMPLE_TEMPLATE.getEvent()), 16 + CONFIRM_SAMPLE("确认样品确认状态", "configSample", OrderEventEnum.CONFIRM_SAMPLE_EVENT.getEvent()),
17 17
18 - OTHER_SAMPLE("“其他要求样品发送日期", "otherSample", OrderEventEnum.OTHER_SAMPLE_TEMPLATE.getEvent()), 18 + OTHER_SAMPLE("“其他要求样品发送日期", "otherSample", OrderEventEnum.OTHER_SAMPLE_EVENT.getEvent()),
19 19
20 - BIG_SAMPLE("大货样确认态", "bigSample", OrderEventEnum.BIG_SAMPLE_TEMPLATE.getEvent()), 20 + BIG_SAMPLE("大货样确认态", "bigSample", OrderEventEnum.BIG_SAMPLE_EVENT.getEvent()),
21 21
22 - AITEX_SGS_TEST("AITEX/SGS测试状态", "aitexSgsTest", OrderEventEnum.AITEX_SGS_TEST_TEMPLATE.getEvent()), 22 + AITEX_SGS_TEST("AITEX/SGS测试状态", "aitexSgsTest", OrderEventEnum.AITEX_SGS_TEST_EVENT.getEvent()),
23 23
24 - BARCODE_ARRIVAL("要求包材到货日期", "barcodeArrival", OrderEventEnum.BARCODE_ARRIVAL_TEMPLATE.getEvent()), 24 + BARCODE_ARRIVAL("要求包材到货日期", "barcodeArrival", OrderEventEnum.BARCODE_ARRIVAL_EVENT.getEvent()),
25 25
26 - LATEST_DC("最晚订舱日期", "latestDc", OrderEventEnum.LATEST_DC_TEMPLATE.getEvent()), 26 + LATEST_DC("最晚订舱日期", "latestDc", OrderEventEnum.LATEST_DC_EVENT.getEvent()),
27 27
28 - END_CHECK_DATE("尾期验货日期", "endCheckDate", OrderEventEnum.END_CHECK_DATE_TEMPLATE.getEvent()), 28 + END_CHECK_DATE("尾期验货日期", "endCheckDate", OrderEventEnum.END_CHECK_DATE_EVENT.getEvent()),
29 29
30 - MID_CHECK_REPORT("中期验货报告", "midCheckReport", OrderEventEnum.MID_CHECK_REPORT_TEMPLATE.getEvent()), 30 + MID_CHECK_REPORT("中期验货报告", "midCheckReport", OrderEventEnum.MID_CHECK_REPORT_EVENT.getEvent()),
31 31
32 - END_CHECK_REPORT("尾期验货报告", "endCheckReport", OrderEventEnum.END_CHECK_REPORT_TEMPLATE.getEvent()), 32 + END_CHECK_REPORT("尾期验货报告", "endCheckReport", OrderEventEnum.END_CHECK_REPORT_EVENT.getEvent()),
33 ; 33 ;
34 34
35 /** 35 /**
src/main/java/com/order/erp/domain/OrderEventEnum.java
  View file @61f9a25
@@ -13,23 +13,23 @@ import lombok.Getter; @@ -13,23 +13,23 @@ import lombok.Getter;
13 @AllArgsConstructor 13 @AllArgsConstructor
14 public enum OrderEventEnum { 14 public enum OrderEventEnum {
15 15
16 - CONFIRM_SAMPLE_TEMPLATE("CONFIRM_SAMPLE_TEMPLATE", "确认样确认状态=客户交期-21", EmailTemplateEnum.CONFIRM_SAMPLE_TEMPLATE.getTemplateId()), 16 + CONFIRM_SAMPLE_EVENT("CONFIRM_SAMPLE_EVENT", "确认样确认状态=客户交期-21", EmailTemplateEnum.CONFIRM_SAMPLE_TEMPLATE.getTemplateId()),
17 17
18 - OTHER_SAMPLE_TEMPLATE("OTHER_SAMPLE_TEMPLATE", "其他要求样品发送日期=客户交期-14", EmailTemplateEnum.OTHER_SAMPLE_TEMPLATE.getTemplateId()), 18 + OTHER_SAMPLE_EVENT("OTHER_SAMPLE_EVENT", "其他要求样品发送日期=客户交期-14", EmailTemplateEnum.OTHER_SAMPLE_TEMPLATE.getTemplateId()),
19 19
20 - BIG_SAMPLE_TEMPLATE("BIG_SAMPLE_TEMPLATE", "大货样确认状态=客户交期-7", EmailTemplateEnum.BIG_SAMPLE_TEMPLATE.getTemplateId()), 20 + BIG_SAMPLE_EVENT("BIG_SAMPLE_EVENT", "大货样确认状态=客户交期-7", EmailTemplateEnum.BIG_SAMPLE_TEMPLATE.getTemplateId()),
21 21
22 - AITEX_SGS_TEST_TEMPLATE("AITEX_SGS_TEST_TEMPLATE", "AITEX/SGS测试状态=客户交期-3", EmailTemplateEnum.AITEX_SGS_TEST_TEMPLATE.getTemplateId()), 22 + AITEX_SGS_TEST_EVENT("AITEX_SGS_TEST_EVENT", "AITEX/SGS测试状态=客户交期-3", EmailTemplateEnum.AITEX_SGS_TEST_TEMPLATE.getTemplateId()),
23 23
24 - BARCODE_ARRIVAL_TEMPLATE("BARCODE_ARRIVAL_TEMPLATE", "要求包材到货日期=客户交期-7", EmailTemplateEnum.BARCODE_ARRIVAL_TEMPLATE.getTemplateId()), 24 + BARCODE_ARRIVAL_EVENT("BARCODE_ARRIVAL_EVENT", "要求包材到货日期=客户交期-7", EmailTemplateEnum.BARCODE_ARRIVAL_TEMPLATE.getTemplateId()),
25 25
26 - LATEST_DC_TEMPLATE("LATEST_DC_TEMPLATE", "最晚订舱日期=客户交期-10", EmailTemplateEnum.LATEST_DC_TEMPLATE.getTemplateId()), 26 + LATEST_DC_EVENT("LATEST_DC_EVENT", "最晚订舱日期=客户交期-10", EmailTemplateEnum.LATEST_DC_TEMPLATE.getTemplateId()),
27 27
28 - END_CHECK_DATE_TEMPLATE("END_CHECK_DATE_TEMPLATE", "尾期验货日期=客户交期-2", EmailTemplateEnum.END_CHECK_DATE_TEMPLATE.getTemplateId()), 28 + END_CHECK_DATE_EVENT("END_CHECK_DATE_EVENT", "尾期验货日期=客户交期-2", EmailTemplateEnum.END_CHECK_DATE_TEMPLATE.getTemplateId()),
29 29
30 - MID_CHECK_REPORT_TEMPLATE("MID_CHECK_REPORT_TEMPLATE", "中期验货报告", EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE.getTemplateId()), 30 + MID_CHECK_REPORT_EVENT("MID_CHECK_REPORT_EVENT", "中期验货报告", EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE.getTemplateId()),
31 31
32 - END_CHECK_REPORT_TEMPLATE("END_CHECK_REPORT_TEMPLATE", "尾期验货报告", EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE.getTemplateId()), 32 + END_CHECK_REPORT_EVENT("END_CHECK_REPORT_EVENT", "尾期验货报告", EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE.getTemplateId()),
33 33
34 ; 34 ;
35 35