init
This commit is contained in:
3
sl-express-ms-work-domain/.gitignore
vendored
Normal file
3
sl-express-ms-work-domain/.gitignore
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
.idea
|
||||
target/
|
||||
*.iml
|
||||
35
sl-express-ms-work-domain/pom.xml
Normal file
35
sl-express-ms-work-domain/pom.xml
Normal file
@@ -0,0 +1,35 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.sl-express</groupId>
|
||||
<artifactId>sl-express-parent</artifactId>
|
||||
<version>1.4</version>
|
||||
</parent>
|
||||
|
||||
<groupId>com.sl-express.ms.work</groupId>
|
||||
<artifactId>sl-express-ms-work-domain</artifactId>
|
||||
<version>1.1-SNAPSHOT</version>
|
||||
<description>司机运单微服务-实体</description>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
<sl-express-common.version>1.2-SNAPSHOT</sl-express-common.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.sl-express.common</groupId>
|
||||
<artifactId>sl-express-common</artifactId>
|
||||
<version>${sl-express-common.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.xiaoymin</groupId>
|
||||
<artifactId>knife4j-spring-boot-starter</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.sl.ms.work.domain.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @author zzj
|
||||
* @version 1.0
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class CourierTaskCountDTO {
|
||||
|
||||
/**
|
||||
* 快递员
|
||||
*/
|
||||
private Long courierId;
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
private Long count;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
package com.sl.ms.work.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.sl.ms.work.domain.enums.pickupDispatchtask.*;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 取派件任务
|
||||
*
|
||||
* @author jpfss
|
||||
*/
|
||||
@Data
|
||||
public class PickupDispatchTaskDTO {
|
||||
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 关联订单id
|
||||
*/
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 任务类型,1为取件任务,2为派件任务
|
||||
*/
|
||||
private PickupDispatchTaskType taskType;
|
||||
|
||||
/**
|
||||
* 任务状态,1为待执行(对应 待上门和须交接)、2为进行中(该状态暂不使用,属于保留状态)、3为待确认(对应 待妥投和须交件)、4为已完成、5为已取消
|
||||
*/
|
||||
private PickupDispatchTaskStatus status;
|
||||
|
||||
/**
|
||||
* 签收状态(1为已签收,2为拒收)
|
||||
*/
|
||||
private PickupDispatchTaskSignStatus signStatus;
|
||||
|
||||
|
||||
/**
|
||||
* 签收人
|
||||
*/
|
||||
private SignRecipientEnum signRecipient;
|
||||
|
||||
/**
|
||||
* 网点ID
|
||||
*/
|
||||
private Long agencyId;
|
||||
|
||||
/**
|
||||
* 快递员ID
|
||||
*/
|
||||
private Long courierId;
|
||||
|
||||
/**
|
||||
* 预计开始时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime estimatedStartTime;
|
||||
|
||||
/**
|
||||
* 实际开始时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime actualStartTime;
|
||||
|
||||
/**
|
||||
* 预计完成时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime estimatedEndTime;
|
||||
|
||||
/**
|
||||
* 实际完成时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime actualEndTime;
|
||||
|
||||
/**
|
||||
* 取消时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime cancelTime;
|
||||
|
||||
/**
|
||||
* 任务分配状态(2已分配3待人工分配)
|
||||
*/
|
||||
private PickupDispatchTaskAssignedStatus assignedStatus;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String mark;
|
||||
|
||||
/**
|
||||
* 任务创建时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime created;
|
||||
|
||||
/**
|
||||
* 任务更新时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime updated;
|
||||
|
||||
/**
|
||||
* 删除:0-否,1-是
|
||||
*/
|
||||
private PickupDispatchTaskIsDeleted isDeleted;
|
||||
|
||||
|
||||
/**
|
||||
* 取消原因
|
||||
*/
|
||||
private PickupDispatchTaskCancelReason cancelReason;
|
||||
|
||||
/**
|
||||
* 取消原因具体描述
|
||||
*/
|
||||
private String cancelReasonDescription;
|
||||
|
||||
/**
|
||||
* id列表
|
||||
*/
|
||||
private List<Long> ids;
|
||||
/**
|
||||
* orderId 列表
|
||||
*/
|
||||
private List<Long> orderIds;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.sl.ms.work.domain.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 手动调整DTO
|
||||
*/
|
||||
@Data
|
||||
public class TaskTransportUpdateDTO {
|
||||
|
||||
@ApiModelProperty(value = "id")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value = "车次Id")
|
||||
private Long transportTripsId;
|
||||
|
||||
@ApiModelProperty(value = "车辆Id")
|
||||
private Long truckId;
|
||||
|
||||
@ApiModelProperty(value = "司机Id")
|
||||
private List<Long> driverIds;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.sl.ms.work.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.sl.ms.work.domain.enums.transportorder.TransportOrderSchedulingStatus;
|
||||
import com.sl.ms.work.domain.enums.transportorder.TransportOrderStatus;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
public class TransportOrderDTO {
|
||||
|
||||
//运单号
|
||||
private String id;
|
||||
//订单ID
|
||||
private Long orderId;
|
||||
//运单状态
|
||||
private TransportOrderStatus status;
|
||||
//调度状态调度状态
|
||||
private TransportOrderSchedulingStatus schedulingStatus;
|
||||
/**
|
||||
* 任务创建时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime created;
|
||||
|
||||
/**
|
||||
* 任务更新时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime updated;
|
||||
|
||||
//起始网点id
|
||||
private Long startAgencyId;
|
||||
//终点网点id
|
||||
private Long endAgencyId;
|
||||
//当前所在机构id
|
||||
private Long currentAgencyId;
|
||||
//下一个机构id
|
||||
private Long nextAgencyId;
|
||||
//完整的运输路线
|
||||
private String transportLine;
|
||||
//货品总体积
|
||||
private BigDecimal totalVolume;
|
||||
//货品总重量
|
||||
private BigDecimal totalWeight;
|
||||
//是否为拒收运单,默认非拒收
|
||||
private Boolean isRejection = false;
|
||||
}
|
||||
@@ -0,0 +1,109 @@
|
||||
package com.sl.ms.work.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.sl.ms.work.domain.enums.transporttask.TransportTaskAssignedStatus;
|
||||
import com.sl.ms.work.domain.enums.transporttask.TransportTaskLoadingStatus;
|
||||
import com.sl.ms.work.domain.enums.transporttask.TransportTaskStatus;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 运输任务
|
||||
*/
|
||||
@Data
|
||||
public class TransportTaskDTO {
|
||||
|
||||
@ApiModelProperty("id")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty("车辆计划id")
|
||||
private Long truckPlanId;
|
||||
|
||||
@ApiModelProperty("车次id")
|
||||
private Long transportTripsId;
|
||||
|
||||
@ApiModelProperty("起始机构id")
|
||||
private Long startAgencyId;
|
||||
|
||||
@ApiModelProperty("目的机构id")
|
||||
private Long endAgencyId;
|
||||
|
||||
@ApiModelProperty("任务状态,1为待执行(对应 待提货)、2为进行中(对应在途)、3为待确认(保留状态)、4为已完成(对应 已交付)、5为已取消")
|
||||
private TransportTaskStatus status;
|
||||
|
||||
@ApiModelProperty("任务分配状态(1未分配2已分配3待人工分配)")
|
||||
private TransportTaskAssignedStatus assignedStatus;
|
||||
|
||||
@ApiModelProperty("满载状态(1.半载2.满载3.空载)")
|
||||
private TransportTaskLoadingStatus loadingStatus;
|
||||
|
||||
@ApiModelProperty("车辆id")
|
||||
private Long truckId;
|
||||
|
||||
@ApiModelProperty("提货凭证")
|
||||
private String cargoPickUpPicture;
|
||||
|
||||
@ApiModelProperty("货物照片")
|
||||
private String cargoPicture;
|
||||
|
||||
@ApiModelProperty("运回单凭证")
|
||||
private String transportCertificate;
|
||||
|
||||
@ApiModelProperty("计划发车时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime planDepartureTime;
|
||||
|
||||
@ApiModelProperty("实际发车时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime actualDepartureTime;
|
||||
|
||||
@ApiModelProperty("计划到达时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime planArrivalTime;
|
||||
|
||||
@ApiModelProperty("实际到达时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime actualArrivalTime;
|
||||
|
||||
@ApiModelProperty("交付货物照片")
|
||||
private String deliverPicture;
|
||||
@ApiModelProperty("提货纬度")
|
||||
private String deliveryLatitude;
|
||||
@ApiModelProperty("提货经度")
|
||||
private String deliveryLongitude;
|
||||
@ApiModelProperty("交付纬度")
|
||||
private String deliverLatitude;
|
||||
@ApiModelProperty("交付经度")
|
||||
private String deliverLongitude;
|
||||
|
||||
@ApiModelProperty("任务创建时间")
|
||||
@JsonFormat(
|
||||
pattern = "yyyy-MM-dd HH:mm:ss"
|
||||
)
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@ApiModelProperty("运单id列表")
|
||||
private List<String> transportOrderIds;
|
||||
|
||||
@ApiModelProperty("运单数量")
|
||||
private Integer transportOrderCount;
|
||||
|
||||
@ApiModelProperty("页码")
|
||||
private Integer page;
|
||||
|
||||
@ApiModelProperty("页尺寸")
|
||||
private Integer pageSize;
|
||||
|
||||
@ApiModelProperty("id列表")
|
||||
private List<Long> ids;
|
||||
|
||||
@ApiModelProperty("距离,单位:米")
|
||||
private Double distance;
|
||||
|
||||
@ApiModelProperty("更新时间")
|
||||
private LocalDateTime updated;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package com.sl.ms.work.domain.dto.request;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.sl.ms.work.domain.enums.pickupDispatchtask.*;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@ApiModel("取派件任务分页查询")
|
||||
public class PickupDispatchTaskPageQueryDTO {
|
||||
@ApiModelProperty(value = "当前页数", example = "1", required = true)
|
||||
private Integer page;
|
||||
|
||||
@ApiModelProperty(value = "每页条数", example = "10", required = true)
|
||||
private Integer pageSize;
|
||||
|
||||
@ApiModelProperty("取派件任务id,可模糊查询")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty("订单id,可模糊查询")
|
||||
private Long orderId;
|
||||
|
||||
@ApiModelProperty("营业部id")
|
||||
private Long agencyId;
|
||||
|
||||
@ApiModelProperty("快递员id")
|
||||
private Long courierId;
|
||||
|
||||
@ApiModelProperty(value = "任务类型,1为取件任务,2为派件任务")
|
||||
private PickupDispatchTaskType taskType;
|
||||
|
||||
@ApiModelProperty(value = "任务状态,1为新任务、2为已完成、3为已取消")
|
||||
private PickupDispatchTaskStatus status;
|
||||
|
||||
@ApiModelProperty(value = "任务分配状态(2已分配,3待人工分配)")
|
||||
private PickupDispatchTaskAssignedStatus assignedStatus;
|
||||
|
||||
@ApiModelProperty(value = "签收状态(1为已签收,2为拒收)")
|
||||
private PickupDispatchTaskSignStatus signStatus;
|
||||
|
||||
@ApiModelProperty(value = "最小预计完成时间", example = "2022-08-15 00:00:00")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime minEstimatedEndTime;
|
||||
|
||||
@ApiModelProperty(value = "最大预计完成时间", example = "2022-08-15 00:00:00")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime maxEstimatedEndTime;
|
||||
|
||||
@ApiModelProperty(value = "最小实际完成时间", example = "2022-08-15 00:00:00")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime minActualEndTime;
|
||||
|
||||
@ApiModelProperty(value = "最大实际完成时间", example = "2022-08-15 00:00:00")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime maxActualEndTime;
|
||||
|
||||
@ApiModelProperty(value = "删除:0-否,1-是;不传则查全部")
|
||||
private PickupDispatchTaskIsDeleted isDeleted;
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.sl.ms.work.domain.dto.request;
|
||||
|
||||
import com.sl.ms.work.domain.enums.transportorder.TransportOrderSchedulingStatus;
|
||||
import com.sl.ms.work.domain.enums.transportorder.TransportOrderStatus;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class TransportOrderQueryDTO {
|
||||
@ApiModelProperty(value = "id")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "订单Id")
|
||||
private Long orderId;
|
||||
|
||||
@ApiModelProperty(value = "运单状态(1.新建 2.已装车,发往x转运中心 3.到达 4.到达终端网点 5.已签收 6.拒收))")
|
||||
private TransportOrderStatus status;
|
||||
|
||||
@ApiModelProperty(value = "调度状态调度状态(1.待调度2.未匹配线路3.已调度)")
|
||||
private TransportOrderSchedulingStatus schedulingStatus;
|
||||
|
||||
//起始网点id
|
||||
@ApiModelProperty(value = "起始网点id")
|
||||
private Long startAgencyId;
|
||||
|
||||
//终点网点id
|
||||
@ApiModelProperty(value = "终点网点id")
|
||||
private Long endAgencyId;
|
||||
|
||||
//当前所在机构id
|
||||
@ApiModelProperty(value = "当前所在机构id")
|
||||
private Long currentAgencyId;
|
||||
|
||||
@ApiModelProperty(value = "页码")
|
||||
private Integer page;
|
||||
|
||||
@ApiModelProperty(value = "页尺寸")
|
||||
private Integer pageSize;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.sl.ms.work.domain.dto.request;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@Data
|
||||
@ApiModel("运输任务完成")
|
||||
public class TransportTaskCompleteDTO {
|
||||
@ApiModelProperty(value = "运输任务id", required = true)
|
||||
@NotNull
|
||||
private String transportTaskId;
|
||||
|
||||
@ApiModelProperty(value = "交付凭证,多个图片url以逗号分隔", required = true)
|
||||
@NotNull
|
||||
private String transportCertificate;
|
||||
|
||||
@ApiModelProperty(value = "交付图片,多个图片url以逗号分隔", required = true)
|
||||
@NotNull
|
||||
private String deliverPicture;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.sl.ms.work.domain.dto.request;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@Data
|
||||
@ApiModel("延迟提货对象")
|
||||
public class TransportTaskDelayDeliveryDTO {
|
||||
@ApiModelProperty(value = "运输任务id", required = true)
|
||||
@NotNull(message = "运输任务id不能为空")
|
||||
private String transportTaskId;
|
||||
|
||||
@ApiModelProperty(value = "延迟时间", required = true, example = "2022-07-18 15:20:00")
|
||||
@NotNull(message = "延迟时间不能为空")
|
||||
private String delayTime;
|
||||
|
||||
@ApiModelProperty(value = "延迟原因", required = true)
|
||||
@NotNull(message = "延迟原因不能为空")
|
||||
private String delayReason;
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
package com.sl.ms.work.domain.dto.request;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 运输任务
|
||||
*/
|
||||
@Data
|
||||
public class TransportTaskPageQueryDTO {
|
||||
|
||||
@ApiModelProperty("id")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty("车辆计划id")
|
||||
private Long truckPlanId;
|
||||
|
||||
@ApiModelProperty("车次id")
|
||||
private Long transportTripsId;
|
||||
|
||||
@ApiModelProperty("起始机构id")
|
||||
private Long startAgencyId;
|
||||
|
||||
@ApiModelProperty("目的机构id")
|
||||
private Long endAgencyId;
|
||||
|
||||
@ApiModelProperty("任务状态,1为待执行(对应 待提货)、2为进行中(对应在途)、3为待确认(保留状态)、4为已完成(对应 已交付)、5为已取消")
|
||||
private Integer status;
|
||||
|
||||
@ApiModelProperty("任务分配状态(1未分配2已分配3待人工分配)")
|
||||
private Integer assignedStatus;
|
||||
|
||||
@ApiModelProperty("满载状态(1.半载2.满载3.空载)")
|
||||
private Integer loadingStatus;
|
||||
|
||||
@ApiModelProperty("车辆id")
|
||||
private Long truckId;
|
||||
|
||||
@ApiModelProperty("车辆id")
|
||||
private List<Long> truckIds;
|
||||
|
||||
@ApiModelProperty("计划发车时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime planDepartureTime;
|
||||
|
||||
@ApiModelProperty("实际发车时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime actualDepartureTime;
|
||||
|
||||
@ApiModelProperty("计划到达时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime planArrivalTime;
|
||||
|
||||
@ApiModelProperty("实际到达时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime actualArrivalTime;
|
||||
|
||||
|
||||
@ApiModelProperty("任务创建时间")
|
||||
@JsonFormat(
|
||||
pattern = "yyyy-MM-dd HH:mm:ss"
|
||||
)
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@ApiModelProperty("页码")
|
||||
private Integer page;
|
||||
|
||||
@ApiModelProperty("页尺寸")
|
||||
private Integer pageSize;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.sl.ms.work.domain.dto.request;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@Data
|
||||
@ApiModel("运输任务开始")
|
||||
public class TransportTaskStartDTO {
|
||||
@ApiModelProperty(value = "运输任务id", required = true)
|
||||
@NotNull
|
||||
private String transportTaskId;
|
||||
|
||||
@ApiModelProperty(value = "提货凭证,多个图片url以逗号分隔", required = true)
|
||||
@NotNull
|
||||
private String cargoPickUpPicture;
|
||||
|
||||
@ApiModelProperty(value = "货物照片,多个图片url以逗号分隔", required = true)
|
||||
@NotNull
|
||||
private String cargoPicture;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.sl.ms.work.domain.dto.response;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* @author zzj
|
||||
* @version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class OrderToTransportOrderDTO {
|
||||
|
||||
private String id; //运单号
|
||||
private Long orderId; //订单id
|
||||
private LocalDateTime created;//时间
|
||||
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.sl.ms.work.domain.dto.response;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@ApiModel("各类任务数量统计")
|
||||
@Data
|
||||
public class PickupDispatchTaskStatisticsDTO {
|
||||
@ApiModelProperty("取件任务数量")
|
||||
private Integer pickupNum = 0;
|
||||
|
||||
@ApiModelProperty("取件--待取件数量")
|
||||
private Integer newPickUpNum = 0;
|
||||
|
||||
@ApiModelProperty("取件--已取件数量")
|
||||
private Integer completePickUpNum = 0;
|
||||
|
||||
@ApiModelProperty("取件--取消数量")
|
||||
private Integer cancelPickUpNum = 0;
|
||||
|
||||
@ApiModelProperty("派件任务数量")
|
||||
private Integer dispatchNum = 0;
|
||||
|
||||
@ApiModelProperty("派件--待派件数量")
|
||||
private Integer newDispatchNum = 0;
|
||||
|
||||
@ApiModelProperty("派件--已签收数量")
|
||||
private Integer signedNum = 0;
|
||||
|
||||
@ApiModelProperty("派件--取消数量")
|
||||
private Integer cancelDispatchNum = 0;
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.sl.ms.work.domain.dto.response;
|
||||
|
||||
import com.sl.ms.work.domain.enums.transportorder.TransportOrderStatus;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @author zzj
|
||||
* @version 1.0
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TransportOrderStatusCountDTO {
|
||||
|
||||
@ApiModelProperty(value = "状态枚举", required = true)
|
||||
private TransportOrderStatus status;
|
||||
@ApiModelProperty(value = "状态编码", required = true)
|
||||
private Integer statusCode;
|
||||
@ApiModelProperty(value = "数量", required = true)
|
||||
private Long count;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.sl.ms.work.domain.dto.response;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
public class TransportTaskMonthlyDistanceDTO {
|
||||
@ApiModelProperty(value = "日期,格式:2022-07-16 00:00:00")
|
||||
private LocalDateTime dateTime;
|
||||
|
||||
@ApiModelProperty(value = "里程")
|
||||
private Double mileage;
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.sl.ms.work.domain.dto.response;
|
||||
|
||||
import com.sl.ms.work.domain.enums.transporttask.TransportTaskStatus;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @author zzj
|
||||
* @version 1.0
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TransportTaskStatusCountDTO {
|
||||
|
||||
@ApiModelProperty(value = "状态枚举", required = true)
|
||||
private TransportTaskStatus status;
|
||||
@ApiModelProperty(value = "状态编码", required = true)
|
||||
private Integer statusCode;
|
||||
@ApiModelProperty(value = "数量", required = true)
|
||||
private Long count;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
package com.sl.ms.work.domain.enums;
|
||||
|
||||
import cn.hutool.core.util.EnumUtil;
|
||||
import com.sl.transport.common.enums.BaseExceptionEnum;
|
||||
|
||||
/**
|
||||
* 异常枚举
|
||||
*
|
||||
* @author zzj
|
||||
* @version 1.0
|
||||
*/
|
||||
public enum WorkExceptionEnum implements BaseExceptionEnum {
|
||||
|
||||
ORDER_NOT_FOUND(1001, "订单不存在"),
|
||||
ORDER_LOCATION_NOT_FOUND(1002, "订单位置信息不存在"),
|
||||
TRANSPORT_LINE_NOT_FOUND(1003, "没有查询到路线"),
|
||||
ORDER_CARGO_NOT_FOUND(1004, "订单中的货物信息不存在"),
|
||||
TRANSPORT_ORDER_SAVE_ERROR(1006, "订单转运单出错"),
|
||||
TRANSPORT_ORDER_NOT_FOUND(1007, "运单不存在"),
|
||||
TRANSPORT_ORDER_STATUS_NOT_CREATED(1008, "更新运单状态不能更新成 CREATED 状态"),
|
||||
TRANSPORT_TASK_NOT_FOUND(1009, "运输任务不存在"),
|
||||
DRIVER_JOB_SAVE_ERROR(1010, "司机作业单保存失败"),
|
||||
DRIVER_JOB_NOT_FOUND(1011, "司机作业单不存在"),
|
||||
DRIVER_JOB_STATUS_NOT_PENDING(1012, "更新司机作业单不能更新成 PENDING 状态"),
|
||||
TRANSPORT_TASK_QUERY_PARAM_ERROR(1013, "查询运输任务的参数不正确"),
|
||||
TRANSPORT_TASK_STATUS_NOT_PENDING(1014, "更新运输任务不能更新成 PENDING 状态"),
|
||||
PICKUP_DISPATCH_TASK_SAVE_ERROR(1015, "新增取派件任务失败"),
|
||||
PICKUP_DISPATCH_TASK_NOT_FOUND(1016, "取派件任务不存在"),
|
||||
PICKUP_DISPATCH_TASK_STATUS_NOT_NEW(1017, "取派件任务不能更新成 NEW 状态"),
|
||||
PICKUP_DISPATCH_TASK_PARAM_ERROR(1018, "取派件任务的参数不正确"),
|
||||
UPDATE_COURIER_PARAM_ERROR(1019, "改派快递员,任务id、目标快递员id不能空"),
|
||||
UPDATE_COURIER_EQUAL_PARAM_ERROR(1020, "改派快递员,原id和目标id不能相同"),
|
||||
UPDATE_COURIER_ID_PARAM_ERROR(1021, "改派快递员,原快递员id不正确"),
|
||||
TRANSPORT_TASK_UPDATE_PARAM_ERROR(1022, "更新运输任务的参数不正确"),
|
||||
TRANSPORT_TASK_CANCEL_FAILED(1022, "运输任务有关联运单,不可取消!");
|
||||
|
||||
private Integer code;
|
||||
private Integer status;
|
||||
private String value;
|
||||
|
||||
WorkExceptionEnum(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
this.status = 500;
|
||||
}
|
||||
|
||||
WorkExceptionEnum(Integer code, Integer status, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public static WorkExceptionEnum codeOf(Integer code) {
|
||||
return EnumUtil.getBy(WorkExceptionEnum::getCode, code);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getCode() {
|
||||
return this.code;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getValue() {
|
||||
return this.value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getStatus() {
|
||||
return this.status;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
package com.sl.ms.work.domain.enums.driverjob;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 司机任务状态
|
||||
*
|
||||
* @author itcast
|
||||
*/
|
||||
public enum DriverJobStatus implements BaseEnum {
|
||||
/**
|
||||
* 待执行,对应 待提货
|
||||
*/
|
||||
PENDING(1, "待执行"),
|
||||
/**
|
||||
* 进行中,对应 在途
|
||||
*/
|
||||
PROCESSING(2, "进行中"),
|
||||
/**
|
||||
* 改派,对应已交付
|
||||
*/
|
||||
CONFIRM(3, "改派"),
|
||||
/**
|
||||
* 已完成,对应 已交付
|
||||
*/
|
||||
COMPLETED(4, "已完成"),
|
||||
/**
|
||||
* 已作废
|
||||
*/
|
||||
CANCELLED(5, "已作废");
|
||||
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@EnumValue
|
||||
@JsonValue
|
||||
private final Integer code;
|
||||
/**
|
||||
* 类型值
|
||||
*/
|
||||
private final String value;
|
||||
|
||||
DriverJobStatus(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.sl.ms.work.domain.enums.pickupDispatchtask;
|
||||
|
||||
import cn.hutool.core.util.EnumUtil;
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 取派件任务分配状态
|
||||
*/
|
||||
public enum PickupDispatchTaskAssignedStatus implements BaseEnum {
|
||||
/**
|
||||
* 已分配
|
||||
*/
|
||||
DISTRIBUTED(2, "已分配"),
|
||||
/**
|
||||
* 待人工分配
|
||||
*/
|
||||
MANUAL_DISTRIBUTED(3, "待人工分配");
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@EnumValue
|
||||
@JsonValue
|
||||
private final Integer code;
|
||||
/**
|
||||
* 类型值
|
||||
*/
|
||||
private final String value;
|
||||
|
||||
PickupDispatchTaskAssignedStatus(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public static PickupDispatchTaskAssignedStatus codeOf(Integer code) {
|
||||
return EnumUtil.getBy(PickupDispatchTaskAssignedStatus::getCode, code);
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
package com.sl.ms.work.domain.enums.pickupDispatchtask;
|
||||
|
||||
import cn.hutool.core.util.EnumUtil;
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 取派件任务取消原因
|
||||
*/
|
||||
public enum PickupDispatchTaskCancelReason implements BaseEnum {
|
||||
|
||||
MALICIOUS_ORDER(1, "用户恶意下单"),
|
||||
CANCEL_BY_USER(2, "用户取消投递"),
|
||||
FORBIDDEN_GOODS(3, "禁用品"),
|
||||
REPEAT_ORDER(4, "重复下单"),
|
||||
UNABLE_TO_CONTACT(5, "无法联系上客户(空号、停机等)"),
|
||||
FALSE_ADDRESS(6, "虚假地址"),
|
||||
ADDRESS_MISMATCH(7, "实际发货地址与下单地址不符"),
|
||||
RETURN_TO_AGENCY(8, "因个人无法取件,退回到网点");
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@EnumValue
|
||||
@JsonValue
|
||||
private final Integer code;
|
||||
/**
|
||||
* 类型值
|
||||
*/
|
||||
private final String value;
|
||||
|
||||
PickupDispatchTaskCancelReason(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public static PickupDispatchTaskCancelReason codeOf(Integer code) {
|
||||
return EnumUtil.getBy(PickupDispatchTaskCancelReason::getCode, code);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package com.sl.ms.work.domain.enums.pickupDispatchtask;
|
||||
|
||||
import cn.hutool.core.util.EnumUtil;
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 取派件任务状态
|
||||
*/
|
||||
public enum PickupDispatchTaskIsDeleted implements BaseEnum {
|
||||
|
||||
/**
|
||||
* 未删除
|
||||
*/
|
||||
NOT_DELETED(0, "未删除"),
|
||||
/**
|
||||
* 已删除
|
||||
*/
|
||||
IS_DELETED(1, "已删除");
|
||||
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@EnumValue
|
||||
@JsonValue
|
||||
private final Integer code;
|
||||
/**
|
||||
* 类型值
|
||||
*/
|
||||
private final String value;
|
||||
|
||||
PickupDispatchTaskIsDeleted(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public static PickupDispatchTaskIsDeleted codeOf(Integer code) {
|
||||
return EnumUtil.getBy(PickupDispatchTaskIsDeleted::getCode, code);
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
package com.sl.ms.work.domain.enums.pickupDispatchtask;
|
||||
|
||||
import cn.hutool.core.util.EnumUtil;
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 取派件任务签收状态
|
||||
*/
|
||||
public enum PickupDispatchTaskSignStatus implements BaseEnum {
|
||||
|
||||
/**
|
||||
* 未签收
|
||||
*/
|
||||
NOT_SIGNED(0, "未签收"),
|
||||
|
||||
/**
|
||||
* 已签收
|
||||
*/
|
||||
RECEIVED(1, "已签收"),
|
||||
/**
|
||||
* 拒收
|
||||
*/
|
||||
REJECTION(2, "拒收");
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@EnumValue
|
||||
@JsonValue
|
||||
private final Integer code;
|
||||
/**
|
||||
* 类型值
|
||||
*/
|
||||
private final String value;
|
||||
|
||||
PickupDispatchTaskSignStatus(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public static PickupDispatchTaskSignStatus codeOf(Integer code) {
|
||||
return EnumUtil.getBy(PickupDispatchTaskSignStatus::getCode, code);
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package com.sl.ms.work.domain.enums.pickupDispatchtask;
|
||||
|
||||
import cn.hutool.core.util.EnumUtil;
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 取派件任务状态
|
||||
*/
|
||||
public enum PickupDispatchTaskStatus implements BaseEnum {
|
||||
|
||||
NEW(1, "新任务"),
|
||||
COMPLETED(2, "已完成"),
|
||||
CANCELLED(3, "已取消");
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@JsonValue
|
||||
@EnumValue
|
||||
private final Integer code;
|
||||
/**
|
||||
* 类型值
|
||||
*/
|
||||
private final String value;
|
||||
|
||||
PickupDispatchTaskStatus(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public static PickupDispatchTaskStatus codeOf(Integer code) {
|
||||
return EnumUtil.getBy(PickupDispatchTaskStatus::getCode, code);
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.sl.ms.work.domain.enums.pickupDispatchtask;
|
||||
|
||||
import cn.hutool.core.util.EnumUtil;
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 取派件任务类型
|
||||
*/
|
||||
public enum PickupDispatchTaskType implements BaseEnum {
|
||||
/**
|
||||
* 取件任务
|
||||
*/
|
||||
PICKUP(1, "取件任务"),
|
||||
|
||||
/**
|
||||
* 派件任务
|
||||
*/
|
||||
DISPATCH(2, "派件任务");
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@EnumValue
|
||||
@JsonValue
|
||||
private final Integer code;
|
||||
/**
|
||||
* 类型值
|
||||
*/
|
||||
private final String value;
|
||||
|
||||
PickupDispatchTaskType(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public static PickupDispatchTaskType codeOf(Integer code) {
|
||||
return EnumUtil.getBy(PickupDispatchTaskType::getCode, code);
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package com.sl.ms.work.domain.enums.pickupDispatchtask;
|
||||
|
||||
import cn.hutool.core.util.EnumUtil;
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 签收人
|
||||
*/
|
||||
public enum SignRecipientEnum implements BaseEnum {
|
||||
|
||||
OWN(1, "本人"),
|
||||
OTHER(2, "他人");
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@JsonValue
|
||||
@EnumValue
|
||||
private final Integer code;
|
||||
/**
|
||||
* 类型值
|
||||
*/
|
||||
private final String value;
|
||||
|
||||
SignRecipientEnum(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public static SignRecipientEnum codeOf(Integer code) {
|
||||
return EnumUtil.getBy(SignRecipientEnum::getCode, code);
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.sl.ms.work.domain.enums.transportorder;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 运单-调度状态
|
||||
*/
|
||||
|
||||
public enum TransportOrderSchedulingStatus implements BaseEnum {
|
||||
|
||||
TO_BE_SCHEDULED(1, "待调度"),
|
||||
NO_MATCH_TRANSPORT_LINE(2, "未匹配到线路"),
|
||||
SCHEDULED(3, "已调度");
|
||||
|
||||
@EnumValue
|
||||
@JsonValue
|
||||
private final Integer code;
|
||||
private final String value;
|
||||
TransportOrderSchedulingStatus(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
package com.sl.ms.work.domain.enums.transportorder;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 运单-状态
|
||||
*/
|
||||
public enum TransportOrderStatus implements BaseEnum {
|
||||
|
||||
CREATED(1, "新建"),
|
||||
LOADED(2, "已装车"),
|
||||
PROCESSING(3, "运输中"),
|
||||
ARRIVED_END(4, "到达终端网点"),
|
||||
REJECTED(6, "拒收");
|
||||
|
||||
@EnumValue
|
||||
@JsonValue
|
||||
private final Integer code;
|
||||
private final String value;
|
||||
|
||||
TransportOrderStatus(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package com.sl.ms.work.domain.enums.transporttask;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 运输任务分配状态
|
||||
*/
|
||||
public enum TransportTaskAssignedStatus implements BaseEnum {
|
||||
/**
|
||||
* 已分配
|
||||
*/
|
||||
DISTRIBUTED(2, "已分配"),
|
||||
/**
|
||||
* 待人工分配
|
||||
*/
|
||||
MANUAL_DISTRIBUTED(3, "待人工分配");
|
||||
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@EnumValue
|
||||
@JsonValue
|
||||
private final Integer code;
|
||||
/**
|
||||
* 类型值
|
||||
*/
|
||||
private final String value;
|
||||
|
||||
TransportTaskAssignedStatus(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package com.sl.ms.work.domain.enums.transporttask;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 运输任务满载状态
|
||||
*
|
||||
* @author itcast
|
||||
*/
|
||||
|
||||
public enum TransportTaskLoadingStatus implements BaseEnum {
|
||||
|
||||
/**
|
||||
* 半载
|
||||
*/
|
||||
HALF(1, "半载"),
|
||||
|
||||
/**
|
||||
* 满载
|
||||
*/
|
||||
FULL(2, "满载"),
|
||||
|
||||
/**
|
||||
* 空载
|
||||
*/
|
||||
EMPTY(3, "空载");
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@EnumValue
|
||||
@JsonValue
|
||||
private final Integer code;
|
||||
/**
|
||||
* 类型值
|
||||
*/
|
||||
private final String value;
|
||||
|
||||
TransportTaskLoadingStatus(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package com.sl.ms.work.domain.enums.transporttask;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.sl.transport.common.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
* 运输任务状态
|
||||
*
|
||||
* @author itcast
|
||||
*/
|
||||
public enum TransportTaskStatus implements BaseEnum {
|
||||
/**
|
||||
* 待执行,对应 待提货
|
||||
*/
|
||||
PENDING(1, "待执行"),
|
||||
/**
|
||||
* 进行中,对应 在途
|
||||
*/
|
||||
PROCESSING(2, "进行中"),
|
||||
/**
|
||||
* 待确认,保留状态
|
||||
*/
|
||||
CONFIRM(3, "待确认"),
|
||||
/**
|
||||
* 已完成,对应 已交付
|
||||
*/
|
||||
COMPLETED(4, "已完成"),
|
||||
/**
|
||||
* 已取消
|
||||
*/
|
||||
CANCELLED(5, "已取消");
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@EnumValue
|
||||
@JsonValue
|
||||
private final Integer code;
|
||||
/**
|
||||
* 类型值
|
||||
*/
|
||||
private final String value;
|
||||
|
||||
TransportTaskStatus(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user