Parcourir la source

设备发货管理

wangliang il y a 1 an
Parent
commit
a990edd384

+ 1 - 0
sop-api/install/mysql/init/init.sql

@@ -1537,6 +1537,7 @@ CREATE TABLE `t_b_device_delivery` (
                                        `mailing_address` varchar(500) DEFAULT NULL COMMENT '邮寄地址',
                                        `mailing_address` varchar(500) DEFAULT NULL COMMENT '邮寄地址',
                                        `consignee` varchar(50) DEFAULT NULL COMMENT '收件人',
                                        `consignee` varchar(50) DEFAULT NULL COMMENT '收件人',
                                        `consignee_phone` varchar(30) DEFAULT NULL COMMENT '收件人联系电话',
                                        `consignee_phone` varchar(30) DEFAULT NULL COMMENT '收件人联系电话',
+                                       `express_no` varchar(50) DEFAULT NULL COMMENT '快递单号',
                                        `express_photo_path` varchar(500) DEFAULT NULL COMMENT '快递单拍照',
                                        `express_photo_path` varchar(500) DEFAULT NULL COMMENT '快递单拍照',
                                        `status` varchar(30) DEFAULT NULL COMMENT '状态,UN_DELIVER:待发货,DELIVER:已发货,RECEIVE:已签收,CANCEL:作废',
                                        `status` varchar(30) DEFAULT NULL COMMENT '状态,UN_DELIVER:待发货,DELIVER:已发货,RECEIVE:已签收,CANCEL:作废',
                                        `deliver_time` bigint DEFAULT NULL COMMENT '发货时间',
                                        `deliver_time` bigint DEFAULT NULL COMMENT '发货时间',

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

@@ -54,6 +54,9 @@ public class TBDeviceDelivery implements Serializable {
     @ApiModelProperty(value = "收件人联系电话")
     @ApiModelProperty(value = "收件人联系电话")
     private String consigneePhone;
     private String consigneePhone;
 
 
+    @ApiModelProperty(value = "快递单号")
+    private String expressNo;
+
     @ApiModelProperty(value = "快递单拍照")
     @ApiModelProperty(value = "快递单拍照")
     private String expressPhotoPath;
     private String expressPhotoPath;
 
 
@@ -77,6 +80,14 @@ public class TBDeviceDelivery implements Serializable {
     @ApiModelProperty(value = "是否启用,0:停用,1:启用")
     @ApiModelProperty(value = "是否启用,0:停用,1:启用")
     private Boolean enable;
     private Boolean enable;
 
 
+    public String getExpressNo() {
+        return expressNo;
+    }
+
+    public void setExpressNo(String expressNo) {
+        this.expressNo = expressNo;
+    }
+
     public Long getServiceId() {
     public Long getServiceId() {
         return serviceId;
         return serviceId;
     }
     }

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

@@ -2204,6 +2204,7 @@ CREATE TABLE `t_b_device_delivery` (
                                        `mailing_address` varchar(500) DEFAULT NULL COMMENT '邮寄地址',
                                        `mailing_address` varchar(500) DEFAULT NULL COMMENT '邮寄地址',
                                        `consignee` varchar(50) DEFAULT NULL COMMENT '收件人',
                                        `consignee` varchar(50) DEFAULT NULL COMMENT '收件人',
                                        `consignee_phone` varchar(30) DEFAULT NULL COMMENT '收件人联系电话',
                                        `consignee_phone` varchar(30) DEFAULT NULL COMMENT '收件人联系电话',
+                                       `express_no` varchar(50) DEFAULT NULL COMMENT '快递单号',
                                        `express_photo_path` varchar(500) DEFAULT NULL COMMENT '快递单拍照',
                                        `express_photo_path` varchar(500) DEFAULT NULL COMMENT '快递单拍照',
                                        `status` varchar(30) DEFAULT NULL COMMENT '状态,UN_DELIVER:待发货,DELIVER:已发货,RECEIVE:已签收,CANCEL:作废',
                                        `status` varchar(30) DEFAULT NULL COMMENT '状态,UN_DELIVER:待发货,DELIVER:已发货,RECEIVE:已签收,CANCEL:作废',
                                        `deliver_time` bigint DEFAULT NULL COMMENT '发货时间',
                                        `deliver_time` bigint DEFAULT NULL COMMENT '发货时间',