canrd-outside / order-erp · Commits

Commit ea05d865416a7f9fd573004562e02fe20de1c9a3

Authored by 谢茂盛
1 parent 90c434eb

feat: ERP升级 

1、订单超期事件-邮件模块基础类
2、订单 产品意见更新记录与一次性通过率基础类
Inline Side-by-side
Showing 7 changed files with 188 additions and 24 deletions
sql/dml_erp_v2.sql
  View file @ea05d86
... ... @@ -19,9 +19,7 @@ CREATE TABLE `receive_email_mapping` (
19 19 `id` bigint NOT NULL AUTO_INCREMENT,
20 20 `type` varchar(64) NOT NULL COMMENT '类型',
21 21 `type_value` varchar(64) NOT NULL COMMENT '类型值',
22   - `event` varchar(64) not null COMMENT '事件',
23   - `emails` text COMMENT '接收人邮件 json',
24   - `template_id` bigint NOT NULL COMMENT '邮件模板id',
  22 + `config_infos` text COMMENT '配置信息 json',
25 23 `enable_flag` INT NOT NULL COMMENT '是否可用 10-可用 20-删除',
26 24 `create_time` DATETIME NOT NULL COMMENT '创建时间',
27 25 `create_by` varchar(64) NOT NULL COMMENT '创建人',
... ...
src/main/java/com/order/erp/domain/ConfigItemFieldEnum.java 0 → 100644
  View file @ea05d86
  1 +package com.order.erp.domain;
  2 +
  3 +import lombok.AllArgsConstructor;
  4 +import lombok.Getter;
  5 +
  6 +/**
  7 + * @author: xms
  8 + * @description: TODO
  9 + * @date: 2023/9/13 18:05
  10 + * @version: 1.0
  11 + */
  12 +@Getter
  13 +@AllArgsConstructor
  14 +public enum ConfigItemFieldEnum {
  15 +
  16 + CONFIRM_SAMPLE("确认样品确认状态", "configSample", OrderEventEnum.CONFIRM_SAMPLE_TEMPLATE.getEvent()),
  17 +
  18 + OTHER_SAMPLE("“其他要求样品发送日期", "otherSample", OrderEventEnum.OTHER_SAMPLE_TEMPLATE.getEvent()),
  19 +
  20 + BIG_SAMPLE("大货样确认态", "bigSample", OrderEventEnum.BIG_SAMPLE_TEMPLATE.getEvent()),
  21 +
  22 + AITEX_SGS_TEST("AITEX/SGS测试状态", "aitexSgsTest", OrderEventEnum.AITEX_SGS_TEST_TEMPLATE.getEvent()),
  23 +
  24 + BARCODE_ARRIVAL("要求包材到货日期", "barcodeArrival", OrderEventEnum.BARCODE_ARRIVAL_TEMPLATE.getEvent()),
  25 +
  26 + LATEST_DC("最晚订舱日期", "latestDc", OrderEventEnum.LATEST_DC_TEMPLATE.getEvent()),
  27 +
  28 + END_CHECK_DATE("尾期验货日期", "endCheckDate", OrderEventEnum.END_CHECK_DATE_TEMPLATE.getEvent()),
  29 +
  30 + MID_CHECK_REPORT("中期验货报告", "midCheckReport", OrderEventEnum.MID_CHECK_REPORT_TEMPLATE.getEvent()),
  31 +
  32 + END_CHECK_REPORT("尾期验货报告", "endCheckReport", OrderEventEnum.END_CHECK_REPORT_TEMPLATE.getEvent()),
  33 + ;
  34 +
  35 + /**
  36 + * 字段名称
  37 + */
  38 + private String fieldName;
  39 +
  40 + /**
  41 + * 字段值
  42 + */
  43 + private String fieldValue;
  44 +
  45 + /**
  46 + * 订单事件，枚举
  47 + */
  48 + private String event;
  49 +}
... ...
src/main/java/com/order/erp/domain/EmailTemplateEnum.java 0 → 100644
  View file @ea05d86
  1 +package com.order.erp.domain;
  2 +
  3 +import lombok.AllArgsConstructor;
  4 +import lombok.Getter;
  5 +
  6 +/**
  7 + * @author: xms
  8 + * @description: TODO
  9 + * @date: 2023/9/13 18:05
  10 + * @version: 1.0
  11 + */
  12 +@Getter
  13 +@AllArgsConstructor
  14 +public enum EmailTemplateEnum {
  15 +
  16 + CONFIRM_SAMPLE_TEMPLATE("确认样确认状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的确认样确认，请尽快完成", 1L),
  17 +
  18 + OTHER_SAMPLE_TEMPLATE("其他要求样品发送日期", "您收到此邮件是因为您未能在规定的期限内完成以下货号的其他要求样品的发送，请尽快完成", 2L),
  19 +
  20 + BIG_SAMPLE_TEMPLATE("大货样确认状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的大货样确认，请尽快完成", 3L),
  21 +
  22 + AITEX_SGS_TEST_TEMPLATE("AITEX/SGS测试状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的AITEX/SGS测试通过，请尽快完成", 4L),
  23 +
  24 + BARCODE_ARRIVAL_TEMPLATE("要求包材到货日期", "您收到此邮件是因为您未能在规定的期限内收到所有包材，请尽快确认", 5L),
  25 +
  26 + LATEST_DC_TEMPLATE("最晚订舱日期", "您收到此邮件是因为您未能在规定的期限内完成订舱，请尽快完成", 6L),
  27 +
  28 + END_CHECK_DATE_TEMPLATE("尾期验货日期", "您收到此邮件是因为您未能在规定的期限内完成尾期验货，请尽快完成", 7L),
  29 +
  30 + MID_CHECK_REPORT_TEMPLATE("中期验货报告", "您好，请查收中期验货报告", 8L),
  31 +
  32 + END_CHECK_REPORT_TEMPLATE("尾期验货报告", "您好，请查收尾期验货报告", 9L),
  33 +
  34 + ;
  35 +
  36 + private String title;
  37 +
  38 + private String content;
  39 +
  40 + /**
  41 + * 邮件模块id
  42 + */
  43 + private Long templateId;
  44 +
  45 +}
... ...
src/main/java/com/order/erp/domain/OrderEventEnum.java 0 → 100644
  View file @ea05d86
  1 +package com.order.erp.domain;
  2 +
  3 +import lombok.AllArgsConstructor;
  4 +import lombok.Getter;
  5 +
  6 +/**
  7 + * @author: xms
  8 + * @description: TODO
  9 + * @date: 2023/9/13 18:05
  10 + * @version: 1.0
  11 + */
  12 +@Getter
  13 +@AllArgsConstructor
  14 +public enum OrderEventEnum {
  15 +
  16 + CONFIRM_SAMPLE_TEMPLATE("CONFIRM_SAMPLE_TEMPLATE", "确认样确认状态=客户交期-21", EmailTemplateEnum.CONFIRM_SAMPLE_TEMPLATE.getTemplateId()),
  17 +
  18 + OTHER_SAMPLE_TEMPLATE("OTHER_SAMPLE_TEMPLATE", "其他要求样品发送日期=客户交期-14", EmailTemplateEnum.OTHER_SAMPLE_TEMPLATE.getTemplateId()),
  19 +
  20 + BIG_SAMPLE_TEMPLATE("BIG_SAMPLE_TEMPLATE", "大货样确认状态=客户交期-7", EmailTemplateEnum.BIG_SAMPLE_TEMPLATE.getTemplateId()),
  21 +
  22 + AITEX_SGS_TEST_TEMPLATE("AITEX_SGS_TEST_TEMPLATE", "AITEX/SGS测试状态=客户交期-3", EmailTemplateEnum.AITEX_SGS_TEST_TEMPLATE.getTemplateId()),
  23 +
  24 + BARCODE_ARRIVAL_TEMPLATE("BARCODE_ARRIVAL_TEMPLATE", "要求包材到货日期=客户交期-7", EmailTemplateEnum.BARCODE_ARRIVAL_TEMPLATE.getTemplateId()),
  25 +
  26 + LATEST_DC_TEMPLATE("LATEST_DC_TEMPLATE", "最晚订舱日期=客户交期-10", EmailTemplateEnum.LATEST_DC_TEMPLATE.getTemplateId()),
  27 +
  28 + END_CHECK_DATE_TEMPLATE("END_CHECK_DATE_TEMPLATE", "尾期验货日期=客户交期-2", EmailTemplateEnum.END_CHECK_DATE_TEMPLATE.getTemplateId()),
  29 +
  30 + MID_CHECK_REPORT_TEMPLATE("MID_CHECK_REPORT_TEMPLATE", "中期验货报告", EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE.getTemplateId()),
  31 +
  32 + END_CHECK_REPORT_TEMPLATE("END_CHECK_REPORT_TEMPLATE", "尾期验货报告", EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE.getTemplateId()),
  33 +
  34 + ;
  35 +
  36 + private String event;
  37 +
  38 + private String desc;
  39 +
  40 + /**
  41 + * 邮件模块id
  42 + */
  43 + private Long templateId;
  44 +
  45 +}
... ...
src/main/java/com/order/erp/domain/dto/order/ReceiveEmailMappingDO.java
  View file @ea05d86
... ... @@ -33,17 +33,10 @@ public class ReceiveEmailMappingDO extends BaseDO implements Serializable {
33 33 * 值
34 34 */
35 35 private String typeValue;
  36 +
36 37 /**
37   - * 事件
38   - */
39   - private String event;
40   - /**
41   - * 接收人邮件 json
42   - */
43   - private String emails;
44   - /**
45   - * 邮件模板id
  38 + * 配置信息 json
46 39 */
47   - private Long templateId;
  40 + private String configInfos;
48 41  
49 42 }
... ...
src/main/java/com/order/erp/domain/vo/order/ReceiveEmailConfigItemVO.java 0 → 100644
  View file @ea05d86
  1 +package com.order.erp.domain.vo.order;
  2 +
  3 +import lombok.*;
  4 +import lombok.experimental.SuperBuilder;
  5 +
  6 +import java.io.Serializable;
  7 +import java.util.List;
  8 +
  9 +/**
  10 + * 邮件接收人信息绑定表(ReceiveEmailConfigItemVO)实体类
  11 + *
  12 + * @author makejava
  13 + * @since 2024-07-03 10:58:52
  14 + */
  15 +@Data
  16 +@AllArgsConstructor
  17 +@ToString
  18 +@NoArgsConstructor
  19 +@EqualsAndHashCode(callSuper = false)
  20 +@SuperBuilder
  21 +public class ReceiveEmailConfigItemVO implements Serializable {
  22 +
  23 + /**
  24 + * 字段名称
  25 + */
  26 + private String fieldName;
  27 +
  28 + /**
  29 + * 字段值
  30 + */
  31 + private String fieldValue;
  32 +
  33 + /**
  34 + * 订单事件，枚举
  35 + */
  36 + private String event;
  37 +
  38 + /**
  39 + * 邮箱
  40 + */
  41 + private List<String> emails;
  42 +}
... ...
src/main/java/com/order/erp/domain/vo/order/ReceiveEmailMappingVO.java
  View file @ea05d86
... ... @@ -18,25 +18,17 @@ import java.io.Serializable;
18 18 @EqualsAndHashCode(callSuper = false)
19 19 @SuperBuilder
20 20 public class ReceiveEmailMappingVO implements Serializable {
21   - private static final long serialVersionUID = 573512659255438314L;
22 21  
23 22 private Long id;
24 23 /**
25 24 * 类型
26 25 */
27 26 private String type;
  27 +
28 28 /**
29   - * 事件
30   - */
31   - private String event;
32   - /**
33   - * 接收人邮件 json
34   - */
35   - private String emails;
36   - /**
37   - * 邮件模板id
  29 + * 配置信息 json
38 30 */
39   - private Long templateId;
  31 + private String configInfos;
40 32  
41 33  
42 34 }
... ...