设备发货管理

sop-api/install/mysql/init/init.sql

@@ -782,7 +782,7 @@ CREATE TABLE `t_b_device_in_out` (
                                      `address` varchar(100) DEFAULT NULL COMMENT '发往地',
                                      `address_arr` varchar(100) DEFAULT NULL COMMENT '发往地（回显）',
                                      `status` varchar(20) NOT NULL COMMENT '状态，NORMAL：正常，BREAK_DOWN：故障',
-                                     `usage_type` varchar(45) DEFAULT NULL COMMENT '用途类型（项目、其他）',
+                                     `usage_type` varchar(45) DEFAULT NULL COMMENT '用途类型（项目、其它）',
                                      `base_photo_path` varchar(500) DEFAULT NULL COMMENT '快递单拍照',
                                      `create_id` bigint(20) DEFAULT NULL COMMENT '创建人id',
                                      `create_time` bigint(20) DEFAULT NULL COMMENT '创建人时间',
@@ -1524,6 +1524,33 @@ CREATE TABLE `t_b_sop_plan_date_log` (
                                          PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='sop进程计划时间日志表';
 
+DROP TABLE IF EXISTS `t_b_device_delivery`;
+CREATE TABLE `t_b_device_delivery` (
+                                       `id` bigint NOT NULL COMMENT '主键',
+                                       `service_id` bigint DEFAULT NULL COMMENT '服务单元id',
+                                       `crm_no` varchar(100) DEFAULT NULL COMMENT 'crm单号',
+                                       `sop_no` varchar(100) DEFAULT NULL COMMENT 'sop单号',
+                                       `device_no` varchar(50) NOT NULL COMMENT '设备编号',
+                                       `usage_type` varchar(45) NOT NULL COMMENT '用途类型，PROJECT：项目，OTHER：其它',
+                                       `supplier_id` bigint DEFAULT NULL COMMENT '供应商id',
+                                       `num` int DEFAULT NULL COMMENT '数量',
+                                       `mailing_address` varchar(500) DEFAULT NULL COMMENT '邮寄地址',
+                                       `consignee` varchar(50) DEFAULT NULL COMMENT '收件人',
+                                       `consignee_phone` varchar(30) DEFAULT NULL COMMENT '收件人联系电话',
+                                       `express_photo_path` varchar(500) DEFAULT NULL COMMENT '快递单拍照',
+                                       `status` varchar(30) DEFAULT NULL COMMENT '状态，UN_DELIVER：待发货，DELIVER：已发货，RECEIVE：已签收，CANCEL：作废',
+                                       `deliver_time` bigint DEFAULT NULL COMMENT '发货时间',
+                                       `deliver_user_id` bigint DEFAULT NULL COMMENT '发货人id',
+                                       `receive_time` bigint DEFAULT NULL COMMENT '签收时间',
+                                       `receive_user_id` bigint DEFAULT NULL COMMENT '签收人id',
+                                       `enable` tinyint DEFAULT NULL COMMENT '是否启用，0：停用，1：启用',
+                                       `create_id` bigint DEFAULT NULL COMMENT '创建人id',
+                                       `create_time` bigint DEFAULT NULL COMMENT '创建时间',
+                                       `update_id` bigint DEFAULT NULL COMMENT '更新人id',
+                                       `update_time` bigint DEFAULT NULL COMMENT '更新时间',
+                                       PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='设备发货表';
+
 -- ----------------------------
 -- Function structure for currval
 -- ----------------------------
@@ -2077,6 +2104,7 @@ INSERT INTO `sys_role` VALUES (8, NULL, 'QA', 1, 'QA', NULL, NULL, 4434374414418
 INSERT INTO `sys_role` VALUES (9, NULL, '技术客服', 1, 'CUSTOM', NULL, NULL, 443437441441857536, 1697425672305, 1, '系统角色');
 INSERT INTO `sys_role` VALUES (10, NULL, '客户经理', 1, 'ACCOUNT_MANAGER', NULL, NULL, 443437441441857536, 1697425679196, 1, '系统角色');
 INSERT INTO `sys_role` VALUES (11, NULL, '乙方总负责人', 1, 'THIRD_PMO', NULL, NULL, 443437441441857536, 1697621767961, 1, '系统角色');
+INSERT INTO `sys_role` VALUES (12, NULL, '设备发货员', 1, 'DEVICE_DELIVERY', NULL, NULL, 443437441441857536, 1697621767961, 1, '系统角色');
 
 INSERT INTO `sys_role_privilege` VALUES (446629625196445696, 2, 1024, 1);
 INSERT INTO `sys_role_privilege` VALUES (446629625196445697, 2, 1, 1);

sop-api/src/main/java/com/qmth/sop/server/api/TBDeviceDeliveryController.java

@@ -0,0 +1,23 @@
+package com.qmth.sop.server.api;
+
+
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.sop.common.contant.SystemConstant;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备发货表 前端控制器
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-11-28
+ */
+@Api(tags = "设备配置表 Controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+ SystemConstant.PREFIX_URL_DEVICE_DELIVERY)
+public class TBDeviceDeliveryController {
+
+}

sop-api/src/main/resources/application.properties

@@ -10,11 +10,11 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=sop-api
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=192.168.10.83
+db.host=localhost
 db.port=3306
 db.name=sop_db_test
-db.username=ENC(OTAOkdBxCYHrGNmanj0J85XSTmdQ4E3Z)
-db.password=ENC(YfUBv2g6+34UPqR2u1FI9rb7tIQrPk3f)
+db.username=ENC(twj/P1SX6jQfK9COMuT7Jw==)
+db.password=ENC(a2J4vh9tlOrY+SlC2XMMpA/pnlAyJMPv)
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true

sop-business/src/main/java/com/qmth/sop/business/entity/TBDeviceDelivery.java

@@ -0,0 +1,215 @@
+package com.qmth.sop.business.entity;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.sop.common.enums.DeviceDeliveryStatusEnum;
+import com.qmth.sop.common.enums.DeviceUsageTypeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 设备发货表
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-11-28
+ */
+@ApiModel(value="TBDeviceDelivery对象", description="设备发货表")
+public class TBDeviceDelivery implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "服务单元id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long serviceId;
+
+    @ApiModelProperty(value = "crm单号")
+    private String crmNo;
+
+    @ApiModelProperty(value = "sop单号")
+    private String sopNo;
+
+    @ApiModelProperty(value = "设备编号")
+    private String deviceNo;
+
+    @ApiModelProperty(value = "用途类型，PROJECT：项目，OTHER：其它")
+    private DeviceUsageTypeEnum usageType;
+
+    @ApiModelProperty(value = "供应商id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+
+    @ApiModelProperty(value = "数量")
+    private Integer num;
+
+    @ApiModelProperty(value = "邮寄地址")
+    private String mailingAddress;
+
+    @ApiModelProperty(value = "收件人")
+    private String consignee;
+
+    @ApiModelProperty(value = "收件人联系电话")
+    private String consigneePhone;
+
+    @ApiModelProperty(value = "快递单拍照")
+    private String expressPhotoPath;
+
+    @ApiModelProperty(value = "状态，UN_DELIVER：待发货，DELIVER：已发货，RECEIVE：已签收，CANCEL：作废")
+    private DeviceDeliveryStatusEnum status;
+
+    @ApiModelProperty(value = "发货时间")
+    private Long deliverTime;
+
+    @ApiModelProperty(value = "发货人id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long deliverUserId;
+
+    @ApiModelProperty(value = "签收时间")
+    private Long receiveTime;
+
+    @ApiModelProperty(value = "签收人id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long receiveUserId;
+
+    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
+    private Boolean enable;
+
+    public Long getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(Long serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getCrmNo() {
+        return crmNo;
+    }
+
+    public void setCrmNo(String crmNo) {
+        this.crmNo = crmNo;
+    }
+
+    public String getSopNo() {
+        return sopNo;
+    }
+
+    public void setSopNo(String sopNo) {
+        this.sopNo = sopNo;
+    }
+
+    public String getDeviceNo() {
+        return deviceNo;
+    }
+
+    public void setDeviceNo(String deviceNo) {
+        this.deviceNo = deviceNo;
+    }
+
+    public DeviceUsageTypeEnum getUsageType() {
+        return usageType;
+    }
+
+    public void setUsageType(DeviceUsageTypeEnum usageType) {
+        this.usageType = usageType;
+    }
+
+    public Long getSupplierId() {
+        return supplierId;
+    }
+
+    public void setSupplierId(Long supplierId) {
+        this.supplierId = supplierId;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
+    public String getMailingAddress() {
+        return mailingAddress;
+    }
+
+    public void setMailingAddress(String mailingAddress) {
+        this.mailingAddress = mailingAddress;
+    }
+
+    public String getConsignee() {
+        return consignee;
+    }
+
+    public void setConsignee(String consignee) {
+        this.consignee = consignee;
+    }
+
+    public String getConsigneePhone() {
+        return consigneePhone;
+    }
+
+    public void setConsigneePhone(String consigneePhone) {
+        this.consigneePhone = consigneePhone;
+    }
+
+    public String getExpressPhotoPath() {
+        return expressPhotoPath;
+    }
+
+    public void setExpressPhotoPath(String expressPhotoPath) {
+        this.expressPhotoPath = expressPhotoPath;
+    }
+
+    public DeviceDeliveryStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(DeviceDeliveryStatusEnum status) {
+        this.status = status;
+    }
+
+    public Long getDeliverTime() {
+        return deliverTime;
+    }
+
+    public void setDeliverTime(Long deliverTime) {
+        this.deliverTime = deliverTime;
+    }
+
+    public Long getDeliverUserId() {
+        return deliverUserId;
+    }
+
+    public void setDeliverUserId(Long deliverUserId) {
+        this.deliverUserId = deliverUserId;
+    }
+
+    public Long getReceiveTime() {
+        return receiveTime;
+    }
+
+    public void setReceiveTime(Long receiveTime) {
+        this.receiveTime = receiveTime;
+    }
+
+    public Long getReceiveUserId() {
+        return receiveUserId;
+    }
+
+    public void setReceiveUserId(Long receiveUserId) {
+        this.receiveUserId = receiveUserId;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+}

sop-business/src/main/java/com/qmth/sop/business/entity/TBDeviceInOut.java

@@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * <p>
@@ -72,7 +71,7 @@ public class TBDeviceInOut implements Serializable {
     @ApiModelProperty(value = "运行状态，NORMAL：正常，BREAK_DOWN：故障")
     private DeviceStatusEnum status;
 
-    @ApiModelProperty(value = "用途类型（项目、其他）")
+    @ApiModelProperty(value = "用途类型（项目、其它）")
     private DeviceUsageTypeEnum usageType;
 
     @ApiModelProperty(value = "快递单照片")

sop-business/src/main/java/com/qmth/sop/business/mapper/TBDeviceDeliveryMapper.java

@@ -0,0 +1,16 @@
+package com.qmth.sop.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.sop.business.entity.TBDeviceDelivery;
+
+/**
+ * <p>
+ * 设备发货表 Mapper 接口
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-11-28
+ */
+public interface TBDeviceDeliveryMapper extends BaseMapper<TBDeviceDelivery> {
+
+}

sop-business/src/main/java/com/qmth/sop/business/service/TBDeviceDeliveryService.java

@@ -0,0 +1,16 @@
+package com.qmth.sop.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.sop.business.entity.TBDeviceDelivery;
+
+/**
+ * <p>
+ * 设备发货表 服务类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-11-28
+ */
+public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
+
+}

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceDeliveryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qmth.sop.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.sop.business.entity.TBDeviceDelivery;
+import com.qmth.sop.business.mapper.TBDeviceDeliveryMapper;
+import com.qmth.sop.business.service.TBDeviceDeliveryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备发货表 服务实现类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-11-28
+ */
+@Service
+public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMapper, TBDeviceDelivery> implements TBDeviceDeliveryService {
+
+}

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -2188,4 +2188,83 @@ ALTER TABLE t_b_sop_info ADD CONSTRAINT t_b_sop_info_un_sop_no UNIQUE KEY (sop_n
 ALTER TABLE t_b_delay_warn ADD CONSTRAINT t_b_delay_warn_un_code UNIQUE KEY (code);
 ALTER TABLE t_b_project_exchange ADD CONSTRAINT t_b_project_exchange_un_exchange_no UNIQUE KEY (exchange_no);
 ALTER TABLE t_b_violation ADD CONSTRAINT t_b_violation_un_code UNIQUE KEY (code);
-ALTER TABLE t_b_crm ADD CONSTRAINT t_b_crm_un_crm_no UNIQUE KEY (crm_no);
+ALTER TABLE t_b_crm ADD CONSTRAINT t_b_crm_un_crm_no UNIQUE KEY (crm_no);
+
+--2023.11.28update
+DROP TABLE IF EXISTS `t_b_device_delivery`;
+CREATE TABLE `t_b_device_delivery` (
+                                       `id` bigint NOT NULL COMMENT '主键',
+                                       `service_id` bigint DEFAULT NULL COMMENT '服务单元id',
+                                       `crm_no` varchar(100) DEFAULT NULL COMMENT 'crm单号',
+                                       `sop_no` varchar(100) DEFAULT NULL COMMENT 'sop单号',
+                                       `device_no` varchar(50) NOT NULL COMMENT '设备编号',
+                                       `usage_type` varchar(45) NOT NULL COMMENT '用途类型，PROJECT：项目，OTHER：其它',
+                                       `supplier_id` bigint DEFAULT NULL COMMENT '供应商id',
+                                       `num` int DEFAULT NULL COMMENT '数量',
+                                       `mailing_address` varchar(500) DEFAULT NULL COMMENT '邮寄地址',
+                                       `consignee` varchar(50) DEFAULT NULL COMMENT '收件人',
+                                       `consignee_phone` varchar(30) DEFAULT NULL COMMENT '收件人联系电话',
+                                       `express_photo_path` varchar(500) DEFAULT NULL COMMENT '快递单拍照',
+                                       `status` varchar(30) DEFAULT NULL COMMENT '状态，UN_DELIVER：待发货，DELIVER：已发货，RECEIVE：已签收，CANCEL：作废',
+                                       `deliver_time` bigint DEFAULT NULL COMMENT '发货时间',
+                                       `deliver_user_id` bigint DEFAULT NULL COMMENT '发货人id',
+                                       `receive_time` bigint DEFAULT NULL COMMENT '签收时间',
+                                       `receive_user_id` bigint DEFAULT NULL COMMENT '签收人id',
+                                       `enable` tinyint DEFAULT NULL COMMENT '是否启用，0：停用，1：启用',
+                                       `create_id` bigint DEFAULT NULL COMMENT '创建人id',
+                                       `create_time` bigint DEFAULT NULL COMMENT '创建时间',
+                                       `update_id` bigint DEFAULT NULL COMMENT '更新人id',
+                                       `update_time` bigint DEFAULT NULL COMMENT '更新时间',
+                                       PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='设备发货表';
+
+ALTER TABLE t_b_device_in_out CHANGE COLUMN usage_type usage_type VARCHAR(45)
+    COMMENT '用途类型（项目、其他）' NULL;
+
+INSERT INTO sys_role
+(id, org_id, name, enable, `type`, create_id, create_time, update_id, update_time, default_role, interpret)
+VALUES(12, NULL, '设备发货员', 1, 'DEVICE_DELIVERY', NULL, NULL, 443437441441857536, 1697621767961, 1, '系统角色');
+
+UPDATE sys_privilege
+SET name='出入库登记查询', url='deviceInOut', `type`='MENU', parent_id=36, `sequence`=2, property=NULL, related=NULL, enable=1, default_auth=0, front_display=1
+WHERE id=37;
+UPDATE sys_privilege
+SET name='设备资源监控', url='deviceControl', `type`='MENU', parent_id=36, `sequence`=3, property=NULL, related=NULL, enable=1, default_auth=0, front_display=1
+WHERE id=38;
+
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3053, '设备发货管理', 'deviceDelivery', 'MENU', 36, 1, NULL, NULL, 1, 0, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3054, '列表', 'List', 'LIST', 3053, 1, 'AUTH', NULL, 1, 0, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3055, '查询条件', 'Condition', 'CONDITION', 3053, 1, 'AUTH', NULL, 1, 0, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3056, '批量导入', 'BatchImport', 'BUTTON', 3053, 1, 'AUTH', NULL, 1, 0, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3057, '批量导出', 'BatchExport', 'BUTTON', 3053, 2, 'AUTH', NULL, 1, 0, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3058, '批量发货', 'BatchDeliver', 'BUTTON', 3053, 3, 'AUTH', NULL, 1, 0, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3059, '批量签收', 'BatchReceive', 'BUTTON', 3053, 4, 'AUTH', NULL, 1, 0, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3060, '批量作废', 'BatchCancel', 'BUTTON', 3053, 5, 'AUTH', NULL, 1, 0, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3061, '修改', 'Update', 'LINK', 3053, 1, 'AUTH', NULL, 1, 0, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3062, '作废', 'Cancel', 'LINK', 3053, 2, 'AUTH', NULL, 1, 0, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3063, '发货', 'Deliver', 'LINK', 3053, 3, 'AUTH', NULL, 1, 0, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3064, '签收', 'Receive', 'LINK', 3053, 4, 'AUTH', NULL, 1, 0, 1);

sop-business/src/main/resources/mapper/TBDeviceDeliveryMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qmth.sop.business.mapper.TBDeviceDeliveryMapper">
+
+</mapper>

sop-common/src/main/java/com/qmth/sop/common/contant/SystemConstant.java

@@ -253,6 +253,7 @@ public class SystemConstant {
     public static final String PREFIX_URL_SOP = "/admin/sop";
     public static final String PREFIX_URL_FXXK = "/open/fxxk";
     public static final String PREFIX_URL_SSO = "/sso";
+    public static final String PREFIX_URL_DEVICE_DELIVERY = "/admin/device/delivery";
 
     /**
      * 缓存配置

sop-common/src/main/java/com/qmth/sop/common/enums/DeviceDeliveryStatusEnum.java

@@ -0,0 +1,29 @@
+package com.qmth.sop.common.enums;
+
+/** 
+* @Description: 设备发货状态
+* @Param:  
+* @return:  
+* @Author: wangliang
+* @Date: 2023/11/28 
+*/ 
+public enum DeviceDeliveryStatusEnum {
+
+    UN_DELIVER("待发货"),
+
+    DELIVER("已发货"),
+
+    RECEIVE("已签收"),
+
+    CANCEL("作废");
+
+    DeviceDeliveryStatusEnum(String title) {
+        this.title = title;
+    }
+
+    private final String title;
+
+    public String getTitle() {
+        return title;
+    }
+}

sop-common/src/main/java/com/qmth/sop/common/enums/DeviceUsageTypeEnum.java

@@ -1,13 +1,13 @@
 package com.qmth.sop.common.enums;
 
 /**
- * @Description: 设备用户类型枚举
+ * @Description: 设备用途类型枚举
  * @Author: CaoZixuan
  * @Date: 2023-08-31
  */
 public enum DeviceUsageTypeEnum {
     PROJECT("项目"),
-    OTHER("其他")
+    OTHER("其它")
     ;
 
     DeviceUsageTypeEnum(String title) {

sop-common/src/main/java/com/qmth/sop/common/enums/DingStatusEnum.java

@@ -10,7 +10,7 @@ public enum DingStatusEnum {
     NO_SIGN("未打卡", "未打卡,显示未打卡"),
     RE_SIGN("补卡", "补卡,显示补卡"),
     RE_SIGN_ING("补卡中","显示补卡中"),
-    OTHER("在其他sop打卡", "显示'--'");
+    OTHER("在其它sop打卡", "显示'--'");
 
     DingStatusEnum(String title, String desc) {
         this.title = title;

sop-common/src/main/java/com/qmth/sop/common/enums/RoleTypeEnum.java

@@ -32,6 +32,8 @@ public enum RoleTypeEnum {
 
     THIRD_PMO("乙方总负责人", "系统角色"),
 
+    DEVICE_DELIVERY("设备发货员", "系统角色"),
+
     DEFINED("自定义", "自定义角色");
 
     RoleTypeEnum(String desc, String title) {