tms

upcloud-jxqn-tms-parent-test/.gitignore

@@ -0,0 +1,13 @@
+/.project
+/.settings
+/.idea
+/upcloud-rdc-tms-business-service/upcloud-rdc-tms-business-service.iml
+/upcloud-rdc-tms-interface-service/upcloud-rdc-tms-interface-service.iml
+/upcloud-rdc-tms-maindata-service/upcloud-rdc-tms-maindata-service.iml
+/upcloud-jxqn-tms-rmi/upcloud-jxqn-tms-rmi.iml
+/upcloud-rdc-tms-business-service/src/main/resources/rebel.xml
+/upcloud-jxqn-tms-common-domain/upcloud-jxqn-tms-common-domain.iml
+/upcloud-jxqn-tms-parent.iml
+/rebel.xml
+/upcloud-rdc-tms-app-service/upcloud-rdc-tms-app-service.iml
+/upcloud-rdc-tms-bms-service/upcloud-rdc-tms-bms-service.iml

upcloud-jxqn-tms-parent-test/README.md

@@ -0,0 +1,3 @@
+# upcloud-jxqn-tms-parent
+
+江西青牛TMS微服务项目

upcloud-jxqn-tms-parent-test/docker/Dockerfile

@@ -0,0 +1,22 @@
+FROM 192.168.1.60:5000/oracle/serverjre:1.8.0_241-b07
+MAINTAINER www.prolog-int.com
+ARG RUN_ENV
+ENV RUN_ENV=$RUN_ENV
+
+
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' >/etc/timezone
+
+RUN mkdir /usr/local/apps
+RUN mkdir /usr/local/logs
+
+COPY ./*.jar /usr/local/apps
+
+COPY ./Entrypoint.sh /usr/local
+
+RUN chmod +x /usr/local/Entrypoint.sh
+
+WORKDIR /usr/local
+
+ENTRYPOINT ["/usr/local/Entrypoint.sh"]
+CMD ["${RUN_ENV}"]

upcloud-jxqn-tms-parent-test/docker/Entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+#echo "success"
+#nohup java -Xms1g -Xmx1g -Xmn512m -Xss256k
+env=$1
+#java -Xms1g -Xmx2g -Xmn512m -Xss256k -Djava.security.egd=file:/dev/./urandom -jar /usr/local/apps/*.jar --spring.profiles.active=$env
+java -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -Xms2g -Xmx4g -Xmn256m -Xss256k -XX:SurvivorRatio=8 -Djava.security.egd=file:/dev/./urandom -jar /usr/local/apps/*.jar --spring.profiles.active=$env

upcloud-jxqn-tms-parent-test/docker/up-for-docker.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+# Program:
+#   This program show docker image status.
+# Parameters:
+#   $1 container-name,such as plg-wms-basic
+#   $2 image-name,such as plg-eureka:1.0.0
+
+containerName=$1
+version=$2
+env=$3
+
+existContainer=`docker ps --format "{{.Names}}" | grep -w "$containerName" | head -n 1`
+if [ -n "$existContainer" ]; then
+  imageName=`docker ps --format "{{.Image}} {{.Names}}" | grep -w "$containerName" | awk '{ print $1 }' `
+  echo '=== Exist container '"$existContainer : $imageName"
+  docker stop "$existContainer"
+fi
+
+existStopContainer=`docker ps -a --format "{{.Names}}" | grep -w "$containerName" | head -n 1`
+if [ -n "$existStopContainer" ]; then
+  echo "=== Remove container ""$existStopContainer"
+  docker rm "$existStopContainer"
+fi
+
+if [ -n "$imageName" ]; then
+  existImage=`docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "$imageName" | head -n 1`
+  if [ -n "$existImage" ]; then
+    echo "=== Remove image ""$existImage"
+    docker rmi "$imageName"
+  fi
+fi
+
+existNewImage=`docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "$containerName":"$version" | head -n 1`
+if [ -n "$existNewImage" ]; then
+  echo "=== Remove new image which exist ""$existNewImage"
+  docker rmi "$existNewImage"
+fi
+
+existNewImage=`docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "$containerName":"$version" | head -n 1`
+if [ -z "$existNewImage" ]; then
+  docker build --build-arg RUN_ENV="$env" -t "$containerName":"$version" .
+fi
+
+existNewImage=`docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "$containerName":"$version" | head -n 1`
+if [ -n "$existNewImage" ]; then
+  echo "=== Run image ""$version"
+  docker run --network host --restart=always --name "$containerName" -v /data/logs:/usr/local/logs -v /data/nginx/html/upcloud-tms-fe/images:/usr/local/images/tms -d "$containerName":"$version"
+fi
+
+echo "=== over ==="
+exit 0

upcloud-jxqn-tms-parent-test/pom.xml

@@ -0,0 +1,73 @@
+<?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">
+    <!-- xms替换为您的应用场景，如:wms,oms. xxx替换为您的功能服务名，如:basic,maindata -->
+    <!-- 如果是项目，把std替换为项目名，如: 仁科项目, upcloud-xms-xxx-zencor-parent,2.0.0.zencor-SNAPSHOT -->
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.prolog.rdc</groupId>
+    <artifactId>upcloud-jxqn-tms-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <modules>
+        <module>upcloud-jxqn-tms-common-domain</module>
+        <module>upcloud-jxqn-tms-rmi</module>
+        <module>upcloud-rdc-tms-app-service</module>
+        <module>upcloud-rdc-tms-business-service</module>
+        <module>upcloud-rdc-tms-maindata-service</module>
+        <module>upcloud-rdc-tms-interface-service</module>
+		<module>upcloud-rdc-tms-bms-service</module>
+    </modules>
+    <packaging>pom</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <lombok.version>1.18.8</lombok.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.prolog.product.core</groupId>
+                <artifactId>upcloud-product-core-parent</artifactId>
+                <version>4.1.0.std-SNAPSHOT</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>dm.jdbc</groupId>
+            <artifactId>DmJdbcDriver</artifactId>
+            <version>18</version>
+        </dependency>
+    </dependencies>
+
+
+    <distributionManagement>
+        <repository>
+            <id>releases</id>
+            <url>http://192.168.0.167:8081/repository/releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>snapshots</id>
+            <url>http://192.168.0.167:8081/repository/snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+</project>

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>upcloud-jxqn-tms-parent</artifactId>
+        <groupId>com.prolog.rdc</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>upcloud-jxqn-tms-common-domain</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <!-- 主依赖，包含FX2.0.1.beta,及hutool,lombok,i18n等 -->
+        <dependency>
+            <groupId>com.prolog.product.core</groupId>
+            <artifactId>upcloud-product-core-full-starter</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.prolog.cs.platform.power</groupId>
+            <artifactId>plg-platform-power-facade</artifactId>
+            <version>1.0.1.beta</version>
+        </dependency>
+        
+                <!-- Excel导入导出功能封装，具体请参考文档，如果本服务不涉及excel操作，可以去除 -->
+        <dependency>
+            <groupId>com.prolog.product.core</groupId>
+            <artifactId>upcloud-product-core-easyexcel</artifactId>
+        </dependency>
+            
+    </dependencies>
+
+</project>

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/constant/RedisConstant.java

@@ -0,0 +1,33 @@
+package com.prolog.rdc.tms.model.constant;
+
+/**
+ * 
+ *
+ * 序列号常量
+ *
+ * @className :SeriaNnumberConstant
+ * @author :fanzw
+ * @creationTime :2022/02/24
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/02/24
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+public class RedisConstant {
+
+	/**
+	 * PULL_GPS_DEVICE_G7_KEY
+	 */
+	public static final String PULL_GPS_DEVICE_G7_KEY = "PULL_GPS_DEVICE_G7_KEY";
+
+	/**
+	 * PULL_GPS_DEVICE_E6_KEY
+	 */
+	public static final String PULL_GPS_DEVICE_E6_KEY = "PULL_GPS_DEVICE_E6_KEY";
+
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/ApprovalBusDetailDTO.java

@@ -0,0 +1,28 @@
+package com.prolog.rdc.tms.model.dto;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 审批业务明细DTO
+ *
+ * Company: 湖北普罗格科技股份有限公司
+ *
+ * @author zhangsj
+ * @since 2022/5/11 17:30
+ */
+@Data
+@ApiModel("审批业务明细DTO")
+public class ApprovalBusDetailDTO implements Serializable {
+
+	private static final long serialVersionUID = -4045366341654597022L;
+
+	@ApiModelProperty(value = "节点审批者类型 数据字典 NODE_APPROVER_TYPE 1 角色 2 用户")
+	private Integer nodeApproverType;
+
+	@ApiModelProperty(value = "审批方式  数据字典 NODE_APPROVAL_TYPE: 1 会签 2 或签")
+	private Integer nodeApprovalType;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/DeviceByOneDTO.java

@@ -0,0 +1,134 @@
+package com.prolog.rdc.tms.model.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Company: 湖北普罗格科技股份有限公司
+ *
+ * @author zhangsj
+ * @since 2022/3/16 12:14
+ */
+@Data
+public class DeviceByOneDTO implements Serializable {
+
+	private static final long serialVersionUID = -3883039187546503269L;
+
+	@ApiModelProperty(value = "设备ID")
+	private Long id;
+
+	@ApiModelProperty(value = "设备编号")
+	private String code;
+
+	@ApiModelProperty(value = "设备名称")
+	private String name;
+
+	@ApiModelProperty(value = "设备类型")
+	private Integer type;
+
+	@ApiModelProperty(value = "设备类型名称")
+	private String typeName;
+
+	@ApiModelProperty(value = "物流中心/仓ID")
+	private Long branchId;
+
+	@ApiModelProperty(value = "物流中心/仓编号")
+	private String branchCode;
+
+	@ApiModelProperty(value = "物流中心/仓名称")
+	private String branchName;
+
+	@ApiModelProperty(value = "设备生产商")
+	private Integer company;
+
+	@ApiModelProperty(value = "设备生产商名称")
+	private String companyName;
+
+	@ApiModelProperty(value = "状态(0：停用 1：启用)")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态名称")
+	private String statusName;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/DriverledgerBillDTO.java

@@ -0,0 +1,413 @@
+package com.prolog.rdc.tms.model.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ * 司机台账DTO
+ *
+ * @className :DriverledgerBillDTO
+ * @author :fanzw
+ * @date :2023/4/25
+ * @description :
+ *
+ * @version :1.2.1
+ *
+ */
+@Data
+public class DriverledgerBillDTO implements Serializable {
+
+	private static final long serialVersionUID = 4788261585754574876L;
+
+	@ApiModelProperty(value = "支出费用单ID")
+	private Long id;
+
+	@ApiModelProperty(value = "单据编号 运单编号/派车单编号")
+	private String billNo;
+
+	@ApiModelProperty(value = "单据ID")
+	private Long billId;
+
+	@ExcelProperty(value = "派车单号")
+	@ApiModelProperty(value = "派车单号")
+	private String loadingBillNo;
+
+	@ApiModelProperty(value = "派车单状态 数据字典：LOADING_BILL_STATUS:10未审核 20已审核")
+	private Integer status;
+
+	@ApiModelProperty(value = "派车单状态")
+	private String statusName;
+
+	@ExcelProperty(value = "计费单据")
+	@ApiModelProperty(value = "计费单据")
+	private Integer feeCltType;
+
+	@ExcelProperty(value = "计费单据")
+	@ApiModelProperty(value = "计费单据")
+	private String feeCltTypeName;
+
+	@ApiModelProperty(value = "货主ID")
+	private Long cargoOwnerId;
+
+	@ApiModelProperty(value = "货主编码")
+	private String cargoOwnerCode;
+
+	@ExcelProperty(value = "货主")
+	@ApiModelProperty(value = "货主名称")
+	private String cargoOwnerName;
+
+	@ApiModelProperty(value = "结算部门ID")
+	private String settlementDepartmentId;
+
+	@ApiModelProperty(value = "结算部门编码")
+	private String settlementDepartmentCode;
+
+	@ExcelProperty(value = "结算部门名称")
+	@ApiModelProperty(value = "结算部门名称")
+	private String settlementDepartment;
+
+	@ExcelProperty(value = "调度日期")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "调度时间")
+	private Date loadingDate;
+
+	@ExcelProperty(value = "调度审核日期")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "调度审核时间")
+	private Date loadingAuditDate;
+
+	@ExcelProperty(value = "分组名称")
+	@ApiModelProperty(value = "分组名称")
+	private String groupName;
+
+	@ExcelProperty(value = "配送线路")
+	@ApiModelProperty(value = "配送线路")
+	private String deliveryLines;
+
+	@ExcelProperty(value = "站点线路")
+	@ApiModelProperty(value = "站点线路")
+	private String stationLines;
+
+	@ApiModelProperty(value = "地图公里数")
+	private BigDecimal totalMileageMap;
+
+	@ExcelProperty(value = "提货区域")
+	@ApiModelProperty(value = "提货区域")
+	private String pickUpAreas;
+
+	@ExcelProperty(value = "配送区域")
+	@ApiModelProperty(value = "配送区域")
+	private String deliveryAreas;
+
+	@ApiModelProperty(value = "支出件数")
+	private BigDecimal totalPayPcs;
+
+	@ApiModelProperty(value = "支出体积")
+	private BigDecimal totalPayVolume;
+
+	@ApiModelProperty(value = "支出重量")
+	private BigDecimal totalPayWeight;
+
+	@ApiModelProperty(value = "支出公里数")
+	private BigDecimal totalPayMileage;
+
+	@ApiModelProperty(value = "支出地图公里数")
+	private BigDecimal totalPayMileageMap;
+
+	@ApiModelProperty(value = "支出计费类型 10:按运单计费  20:按派车单计费 30:未匹配到价格")
+	private Integer payFeeCltType;
+
+	@ApiModelProperty(value = "支出计费类型 10:按运单计费  20:按派车单计费 30:未匹配到价格")
+	private String payFeeCltTypeName;
+
+	@ApiModelProperty(value = "司机ID")
+	private Long driverId;
+
+	@ApiModelProperty(value = "司机编号")
+	private String driverCode;
+
+	@ExcelProperty(value = "司机姓名")
+	@ApiModelProperty(value = "司机名称")
+	private String driverName;
+
+	@ExcelProperty(value = "司机手机号")
+	@ApiModelProperty(value = "司机手机号")
+	private String driverPhoneNumber;
+
+	@ApiModelProperty(value = "承运方ID")
+	private Long carrierId;
+
+	@ApiModelProperty(value = "承运方编码")
+	private String carrierCode;
+
+	@ApiModelProperty(value = "承运方名称")
+	private String carrierName;
+
+	@ApiModelProperty(value = "送货员ID")
+	private Long deliverymanId;
+
+	@ApiModelProperty(value = "送货员编号")
+	private String deliverymanCode;
+
+	@ExcelProperty(value = "送货员姓名")
+	@ApiModelProperty(value = "送货员名称")
+	private String deliverymanName;
+
+	@ExcelProperty(value = "送货员手机号")
+	@ApiModelProperty(value = "送货员手机号")
+	private String deliverymanPhoneNumber;
+
+	@ApiModelProperty(value = "车辆ID")
+	private Long vehicleId;
+
+	@ApiModelProperty(value = "车辆编号")
+	private String vehicleCode;
+
+	@ApiModelProperty(value = "车辆名称")
+	private String vehicleName;
+
+	@ExcelProperty(value = "车牌号")
+	@ApiModelProperty(value = "车牌号")
+	private String vehiclePlateNumber;
+
+	@ApiModelProperty(value = "车辆隶属机构ID")
+	private String vehicleAffiliationId;
+
+	@ApiModelProperty(value = "车辆隶属机构CODE")
+	private String vehicleAffiliationCode;
+
+	@ApiModelProperty(value = "车辆隶属机构名称")
+	private String vehicleAffiliationName;
+
+	@ApiModelProperty(value = "车辆归属")
+	private Integer vehicleAscription;
+
+	@ExcelProperty(value = "车辆归属")
+	@ApiModelProperty(value = "车辆归属")
+	private String vehicleAscriptionName;
+
+	@ApiModelProperty(value = "车型ID")
+	private Long vehicleTypeId;
+
+	@ApiModelProperty(value = "车型编码")
+	private String vehicleTypeCode;
+
+	@ExcelProperty(value = "车型")
+	@ApiModelProperty(value = "车型名称")
+	private String vehicleTypeName;
+
+	@ApiModelProperty(value = "车辆类别数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+	private String vehicleTypeCategory;
+
+	@ExcelProperty(value = "车辆类别")
+	@ApiModelProperty(value = "车辆类别数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+	private String vehicleTypeCategoryName;
+
+	@ExcelProperty(value = "载重")
+	@ApiModelProperty(value = "载重(kg)")
+	private BigDecimal vehicleWeight;
+
+	@ExcelProperty(value = "载重装载率")
+	@ApiModelProperty(value = "配载重量装载率")
+	private String weightLoadingRate;
+
+	@ExcelProperty(value = "载方")
+	@ApiModelProperty(value = "载方(m³)")
+	private BigDecimal vehicleVolume;
+
+	@ExcelProperty(value = "载方装载率")
+	@ApiModelProperty(value = "配载体积装载率")
+	private String volumeLoadingRate;
+
+	@ExcelProperty(value = "派车单备注")
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "同步状态")
+	private Integer synchronousStatus;
+
+	@ExcelProperty(value = "同步状态")
+	@ApiModelProperty(value = "同步状态")
+	private String synchronousStatusName;
+
+	@ExcelProperty(value = "同步时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "同步时间")
+	private Date synchronousDate;
+
+	@ApiModelProperty(value = "同步失败原因")
+	private String synchronousFailReason;
+
+	@ApiModelProperty(value = "支出计费状态 1：计费成功，2：计费失败")
+	private Integer costStatus;
+
+	@ExcelProperty(value = "支出计费状态")
+	@ApiModelProperty(value = "计费状态 1：计费成功，2：计费失败")
+	private String costStatusName;
+
+	@ExcelProperty(value = "支出计费时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "支出计费时间")
+	private Date costDate;
+
+	@ExcelProperty(value = "支出计费合同")
+	@ApiModelProperty(value = "支出计费合同")
+	private String costContract;
+
+	@ApiModelProperty(value = "支出核算状态 0:未核算，1：核算待提交，2：核算审批中，3:核算完成 ")
+	private Integer settlementStatus;
+
+	@ExcelProperty(value = "支出核算状态")
+	@ApiModelProperty(value = "支出核算状态 0:未核算，1：核算待提交，2：核算审批中，3:核算完成 ")
+	private String settlementStatusName;
+
+	@ExcelProperty(value = "支出核算时间")
+	@ApiModelProperty(value = "支出核算时间")
+	private Date settlementDate;
+
+	@ApiModelProperty(value = "支出总价 类型为支出的含税金额")
+	private BigDecimal payAmount;
+
+	@ApiModelProperty(value = "合同支出总价 类型为支出的来源是价格表生成 含税金额")
+	private BigDecimal contractPayAmount;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "企业ID")
+	private Long enterpriseId;
+
+	@ApiModelProperty(value = "企业名称")
+	private String enterpriseName;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@ExcelProperty(value = "创建人")
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@ExcelProperty(value = "创建时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ExcelProperty(value = "修改人")
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+
+	@ExcelProperty(value = "修改时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ExcelProperty(value = "总公里数")
+	@ApiModelProperty(value = "总公里数")
+	private BigDecimal totalMileage;
+
+	@ExcelProperty(value = "总件数")
+	@ApiModelProperty(value = "总件数")
+	private BigDecimal totalPcs;
+
+	@ExcelProperty(value = "总重量(kg)")
+	@ApiModelProperty(value = "总重量(kg)")
+	private BigDecimal totalWeight;
+
+	@ExcelProperty(value = "总体积")
+	@ApiModelProperty(value = "总体积")
+	private BigDecimal totalVolume;
+
+	@ApiModelProperty(value = "包含的运单")
+	private String shipbillNoList;
+
+	/*@ApiModelProperty(value = "运单信息")
+	private List<DriverledgerShipBillDTO> shipBillList;
+
+	@ApiModelProperty(value = "费用信息")
+	private List<BmsBillPayFeeDetailDTO> feeList;*/
+
+	@ApiModelProperty(value = "车辆规格")
+	private String vehicleSpec;
+
+	@ApiModelProperty(value = "调度类型 数据字典SCHEDULE_TYPE:1.自有  2.承运商")
+	private Integer scheduleType;
+
+	@ApiModelProperty(value = "承运方类型 数据字典LINE_CARRIER_TYPE:1.承运商  2.司机")
+	private Integer carrierType;
+
+	@ApiModelProperty(value = "承运商类型")
+	private String carrierTypeName;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/ExpensePopDTO.java

@@ -0,0 +1,33 @@
+package com.prolog.rdc.tms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ExpensePopDTO implements Serializable {
+
+	private static final long serialVersionUID = -590116347834313745L;
+
+	@ApiModelProperty(value = "当前页")
+	private int pageNum;
+
+	@ApiModelProperty(value = "页最大行数")
+	private int pageSize;
+
+	@ApiModelProperty(value = "承运商/货主/司机 的编码")
+	private String carrierCode;
+
+	@ApiModelProperty(value = "费用编码")
+	private String expenseCode;
+
+	@ApiModelProperty(value = "费用名称")
+	private String expenseName;
+
+	@ApiModelProperty(value = "当前页")
+	private Integer priceType;
+
+	@ApiModelProperty(value = "合同模式 1-托运 2-承运")
+	private Integer contractMode;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/IntfErrorLogDTO.java

@@ -0,0 +1,50 @@
+package com.prolog.rdc.tms.model.dto;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 接口日志DTO
+ *
+ * @className :IntfErrorLogDTO
+ * @author :fanzw
+ * @creationTime :2022/11/07
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/11/07
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("接口日志DTO")
+public class IntfErrorLogDTO implements Serializable {
+
+	private static final long serialVersionUID = 6479721406547905452L;
+
+	@ApiModelProperty(value = "id")
+	private String id;
+
+	@ApiModelProperty(value = "接口描述")
+	private String intfName;
+
+	@ApiModelProperty(value = "详细错误信息")
+	private String errorInfo;
+
+	@ApiModelProperty(value = "数据来源表")
+	private String tableName;
+
+	@ApiModelProperty(value = "数据来源表主键")
+	private String dataId;
+
+	@ApiModelProperty(value = "是否成功")
+	private boolean status;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/ItemResultDTO.java

@@ -0,0 +1,39 @@
+package com.prolog.rdc.tms.model.dto;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 商品接口转业务DTO
+ *
+ * @className :ItemResultDTO
+ * @author :fanzw
+ * @creationTime :2022/08/12
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/08/12
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class ItemResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 6206104943258272469L;
+
+	@ApiModelProperty(value = "是否成功")
+	private boolean success;
+
+	@ApiModelProperty(value = "商品编码")
+	private String itemCode;
+
+	@ApiModelProperty(value = "处理结果")
+	private String result;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/LmsTmsZoneDTO.java

@@ -0,0 +1,54 @@
+package com.prolog.rdc.tms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 
+ *
+ * 行政区域 Dto
+ *
+ * @className :LmsTmsZoneDTO
+ * @author :fanzw
+ * @creationTime :2020/07/03
+ * @description :
+ * 
+ * @modifier :fanzw
+ * @modifyTime :2020/07/03
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class LmsTmsZoneDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "区域ID")
+	private String zoneid;
+
+	@ApiModelProperty(value = "区域名称")
+	private String zname;
+
+	@ApiModelProperty(value = "简称")
+	private String keyvalue;
+
+	@ApiModelProperty(value = "层级")
+	private Integer zlevel;
+
+	@ApiModelProperty(value = "父级ID")
+	private String fatherid;
+
+	@ApiModelProperty(value = "父级名称")
+	private String fullname;
+
+	@ApiModelProperty(value = "补充说明")
+	private String sortcode;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/LmsTmsZoneMinDTO.java

@@ -0,0 +1,21 @@
+package com.prolog.rdc.tms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author hongbo.pan
+ * @date 2023/1/10
+ */
+@Data
+public class LmsTmsZoneMinDTO {
+
+    @ApiModelProperty(value = "区域ID")
+    private String zoneid;
+
+    @ApiModelProperty(value = "区域名称")
+    private String zname;
+
+    @ApiModelProperty(value = "层级")
+    private Integer zlevel;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/SettlementTypeDTO.java

@@ -0,0 +1,26 @@
+package com.prolog.rdc.tms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class SettlementTypeDTO implements Serializable {
+
+    @ApiModelProperty(value = "ID")
+    private Long id;
+
+    @ApiModelProperty(value = "承运商编码")
+    private String code;
+
+    @ApiModelProperty(value = "结算编码")
+    private String accountWayCode;
+
+    @ApiModelProperty(value = "结算名称")
+    private String accountWayName;
+
+    @ApiModelProperty(value = "结算类型  字典BMS_ACCOUNT_TYPE")
+    private int accountWay;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/ShipAndLoadingBillDTO.java

@@ -0,0 +1,57 @@
+package com.prolog.rdc.tms.model.dto;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author panhb
+ */
+@Data
+@ApiModel("运单、装车单信息DTO")
+public class ShipAndLoadingBillDTO implements Serializable {
+
+	private static final long serialVersionUID = 2222856189310934465L;
+
+	@ApiModelProperty(value = "运单ID")
+	private String shipBillId;
+
+	@ApiModelProperty(value = "运单编号")
+	private String shipBillNo;
+
+	@ApiModelProperty(value = "派车单ID")
+	private String loadingBillId;
+
+	@ApiModelProperty(value = "派车单编号")
+	private String loadingBillNo;
+
+	@ApiModelProperty(value = "车辆ID")
+	private Long vehicleId;
+
+	@ApiModelProperty(value = "车辆编号")
+	private String vehicleCode;
+
+	@ApiModelProperty(value = "车牌号")
+	private String vehiclePlateNumber;
+
+	@ApiModelProperty(value = "司机ID")
+	private Long driverId;
+
+	@ApiModelProperty(value = "司机编号")
+	private String driverCode;
+
+	@ApiModelProperty(value = "司机名称")
+	private String driverName;
+
+	@ApiModelProperty(value = "司机手机号")
+	private String driverPhoneNumber;
+
+	@ApiModelProperty(value = "运单状态")
+	private Integer status;
+
+	@ApiModelProperty(value = "运单ID")
+	private String realShipBillId;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/ShipbillAndLoadingbillInfoDTO.java

@@ -0,0 +1,50 @@
+package com.prolog.rdc.tms.model.dto;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 运单、装车单信息DTO
+ *
+ * Company: 湖北普罗格科技股份有限公司
+ *
+ * @author xyf
+ * @since 2022/5/11 14:16
+ */
+@Data
+@ApiModel("运单、装车单信息DTO")
+public class ShipbillAndLoadingbillInfoDTO implements Serializable {
+
+	private static final long serialVersionUID = -4224684835481192261L;
+
+	@ApiModelProperty(value = "装车单ID")
+	private String loadingbillId;
+
+	@ApiModelProperty(value = "装车单编号")
+	private String loadingbillNo;
+
+	@ApiModelProperty(value = "车辆ID")
+	private Long vehicleId;
+
+	@ApiModelProperty(value = "车辆编号")
+	private String vehicleCode;
+
+	@ApiModelProperty(value = "车牌号")
+	private String vehiclePlateNumber;
+
+	@ApiModelProperty(value = "司机编号")
+	private String driverCode;
+
+	@ApiModelProperty(value = "司机名称")
+	private String driverName;
+
+	@ApiModelProperty(value = "司机手机号")
+	private String driverPhoneNumber;
+
+	@ApiModelProperty(value = "运单状态")
+	private Integer status;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/ShipbillResultDTO.java

@@ -0,0 +1,39 @@
+package com.prolog.rdc.tms.model.dto;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 运单接口转业务DTO
+ *
+ * @className :ShipbillResultDTO
+ * @author :fanzw
+ * @creationTime :2022/08/12
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/08/12
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class ShipbillResultDTO implements Serializable {
+
+	private static final long serialVersionUID = -3729894728829321473L;
+
+	@ApiModelProperty(value = "是否成功")
+	private boolean success;
+
+	@ApiModelProperty(value = "运单ID")
+	private String shipbillId;
+
+	@ApiModelProperty(value = "处理结果")
+	private String result;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/SySParameterDTO.java

@@ -0,0 +1,80 @@
+package com.prolog.rdc.tms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class SySParameterDTO implements Serializable {
+
+	private static final long serialVersionUID = 5417172731328470180L;
+
+	@ApiModelProperty(value = "id")
+	private String id;
+
+	@ApiModelProperty(value = "重量精度")
+	private Integer weightPrecision;
+
+	@ApiModelProperty(value = "重量取整")
+	private Integer weightInteger;
+
+	@ApiModelProperty(value = "重量精度")
+	private Integer volumePrecision;
+
+	@ApiModelProperty(value = "重量取整")
+	private Integer volumeInteger;
+
+	@ApiModelProperty(value = "重量精度")
+	private Integer packWeightPrecision;
+
+	@ApiModelProperty(value = "包装重量取整")
+	private Integer packWeightInteger;
+
+	@ApiModelProperty(value = "包装体积精度")
+	private Integer packVolumePrecision;
+
+	@ApiModelProperty(value = "包装体积取整")
+	private Integer packVolumeInteger;
+
+	@ApiModelProperty(value = "费用精度")
+	private Integer costPrecision;
+
+	@ApiModelProperty(value = "费用取整")
+	private Integer costInteger;
+
+	@ApiModelProperty(value = "是否核算之后开始对账")
+	private Integer isReconciliation;
+
+	@ApiModelProperty(value = "是否含税单价 1：含税，2：未税")
+	private Integer isTax;
+	private String isTaxName;
+
+	@ApiModelProperty(value = "价格表计费方式")
+	private Integer priceCostType;
+
+	@ApiModelProperty(value = "创建人")
+	private Integer createperson;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "最后修改人")
+	private String updateperson;
+
+	@ApiModelProperty(value = "最后修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "价格表省市区匹配方式")
+	private Integer pricePcdMatchType;
+
+	@ApiModelProperty(value = "TMS下传单据:10-仅运单,20-运单和派车单")
+	private Integer tmsTransferOrderType;
+
+	@ApiModelProperty(value = "承运价格计费:1：含税，2：未税")
+	private Integer carrierPriceType;
+
+	@ApiModelProperty(value = "司机价格计费:1：含税，2：未税")
+	private Integer driverPriceType;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/TmsBaseParameterDTO.java

@@ -0,0 +1,78 @@
+package com.prolog.rdc.tms.model.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * TMS系统参数表 DTO
+ *
+ * @className :TmsBaseParameterDTO
+ * @author :fanzw
+ * @creationTime :2020/06/29
+ * @description :
+ * @modifier :fanzw
+ * @modifyTime :2020/06/29
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class TmsBaseParameterDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "序号")
+	private BigDecimal seqno;
+
+	@ApiModelProperty(value = "配送中心ID")
+	private String branchCode;
+
+	@ApiModelProperty(value = "配送中心名称")
+	private String branchName;
+
+	@ApiModelProperty(value = "参数编号")
+	private String parameterCode;
+
+	@ApiModelProperty(value = "参数名称")
+	private String parameterName;
+
+	@ApiModelProperty(value = "分组编号")
+	private String fatherParameterCode;
+
+	@ApiModelProperty(value = "分组名称")
+	private String fatherParameterName;
+
+	@ApiModelProperty(value = "参数值")
+	private String parameterValue;
+
+	@ApiModelProperty(value = "开始作业时间")
+	private String startJobTime;
+
+	@ApiModelProperty(value = "结束作业时间")
+	private String endJobTime;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "扩展字段1")
+	private String extend01;
+
+	@ApiModelProperty(value = "扩展字段2")
+	private String extend02;
+
+	@ApiModelProperty(value = "扩展字段3")
+	private String extend03;
+
+	@ApiModelProperty(value = "扩展字段4")
+	private String extend04;
+
+	@ApiModelProperty(value = "扩展字段5")
+	private String extend05;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/VehicleCheckDTO.java

@@ -0,0 +1,150 @@
+package com.prolog.rdc.tms.model.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 车辆资料查看DTO
+ * 
+ * @author Eton Woo
+ * @date 2022/03/14
+ */
+@Data
+@ApiModel("车型资料查看DTO")
+public class VehicleCheckDTO implements Serializable {
+
+	private static final long serialVersionUID = -1763218030910368074L;
+
+	@ApiModelProperty(value = "车辆ID")
+	private Long id;
+
+	@ApiModelProperty(value = "车辆编码")
+	private String code;
+
+	@ApiModelProperty(value = "车牌号")
+	private String plateNumber;
+
+	@ApiModelProperty(value = "车辆类型：数据字典VEHICLE_TYPE: 1自有、2挂靠、3临时")
+	private Integer type;
+
+	@ApiModelProperty(value = "隶属机构ID")
+	private Long affiliationId;
+
+	@ApiModelProperty(value = "隶属机构编码")
+	private String affiliationCode;
+
+	@ApiModelProperty(value = "隶属机构名称")
+	private String affiliationName;
+
+	@ApiModelProperty(value = "车型ID")
+	private Long vehicleTypeId;
+
+	@ApiModelProperty(value = "车型编码")
+	private String vehicleTypeCode;
+
+	@ApiModelProperty(value = "车型名称")
+	private String vehicleTypeName;
+
+	@ApiModelProperty(value = "车型品牌 数据字典VEHICLE_TYPE_BRAND：1长安、2依维柯")
+	private Integer brand;
+
+	@ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+	private Integer typeCategory;
+
+	@ApiModelProperty(value = "长(m)")
+	private BigDecimal length;
+
+	@ApiModelProperty(value = "宽(m)")
+	private BigDecimal width;
+
+	@ApiModelProperty(value = "高(m)")
+	private BigDecimal height;
+
+	@ApiModelProperty(value = "最大行驶里程(km)")
+	private BigDecimal maxMileage;
+
+	@ApiModelProperty(value = "载重(kg)")
+	private BigDecimal weight;
+
+	@ApiModelProperty(value = "载方(m³)")
+	private BigDecimal volume;
+
+	@ApiModelProperty(value = "GPS设备生产厂商 数据字典表DEVICE_COMPANY：1易流、2捷依、3G7")
+	private Integer deviceCompany;
+
+	@ApiModelProperty(value = "GPS设备ID")
+	private Long deviceId;
+
+	@ApiModelProperty(value = "GPS设备编码")
+	private String deviceCode;
+
+	@ApiModelProperty(value = "GPS设备名称")
+	private String deviceName;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicConfigure/ShipbillFitBusinessFlowDTO.java

@@ -0,0 +1,35 @@
+package com.prolog.rdc.tms.model.dto.basicConfigure;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 运单匹配业务流程DTO
+ *
+ * @className: shipbillFitBusinessFlowDTO
+ * @author: lhb
+ * @creationTime: 2022-06-16 10:12:37
+ * @description:
+ * @modifier:
+ * @modifyTime:
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("运单匹配业务流程DTO")
+public class ShipbillFitBusinessFlowDTO implements Serializable {
+
+	private static final long serialVersionUID = 3379051381641311253L;
+
+	@ApiModelProperty(value = "流程配置 新增,提交,审核")
+	private String flowConfig;
+
+	@ApiModelProperty(value = "流程配置名称")
+	private String flowName;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicConfigure/ShipbillMatchCarrierDTO.java

@@ -0,0 +1,199 @@
+package com.prolog.rdc.tms.model.dto.basicConfigure;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ *
+ *
+ * 根据运单适配匹配承运方策略DTO
+ *
+ * @className :ShipbillMatchCarrierDTO
+ * @author :lhb
+ * @creationTime :2022/06/16
+ * @description :
+ *
+ * @modifier :
+ * @modifyTime :
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("根据运单适配匹配承运方策略DTO")
+public class ShipbillMatchCarrierDTO {
+
+    @ApiModelProperty(value = "运单ID")
+    private String shipbillId;
+
+    @ApiModelProperty(value = "承运方类型 数据字典LINE_CARRIER_TYPE:1.承运商  2.司机")
+    private Integer carrierType;
+
+    @ApiModelProperty(value = "承运方类型 数据字典LINE_CARRIER_TYPE:1.承运商  2.司机")
+    private String carrierTypeName;
+
+    @ApiModelProperty(value = "承运方ID")
+    private String carrierId;
+
+    @ApiModelProperty(value = "承运方编码")
+    private String carrierCode;
+
+    @ApiModelProperty(value = "承运方名称")
+    private String carrierName;
+
+    @ApiModelProperty(value = "司机ID")
+    private String driverId;
+
+    @ApiModelProperty(value = "司机编号")
+    private String driverCode;
+
+    @ApiModelProperty(value = "司机名称")
+    private String driverName;
+
+    @ApiModelProperty(value = "司机手机号")
+    private String driverPhoneNumber;
+
+    @ApiModelProperty(value = "副司机ID")
+    private String viceDriverId;
+
+    @ApiModelProperty(value = "副司机编号")
+    private String viceDriverCode;
+
+    @ApiModelProperty(value = "副司机名称")
+    private String viceDriverName;
+
+    @ApiModelProperty(value = "副司机手机号")
+    private String viceDriverPhoneNumber;
+
+    @ApiModelProperty(value = "车辆ID")
+    private Long vehicleId;
+
+    @ApiModelProperty(value = "车辆编号")
+    private String vehicleCode;
+
+    @ApiModelProperty(value = "车辆名称")
+    private String vehicleName;
+
+    @ApiModelProperty(value = "车牌号")
+    private String vehiclePlateNumber;
+
+    @ApiModelProperty(value = "车型ID")
+    private Long vehicleTypeId;
+
+    @ApiModelProperty(value = "车型编码")
+    private String vehicleTypeCode;
+
+    @ApiModelProperty(value = "车型名称")
+    private String vehicleTypeName;
+
+    @ApiModelProperty(value = "送货员ID")
+    private String deliverymanId;
+
+    @ApiModelProperty(value = "送货员编号")
+    private String deliverymanCode;
+
+    @ApiModelProperty(value = "送货员名称")
+    private String deliverymanName;
+
+    @ApiModelProperty(value = "送货员手机号")
+    private String deliverymanPhoneNumber;
+
+    @ApiModelProperty(value = "副送货员ID")
+    private String viceDeliverymanId;
+
+    @ApiModelProperty(value = "副送货员编号")
+    private String viceDeliverymanCode;
+
+    @ApiModelProperty(value = "副送货员名称")
+    private String viceDeliverymanName;
+
+    @ApiModelProperty(value = "副送货员手机号")
+    private String viceDeliverymanPhoneNumber;
+
+    @ApiModelProperty(value = "载重(kg)")
+    private BigDecimal weight;
+
+    @ApiModelProperty(value = "载方(m³)")
+    private BigDecimal volume;
+
+    @ApiModelProperty(value = "设备ID")
+    private Long vehicleDeviceId;
+
+    @ApiModelProperty(value = "设备编号")
+    private String vehicleDeviceCode;
+
+    @ApiModelProperty(value = "设备名称")
+    private String vehicleDeviceName;
+
+    @ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+    private Integer vehicleTypeCategory;
+
+    @ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+    private String vehicleTypeCategoryName;
+
+    @ApiModelProperty(value = "车辆隶属机构ID")
+    private String vehicleAffiliationId;
+
+    @ApiModelProperty(value = "车辆隶属机构CODE")
+    private String vehicleAffiliationCode;
+
+    @ApiModelProperty(value = "车辆隶属机构名称")
+    private String vehicleAffiliationName;
+
+    @ApiModelProperty(value = "司机隶属机构ID")
+    private String driverAffiliationId;
+
+    @ApiModelProperty(value = "司机隶属机构CODE")
+    private String driverAffiliationCode;
+
+    @ApiModelProperty(value = "司机隶属机构名称")
+    private String driverAffiliationName;
+
+    @ApiModelProperty(value = "容器ID")
+    private String containerId;
+
+    @ApiModelProperty(value = "容器编码")
+    private String containerCode;
+
+    @ApiModelProperty(value = "容器名称")
+    private String containerName;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "最早提货时间")
+    private Date minEstimatedPickupTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "最晚送达时间")
+    private Date maxEstimatedDeliveryTime;
+
+    @ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+    private Integer typeCategory;
+
+    @ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+    private String typeCategoryName;
+
+    @ApiModelProperty(value = "设备ID")
+    private Long deviceId;
+
+    @ApiModelProperty(value = "设备编号")
+    private String deviceCode;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "车辆归属")
+    private Integer vehicleAscription;
+
+    @ApiModelProperty(value = "车辆归属")
+    private String vehicleAscriptionName;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicConfigure/ShipbillMatchLineDTO.java

@@ -0,0 +1,58 @@
+package com.prolog.rdc.tms.model.dto.basicConfigure;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ *
+ *
+ * 根据运单适配匹配线路策略DTO
+ *
+ * @className :ShipbillMatchLineDTO
+ * @author :lhb
+ * @creationTime :2022/06/16
+ * @description :
+ *
+ * @modifier :
+ * @modifyTime :
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("根据运单适配匹配线路策略DTO")
+public class ShipbillMatchLineDTO {
+
+    @ApiModelProperty(value = "线路ID")
+    private Long lineId;
+
+    @ApiModelProperty(value = "线路编号")
+    private String lineCode;
+
+    @ApiModelProperty(value = "线路名称")
+    private String lineName;
+
+    @ApiModelProperty(value = "线路方向 数据字典LINE_DIRECTION 10正向 20逆向")
+    private Integer lineDirection;
+
+    @ApiModelProperty(value = "配送顺序")
+    private Integer shippingOrder;
+
+    @ApiModelProperty(value = "提货顺序")
+    private Integer pickUpOrder;
+
+    @ApiModelProperty(value = "发货时间")
+    private String shipperAgingTime;
+
+    @ApiModelProperty(value = "发货时间类型")
+    private String shipperAgingTimeLine;
+
+    @ApiModelProperty(value = "到货时间")
+    private String consigneeAgingTime;
+
+    @ApiModelProperty(value = "到货时间类型")
+    private String consigneeAgingTimeLine;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicConfigure/SignconfigPopDTO.java

@@ -0,0 +1,133 @@
+package com.prolog.rdc.tms.model.dto.basicConfigure;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 标记配置弹窗DTO
+ *
+ * @author zhangsj
+ * @since 2022-04-26 15:53:19
+ */
+@Data
+@ApiModel("标记配置弹窗DTO")
+public class SignconfigPopDTO implements Serializable {
+	private static final long serialVersionUID = 881329211486955796L;
+
+	@ApiModelProperty(value = "标记ID")
+	private Long id;
+
+	@ApiModelProperty(value = "标记名称")
+	private String name;
+
+	@ApiModelProperty(value = "标记类型 数据字典SIGNCONFIG_TYPE 1订单类型 2业务类型 3温度要求 4配送方式 5订单备注")
+	private Integer type;
+
+	@ApiModelProperty(value = "标记类型名称 数据字典SIGNCONFIG_TYPE 1订单类型 2业务类型 3温度要求 4配送方式 5订单备注")
+	private String typeName;
+
+	@ApiModelProperty(value = "匹配 数据字典SIGNCONFIG_MATCHING 1模糊匹配 2模糊不匹配 3非空 4为空 5等于 6不等于")
+	private Integer matching;
+
+	@ApiModelProperty(value = "匹配名称 数据字典SIGNCONFIG_MATCHING 1模糊匹配 2模糊不匹配 3非空 4为空 5等于 6不等于")
+	private String matchingName;
+
+	@ApiModelProperty(value = "储存值")
+	private String storedValue;
+
+	@ApiModelProperty(value = "底纹")
+	private String background;
+
+	@ApiModelProperty(value = "字体")
+	private String color;
+
+	@ApiModelProperty(value = "优先级 数据字典SIGNCONFIG_PRIORITY")
+	private Integer priority;
+
+	@ApiModelProperty(value = "优先级名称 数据字典SIGNCONFIG_PRIORITY")
+	private String priorityName;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicConfigure/StandardTemplateDetailsListDTO.java

@@ -0,0 +1,73 @@
+package com.prolog.rdc.tms.model.dto.basicConfigure;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 标准版模板详情查询DTO
+ *
+ * @className :SysImportTempletdQueryDTO
+ * @author :fanzw
+ * @creationTime :2022/04/27
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/04/27
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("标准版模板详情查询DTO")
+public class StandardTemplateDetailsListDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "主键")
+	private String did;
+
+	@ApiModelProperty(value = "汇总主键")
+	private String hid;
+
+	@ApiModelProperty(value = "导入对象编码")
+	private String importObjNo;
+
+	@ApiModelProperty(value = "导入对象名称")
+	private String importObjName;
+
+	@ApiModelProperty(value = "标准列名编码")
+	private String stdColNo;
+
+	@ApiModelProperty(value = "标准列名名称")
+	private String stdColName;
+
+	@ApiModelProperty(value = "自定义列名")
+	private String custColName;
+
+	@ApiModelProperty(value = "是否启用，0否，1是")
+	private Integer status;
+
+	@ApiModelProperty(value = "模板状态，用于删除，0无效，1有效")
+	private Integer templetStatus;
+
+	@ApiModelProperty(value = "是否必填,1-是/0-否")
+	private Integer required;
+
+	@ApiModelProperty(value = "标记")
+	private String labelType;
+
+	@ApiModelProperty(value = "默认id")
+	private String defaultId;
+
+	@ApiModelProperty(value = "默认code")
+	private String defaultCode;
+
+	@ApiModelProperty(value = "默认name")
+	private String defaultName;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicConfigure/StrategyBusinessMatchingDTO.java

@@ -0,0 +1,127 @@
+package com.prolog.rdc.tms.model.dto.basicConfigure;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 业务规则策略-匹配DTO
+ *
+ * Company: 湖北普罗格科技股份有限公司
+ *
+ * @author zhangsj
+ * @since 2022/7/18 10:08
+ */
+@Data
+@ApiModel("业务规则策略-匹配DTO")
+public class StrategyBusinessMatchingDTO implements Serializable {
+
+    private static final long serialVersionUID = -6630627123305344637L;
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "业务规则策略名称")
+    private String name;
+
+    @ApiModelProperty(value = "配送方式是否勾选 0否 1是")
+    private Integer deliveryMethodSelect;
+
+    @ApiModelProperty(value = "配送方式 数据字典DELIVERY_METHOD_TYPE：1配送 2自提")
+    private Integer deliveryMethodType;
+
+    @ApiModelProperty(value = "申请数量是否勾选 0否 1是")
+    private Integer applyPcsSelect;
+
+    @ApiModelProperty(value = "输入申请数量 数据字典PROCESS_ENABLE：0否 10是")
+    private Integer applyPcsEnable;
+
+    @ApiModelProperty(value = "库存校验是否选择  0否 1是")
+    private Integer inventoryCheckSelect;
+
+    @ApiModelProperty(value = "库存校验 数据字典PROCESS_ENABLE：0否 10是")
+    private Integer inventoryCheckEnable;
+
+    @ApiModelProperty(value = "输入启运温度是否选择  0否 1是")
+    private Integer departureTemperatureSelect;
+
+    @ApiModelProperty(value = "输入启运温度 数据字典PROCESS_ENABLE：0否 10是")
+    private Integer departureTemperatureEnable;
+
+    @ApiModelProperty(value = "输入送达温度是否选择  0否 1是")
+    private Integer deliveryTemperatureSelect;
+
+    @ApiModelProperty(value = "输入送达温度 数据字典PROCESS_ENABLE：0否 10是")
+    private Integer deliveryTemperatureEnable;
+
+    @ApiModelProperty(value = "回单图片是否选择  0否 1是")
+    private Integer rtnOrderPicSelect;
+
+    @ApiModelProperty(value = "回单图片 0否 1是")
+    private Integer rtnOrderPicEnable;
+
+    @ApiModelProperty(value = "正本回单是否选择  0否 1是")
+    private Integer rtnOrderPaperSelect;
+
+    @ApiModelProperty(value = "正本回单 0否 1是")
+    private Integer rtnOrderPaperEnable;
+
+    @ApiModelProperty(value = "回单期限是否选择  0否 1是")
+    private Integer rtnOrderDeadlineSelect;
+
+    @ApiModelProperty(value = "回单期限")
+    private Integer rtnOrderDeadline;
+
+    @ApiModelProperty(value = "配送方向是否选择  0否 1是")
+    private Integer deliveryDirectionSelect;
+
+    @ApiModelProperty(value = "配送方向 数据字典LINE_DIRECTION：10正向 20逆向")
+    private Integer deliveryDirection;
+
+    @ApiModelProperty(value = "记录标记是否选择  0否 1是")
+    private Integer recordTagSelect;
+
+    @ApiModelProperty(value = "记录标记语")
+    private String recordTagWord;
+
+    @ApiModelProperty(value = "颜色标记是否选择  0否 1是")
+    private Integer colorTagSelect;
+
+    @ApiModelProperty(value = "颜色标记 底纹背景颜色")
+    private String colorTagBgdColor;
+
+    @ApiModelProperty(value = "颜色标记 字体颜色")
+    private String colorTagFontColor;
+
+    @ApiModelProperty(value = "价格表省市区匹配方式是否勾选 0否 1是")
+    private Integer pricePcdMatchTypeSelect;
+
+    @ApiModelProperty(value = "数据字典PRICE_TBL_PCD_MATCH_TYPE 1.省市区精确匹配 2.省市区向上匹配 3.省市区向上匹配,未匹配到忽略省市区 4.忽略省市区作为匹配条件")
+    private Integer pricePcdMatchType;
+
+    @ApiModelProperty(value = "输入超限提交日期是否选择  0否 1是")
+    private Integer transfiniteCmtDtSelect;
+
+    @ApiModelProperty(value = "输入超限提交日期 数据字典PROCESS_ENABLE：0否 10是")
+    private Integer transfiniteCmtDtEnable;
+
+    @ApiModelProperty(value = "输入超限说明是否选择  0否 1是")
+    private Integer transfiniteDescriptionSelect;
+
+    @ApiModelProperty(value = "输入超限说明 数据字典PROCESS_ENABLE：0否 10是")
+    private Integer transfiniteDescriptionEnable;
+
+    @ApiModelProperty(value = "承运商上传超限证是否选择  0否 1是")
+    private Integer carrierUploadTransfiniteSelect;
+
+    @ApiModelProperty(value = "承运商上传超限证 数据字典PROCESS_ENABLE：0否 10是")
+    private Integer carrierUploadTransfiniteEnable;
+
+    @ApiModelProperty(value = "输入装车地点是否选择  0否 1是")
+    private Integer loadingLocationSelect;
+
+    @ApiModelProperty(value = "输入装车地点 数据字典PROCESS_ENABLE：0否 10是")
+    private Integer loadingLocationEnable;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicConfigure/StrategySplitMatchingDTO.java

@@ -0,0 +1,65 @@
+package com.prolog.rdc.tms.model.dto.basicConfigure;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 拆分策略-匹配DTO
+ *
+ * Company: 湖北普罗格科技股份有限公司
+ *
+ * @author zhangsj
+ * @since 2022/7/18 10:08
+ */
+@Data
+@ApiModel("拆分策略-匹配DTO")
+public class StrategySplitMatchingDTO implements Serializable {
+
+    private static final long serialVersionUID = -6630627123305344637L;
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "拆分策略名称")
+    private String name;
+
+    @ApiModelProperty(value = "策略条件名称")
+    private String conditionName;
+
+    @ApiModelProperty(value = "执行操作(拆分规则)编码 数据字典RULE_CODE:1按商品品类拆分 2按包装类型拆分 3按货物温层拆分 4按数量、库存数量拆分 5按默认存放仓库、数量、库存数量拆分")
+    private Integer ruleCode;
+
+    @ApiModelProperty(value = "执行操作(拆分规则)名称 数据字典RULE_CODE:1按商品品类拆分 2按包装类型拆分 3按货物温层拆分 4按数量、库存数量拆分 5按默认存放仓库、数量、库存数量拆分")
+    private String ruleName;
+
+    @ApiModelProperty(value = "按运单明细拆分关键字")
+    private String shipbillDetailSplitKey;
+
+    @ApiModelProperty(value = "拆分后是否重新匹配线路 数据字典 REMATCH_LINE :0否 1是")
+    private Integer rematchLine;
+
+    @ApiModelProperty(value = "状态 数据字典GENERAL_STATUS:0停用 10启用")
+    private Integer status;
+
+    @ApiModelProperty(value = "状态名称 数据字典GENERAL_STATUS:0停用 10启用")
+    private String statusName;
+
+    @ApiModelProperty(value = "备注")
+    private String memo;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createtime;
+
+    @ApiModelProperty(value = "创建人")
+    private String createperson;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updatetime;
+
+    @ApiModelProperty(value = "修改人")
+    private String updateperson;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicConfigure/StrategyTransferMatchingDTO.java

@@ -0,0 +1,31 @@
+package com.prolog.rdc.tms.model.dto.basicConfigure;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 中转策略-匹配DTO
+ *
+ * Company: 湖北普罗格科技股份有限公司
+ *
+ * @author zhangsj
+ * @since 2022/7/18 10:08
+ */
+@Data
+@ApiModel("中转策略-匹配DTO")
+public class StrategyTransferMatchingDTO implements Serializable {
+
+    private static final long serialVersionUID = -6630627123305344637L;
+
+    @ApiModelProperty(value = "中转后是否重新匹配线路 数据字典 REMATCH_LINE :0否 1是")
+    private Integer rematchLine;
+
+    @ApiModelProperty(value = "中转策略中转站集合")
+    private List<StrategyTransferStationDTO> transferStationDTOS = new ArrayList<StrategyTransferStationDTO>();
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicConfigure/StrategyTransferStationDTO.java

@@ -0,0 +1,93 @@
+package com.prolog.rdc.tms.model.dto.basicConfigure;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 中转策略-查看条件DTO
+ *
+ * @author zhangsj
+ * @since 2022-07-16 10:06:06
+ */
+@Data
+@ApiModel("中转策略-查看条件DTO")
+public class StrategyTransferStationDTO implements Serializable {
+
+    private static final long serialVersionUID = 805258676962222983L;
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "中转策略ID")
+    private Long strategyId;
+
+    @ApiModelProperty(value = "中转站ID")
+    private Long transferStationId;
+
+    @ApiModelProperty(value = "中转站编码")
+    private String transferStationCode;
+
+    @ApiModelProperty(value = "中转站名称")
+    private String transferStationName;
+
+    @ApiModelProperty(value = "中转站顺序")
+    private Integer transferOrder;
+
+    @ApiModelProperty(value = "预计到达开始时间类型 数据字典 TRANSFER_TIME_TYPE 1下单日期 2提交日期 3审核日期")
+    private Integer deliveryStartTimeType;
+
+    @ApiModelProperty(value = "预计到达开始时间类型 数据字典 TRANSFER_TIME_TYPE 1下单日期 2提交日期 3审核日期")
+    private String deliveryStartTimeTypeName;
+
+    @ApiModelProperty(value = "预计到达开始时间_小时")
+    private Integer deliveryStartTimeHour;
+
+    @ApiModelProperty(value = "预计到达开始时间_分钟")
+    private Integer deliveryStartTimeMinute;
+
+    @ApiModelProperty(value = "预计到达结束时间类型 数据字典 TRANSFER_TIME_TYPE 1下单日期 2提交日期 3审核日期")
+    private Integer deliveryEndTimeType;
+
+    @ApiModelProperty(value = "预计到达结束时间类型 数据字典 TRANSFER_TIME_TYPE 1下单日期 2提交日期 3审核日期")
+    private String deliveryEndTimeTypeName;
+
+    @ApiModelProperty(value = "预计到达结束时间_天")
+    private Integer deliveryEndTimeDay;
+
+    @ApiModelProperty(value = "预计到达结束时间_小时")
+    private Integer deliveryEndTimeHour;
+
+    @ApiModelProperty(value = "预计到达结束时间_分钟")
+    private Integer deliveryEndTimeMinute;
+
+    @ApiModelProperty(value = "预计发出开始时间类型 数据字典 TRANSFER_TIME_TYPE 1下单日期 2提交日期 3审核日期")
+    private Integer sendStartTimeType;
+
+    @ApiModelProperty(value = "预计发出开始时间类型 数据字典 TRANSFER_TIME_TYPE 1下单日期 2提交日期 3审核日期")
+    private String sendStartTimeTypeName;
+
+    @ApiModelProperty(value = "预计发出开始时间_小时")
+    private Integer sendStartTimeHour;
+
+    @ApiModelProperty(value = "预计发出开始时间_分钟")
+    private Integer sendStartTimeMinute;
+
+    @ApiModelProperty(value = "预计发出结束时间类型 数据字典 TRANSFER_TIME_TYPE 1下单日期 2提交日期 3审核日期")
+    private Integer sendEndTimeType;
+
+    @ApiModelProperty(value = "预计发出结束时间类型 数据字典 TRANSFER_TIME_TYPE 1下单日期 2提交日期 3审核日期")
+    private String sendEndTimeTypeName;
+
+    @ApiModelProperty(value = "预计发出结束时间_天")
+    private Integer sendEndTimeDay;
+
+    @ApiModelProperty(value = "预计发出结束时间_小时")
+    private Integer sendEndTimeDayHour;
+
+    @ApiModelProperty(value = "预计发出结束时间_分钟")
+    private Integer sendEndTimeDayMinute;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicConfigure/SysAlertConfigurationQueryDTO.java

@@ -0,0 +1,113 @@
+package com.prolog.rdc.tms.model.dto.basicConfigure;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ *
+ * 预警配置查询DTO
+ *
+ * @className :SysAlertConfigurationQueryDTO
+ * @author :fanzw
+ * @creationTime :2022/01/18
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/01/18
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class SysAlertConfigurationQueryDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "预警ID")
+	private String earlyWarningId;
+
+	@ApiModelProperty(value = "预警名称")
+	private String earlyWarningName;
+
+	@ApiModelProperty(value = "预警类型编码")
+	private String earlyWarningTypeCode;
+
+	@ApiModelProperty(value = "预警类型名称")
+	private String earlyWarningTypeName;
+
+	@ApiModelProperty(value = "单位id")
+	private String customerIds;
+
+	@ApiModelProperty(value = "单位编号")
+	private String customerCodes;
+
+	@ApiModelProperty(value = "单位名称")
+	private String customerNames;
+
+	@ApiModelProperty(value = "开始时间偏差数")
+	private BigDecimal startTimeOffset;
+
+	@ApiModelProperty(value = "开始时间偏差单位")
+	private String startTimeOffsetUnit;
+
+	@ApiModelProperty(value = "结束时间偏差数")
+	private BigDecimal endTimeOffset;
+
+	@ApiModelProperty(value = "结束时间偏差单位")
+	private String endTimeOffsetUnit;
+
+	@ApiModelProperty(value = "推送方式ID")
+	private String pushMethodCode;
+
+	@ApiModelProperty(value = "推送方式名称")
+	private String pushMethodName;
+
+	@ApiModelProperty(value = "间隔数")
+	private BigDecimal intervalNumber;
+
+	@ApiModelProperty(value = "间隔单位")
+	private String intervalNumberUnit;
+
+	@ApiModelProperty(value = "预警描述")
+	private String describe;
+
+	@ApiModelProperty(value = "预警状态 0:无效 1:有效")
+	private Integer status;
+
+	@ApiModelProperty(value = "预警状态名称 0:无效 1:有效")
+	private String statusName;
+
+	@ApiModelProperty(value = "企业ID")
+	private Long enterpriseId;
+
+	@ApiModelProperty(value = "企业名称")
+	private String enterprisename;
+
+	@ApiModelProperty(value = "通知用户")
+	private String username;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicConfigure/SysAlertUsersQueryDTO.java

@@ -0,0 +1,63 @@
+package com.prolog.rdc.tms.model.dto.basicConfigure;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 
+ *
+ * 预警配置用户查询DTO
+ *
+ * @className :SysAlertUsersQueryDTO
+ * @author :fanzw
+ * @creationTime :2022/01/18
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/01/18
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class SysAlertUsersQueryDTO implements Serializable {
+
+	private static final long serialVersionUID = -5659418610134354260L;
+
+	@ApiModelProperty(value = "数据ID")
+	private Long lineId;
+
+	@ApiModelProperty(value = "预警ID")
+	private String earlyWarningId;
+
+	@ApiModelProperty(value = "用户ID")
+	private String userid;
+
+	@ApiModelProperty(value = "用户名称")
+	private String username;
+
+	@ApiModelProperty(value = "用户账号")
+	private String userAccount;
+
+	@ApiModelProperty(value = "用户手机号")
+	private String phone;
+
+	@ApiModelProperty(value = "部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "用户类型编码")
+	private String userTypeCode;
+
+	@ApiModelProperty(value = "用户类型名称")
+	private String userTypeName;
+
+	@ApiModelProperty(value = "状态 0:停用 1:启用")
+	private Integer status;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/ApprovalLogDTO.java

@@ -0,0 +1,58 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 审核历史DTO
+ *
+ * Company: 湖北普罗格科技股份有限公司
+ *
+ * @author zhangsj
+ * @since 2022/5/7 17:58
+ */
+@Data
+@ApiModel("审核历史DTO")
+public class ApprovalLogDTO implements Serializable {
+    private static final long serialVersionUID = -8915120147638868261L;
+
+    @ApiModelProperty(value = "审批日志ID")
+    private Long id;
+
+    @ApiModelProperty(value = "审批角色ID")
+    private Long approverRoleId;
+
+    @ApiModelProperty(value = "审批角色名称")
+    private String approverRoleName;
+
+    @ApiModelProperty(value = "审批用户ID")
+    private Long approverUserId;
+
+    @ApiModelProperty(value = "审批用户名称")
+    private String approverUserName;
+
+    @ApiModelProperty(value = "审批人ID")
+    private Long approverPersonId;
+
+    @ApiModelProperty(value = "审批人名称")
+    private String approverPersonName;
+
+    @ApiModelProperty(value = "审批意见")
+    private String approvalOpinion;
+
+    @ApiModelProperty(value = "审批时间")
+    private Date approvalTime;
+
+    @ApiModelProperty(value = "状态 数据字典 APPROVAL_BUSSINESS_NODE_STATUS:1待审批 2驳回发起人 3驳回上一级  4审批通过")
+    private Integer result;
+
+    @ApiModelProperty(value = "状态 数据字典 APPROVAL_BUSSINESS_NODE_STATUS:1待审批 2驳回发起人 3驳回上一级  4审批通过")
+    private String resultName;
+
+    @ApiModelProperty(value = "备注")
+    private String memo;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/ApprovalNodeSelDTO.java

@@ -0,0 +1,52 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 审核节点DTO
+ *
+ * Company: 湖北普罗格科技股份有限公司
+ *
+ * @author zhangsj
+ * @since 2022/5/7 17:58
+ */
+@Data
+@ApiModel("审核节点DTO")
+public class ApprovalNodeSelDTO implements Serializable {
+    private static final long serialVersionUID = 3027243616969056917L;
+
+    @ApiModelProperty(value = "审批业务明细ID")
+    private Long id;
+
+    @ApiModelProperty(value = "审批节点顺序")
+    private Integer approvalNodeOrder;
+
+    @ApiModelProperty(value = "审批角色ID")
+    private Long approverRoleId;
+
+    @ApiModelProperty(value = "审批角色名称")
+    private String approverRoleName;
+
+    @ApiModelProperty(value = "审批用户ID")
+    private Long approverUserId;
+
+    @ApiModelProperty(value = "审批用户名称")
+    private String approverUserName;
+
+    @ApiModelProperty(value = "审批时间")
+    private Date approvalTime;
+
+    @ApiModelProperty(value = "审批结果 数据字典 APPROVAL_BUSSINESS_NODE_STATUS:1待审批 2驳回发起人 3驳回上一级  4审批通过")
+    private Integer status;
+
+    @ApiModelProperty(value = "审批结果名称 数据字典 APPROVAL_BUSSINESS_NODE_STATUS:1待审批 2驳回发起人 3驳回上一级  4审批通过")
+    private String statusName;
+
+    @ApiModelProperty(value = "备注")
+    private String memo;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/BaseFeeDTO.java

@@ -0,0 +1,45 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class BaseFeeDTO implements Serializable {
+
+    @ApiModelProperty(value = "ID")
+    private Long id;
+
+    @ApiModelProperty(value = "承运商编码")
+    private String code;
+
+    @ApiModelProperty(value = "费用编码")
+    private String expenseCode;
+
+    @ApiModelProperty(value = "费用名称")
+    private String expenseName;
+
+    @ApiModelProperty(value = "费用类别")
+    private Integer expenseType;
+    private String expenseTypeName;
+
+    @ApiModelProperty(value = "费用科目编码")
+    private String expenseAccountCode;
+
+    @ApiModelProperty(value = "费用科目名称")
+    private String expenseAccountName;
+
+    @ApiModelProperty(value = "创建人")
+    private String createperson;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createtime;
+
+    @ApiModelProperty(value = "最后修改人")
+    private String updateperson;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private Date updatetime;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/BranchByEncodingNameDTO.java

@@ -0,0 +1,200 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 根据仓库编码名称查询仓库资料DTO
+ *
+ * @className :BranchByEncodingNameDTO
+ * @author :fanzw
+ * @creationTime :2022/05/10
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/05/10
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("根据仓库编码名称查询仓库资料DTO")
+public class BranchByEncodingNameDTO implements Serializable {
+
+	private static final long serialVersionUID = -1895173712879196111L;
+
+	@ApiModelProperty(value = "仓库ID (主键)")
+	private Long id;
+
+	@ApiModelProperty(value = "仓库编码")
+	private String code;
+
+	@ApiModelProperty(value = "仓库名称")
+	private String name;
+
+	@ApiModelProperty(value = "仓库简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区编码")
+	private String district;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "提货签到 数据字典WHETHER:0否，1是")
+	private Integer pickUpSign;
+
+	@ApiModelProperty(value = "自动提货签到 数据字典WHETHER:0否，1是")
+	private Integer autoPickUpSign;
+
+	@ApiModelProperty(value = "提货图片 数据字典WHETHER:0否，1是")
+	private Integer pickUpPicture;
+
+	@ApiModelProperty(value = "默认提货围栏")
+	private BigDecimal defaultPickUpRail;
+
+	@ApiModelProperty(value = "送达签到 数据字典WHETHER:0否，1是")
+	private Integer deliverySign;
+
+	@ApiModelProperty(value = "自动送达签到 数据字典WHETHER:0否，1是")
+	private Integer autoDeliverySign;
+
+	@ApiModelProperty(value = "送达图片 数据字典WHETHER:0否，1是")
+	private Integer deliveryPicture;
+
+	@ApiModelProperty(value = "回单图片 数据字典WHETHER:0否，1是")
+	private Integer returnOrderPicture;
+
+	@ApiModelProperty(value = "默认送达围栏")
+	private BigDecimal defaultDeliveryRail;
+
+	@ApiModelProperty(value = "每日作业开始时间")
+	private String startTime;
+
+	@ApiModelProperty(value = "每日作业结束时间")
+	private String endTime;
+
+	@ApiModelProperty(value = "作业时长")
+	private BigDecimal workingTime;
+
+	@ApiModelProperty(value = "扩展字段1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "扩展字段2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "扩展字段3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "扩展字段4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "扩展字段5")
+	private String extStr5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段6")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段7")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段8")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段9")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段10")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "扩展字段11")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "扩展字段12")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "扩展字段13")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "扩展字段14")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "扩展字段15")
+	private BigDecimal extNum5;
+
+	@ApiModelProperty(value = "站点ID")
+	private Long stationId;
+
+	@ApiModelProperty(value = "站点编号")
+	private String stationCode;
+
+	@ApiModelProperty(value = "站点名称")
+	private String stationName;
+
+	@ApiModelProperty(value = "站点区域")
+	private String stationAreas;
+
+	@ApiModelProperty(value = "站点配送顺序")
+	private BigDecimal stationDeliveryOrder;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/BranchByNameDTO.java

@@ -0,0 +1,200 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 根据仓库名称查询仓库资料DTO
+ *
+ * @className :BranchByNameDTO
+ * @author :fanzw
+ * @creationTime :2022/05/10
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/05/10
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("根据仓库名称查询仓库资料DTO")
+public class BranchByNameDTO implements Serializable {
+
+	private static final long serialVersionUID = -2922339129005776899L;
+
+	@ApiModelProperty(value = "仓库ID (主键)")
+	private Long id;
+
+	@ApiModelProperty(value = "仓库编码")
+	private String code;
+
+	@ApiModelProperty(value = "仓库名称")
+	private String name;
+
+	@ApiModelProperty(value = "仓库简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区编码")
+	private String district;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "提货签到 数据字典WHETHER:0否，1是")
+	private Integer pickUpSign;
+
+	@ApiModelProperty(value = "自动提货签到 数据字典WHETHER:0否，1是")
+	private Integer autoPickUpSign;
+
+	@ApiModelProperty(value = "提货图片 数据字典WHETHER:0否，1是")
+	private Integer pickUpPicture;
+
+	@ApiModelProperty(value = "默认提货围栏")
+	private BigDecimal defaultPickUpRail;
+
+	@ApiModelProperty(value = "送达签到 数据字典WHETHER:0否，1是")
+	private Integer deliverySign;
+
+	@ApiModelProperty(value = "自动送达签到 数据字典WHETHER:0否，1是")
+	private Integer autoDeliverySign;
+
+	@ApiModelProperty(value = "送达图片 数据字典WHETHER:0否，1是")
+	private Integer deliveryPicture;
+
+	@ApiModelProperty(value = "回单图片 数据字典WHETHER:0否，1是")
+	private Integer returnOrderPicture;
+
+	@ApiModelProperty(value = "默认送达围栏")
+	private BigDecimal defaultDeliveryRail;
+
+	@ApiModelProperty(value = "每日作业开始时间")
+	private String startTime;
+
+	@ApiModelProperty(value = "每日作业结束时间")
+	private String endTime;
+
+	@ApiModelProperty(value = "作业时长")
+	private BigDecimal workingTime;
+
+	@ApiModelProperty(value = "扩展字段1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "扩展字段2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "扩展字段3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "扩展字段4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "扩展字段5")
+	private String extStr5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段6")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段7")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段8")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段9")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段10")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "扩展字段11")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "扩展字段12")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "扩展字段13")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "扩展字段14")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "扩展字段15")
+	private BigDecimal extNum5;
+
+	@ApiModelProperty(value = "站点ID")
+	private Long stationId;
+
+	@ApiModelProperty(value = "站点编号")
+	private String stationCode;
+
+	@ApiModelProperty(value = "站点名称")
+	private String stationName;
+
+	@ApiModelProperty(value = "站点区域")
+	private String stationAreas;
+
+	@ApiModelProperty(value = "站点配送顺序")
+	private BigDecimal stationDeliveryOrder;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/CargoOwnerByEncodingNameDTO.java

@@ -0,0 +1,41 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 根据货主编码名称查询货主资料DTO
+ *
+ * @className :CargoOwnerByEncodingNameDTO
+ * @author :fanzw
+ * @creationTime :2022/05/10
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/05/10
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("根据货主编码名称查询货主资料DTO")
+public class CargoOwnerByEncodingNameDTO implements Serializable {
+
+	private static final long serialVersionUID = 7554386109063567644L;
+
+	@ApiModelProperty(value = "货主ID")
+	private Long cargoOwnerId;
+
+	@ApiModelProperty(value = "货主编码")
+	private String cargoOwnerCode;
+
+	@ApiModelProperty(value = "货主名称")
+	private String cargoOwnerName;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/CargoOwnerCheckDTO.java

@@ -0,0 +1,179 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * 货主资料查看DTO
+ *
+ * @className :CargoOwnerCheckDTO
+ * @author :fanzw
+ * @creationTime :2022/02/25
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/02/25
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("货主资料查看DTO")
+public class CargoOwnerCheckDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "货主ID")
+	private Long cargoOwnerId;
+
+	@ApiModelProperty(value = "货主编码")
+	private String cargoOwnerCode;
+
+	@ApiModelProperty(value = "货主名称")
+	private String cargoOwnerName;
+
+	@ApiModelProperty(value = "货主简称")
+	private String cargoOwnerShortName;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String mail;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区/县编码")
+	private String district;
+
+	@ApiModelProperty(value = "区/县名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "法人代表")
+	private String legalman;
+
+	@ApiModelProperty(value = "发票抬头")
+	private String invoice;
+
+	@ApiModelProperty(value = "税号")
+	private String invoiceTaxNumber;
+
+	@ApiModelProperty(value = "注册资金")
+	private String registeredCapital;
+
+	@ApiModelProperty(value = "开户行  数据字典BANK")
+	private Integer bank;
+
+	@ApiModelProperty(value = "银行账号")
+	private String bankAccount;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@ApiModelProperty(value = "成立时间")
+	private Date established;
+
+	@ApiModelProperty(value = "注册地址")
+	private String registeredAddress;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用")
+	private String statusName;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/CargoOwnerPageDTO.java

@@ -0,0 +1,208 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * 货主资料分页查询DTO
+ *
+ * @className :CargoOwnerPagingQueryDTO
+ * @author :fanzw
+ * @creationTime :2022/02/25
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/02/25
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("货主资料分页查询DTO")
+public class CargoOwnerPageDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "货主ID")
+	private Long cargoOwnerId;
+
+	@ApiModelProperty(value = "货主编码")
+	private String cargoOwnerCode;
+
+	@ApiModelProperty(value = "货主名称")
+	private String cargoOwnerName;
+
+	@ApiModelProperty(value = "货主简称")
+	private String cargoOwnerShortName;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String mail;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区/县编码")
+	private String district;
+
+	@ApiModelProperty(value = "区/县名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "法人代表")
+	private String legalman;
+
+	@ApiModelProperty(value = "发票抬头")
+	private String invoice;
+
+	@ApiModelProperty(value = "税号")
+	private String invoiceTaxNumber;
+
+	@ApiModelProperty(value = "注册资金")
+	private String registeredCapital;
+
+	@ApiModelProperty(value = "开户行  数据字典BANK")
+	private Integer bank;
+
+	@ApiModelProperty(value = "开户行名称  数据字典BANK")
+	private String bankName;
+
+	@ApiModelProperty(value = "银行账号")
+	private String bankAccount;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@ApiModelProperty(value = "成立时间")
+	private Date established;
+
+	@ApiModelProperty(value = "注册地址")
+	private String registeredAddress;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用")
+	private String statusName;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/CarrierCheckDTO.java

@@ -0,0 +1,258 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * 承运商查看DTO
+ *
+ * @className :CarrierCheckDTO
+ * @author :xyf
+ * @creationTime :2022/04/14
+ * @description :
+ *
+ * @modifier :xyf
+ * @modifyTime :2022/04/14
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("承运商查看DTO")
+public class CarrierCheckDTO implements Serializable {
+
+	private static final long serialVersionUID = -2530017496497514675L;
+
+	@ApiModelProperty(value = "承运商ID")
+	private Long id;
+
+	@ApiModelProperty(value = "承运商编码")
+	private String code;
+
+	@ApiModelProperty(value = "承运商名称")
+	private String name;
+
+	@ApiModelProperty(value = "承运商简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区编码")
+	private String district;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "合作性质 数据字典：COOPERATIVE_NATURE：1合同 2临时")
+	private Integer cooperativeNature;
+
+	@ApiModelProperty(value = "合作性质")
+	private String cooperativeNatureName;
+
+	@ApiModelProperty(value = "税务登记号")
+	private String taxRegisterNumber;
+
+	@ApiModelProperty(value = "营业执照号")
+	private String businessLicenseNumber;
+
+	@ApiModelProperty(value = "道路许可证")
+	private String roadPermit;
+
+	@ApiModelProperty(value = "法人代表")
+	private String legalman;
+
+	@ApiModelProperty(value = "发票抬头")
+	private String invoice;
+
+	@ApiModelProperty(value = "税号")
+	private String invoiceTaxNumber;
+
+	@ApiModelProperty(value = "注册资金")
+	private String registeredCapital;
+
+	@ApiModelProperty(value = "开户行  数据字典BANK")
+	private Integer bank;
+
+	@ApiModelProperty(value = "银行账号")
+	private String bankAccount;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "成立时间")
+	private Date established;
+
+	@ApiModelProperty(value = "注册地址")
+	private String registeredAddress;
+
+	@ApiModelProperty(value = "提货签到 数据字典WHETHER:0否，1是")
+	private Integer pickUpSign;
+
+	@ApiModelProperty(value = "自动提货签到 数据字典WHETHER:0否，1是")
+	private Integer autoPickUpSign;
+
+	@ApiModelProperty(value = "提货图片 数据字典WHETHER:0否，1是")
+	private Integer pickUpPicture;
+
+	@ApiModelProperty(value = "默认提货围栏")
+	private BigDecimal defaultPickUpRail;
+
+	@ApiModelProperty(value = "送达签到 数据字典WHETHER:0否，1是")
+	private Integer deliverySign;
+
+	@ApiModelProperty(value = "自动送达签到 数据字典WHETHER:0否，1是")
+	private Integer autoDeliverySign;
+
+	@ApiModelProperty(value = "送达图片 数据字典WHETHER:0否，1是")
+	private Integer deliveryPicture;
+
+	@ApiModelProperty(value = "默认送达围栏")
+	private BigDecimal defaultDeliveryRail;
+
+	@ApiModelProperty(value = "是否要求回单  数据字典WHETHER:0否，1是")
+	private Integer returnOrderFlag;
+
+	@ApiModelProperty(value = "回单期限")
+	private Integer returnOrderDeadline;
+
+	@ApiModelProperty(value = "0：停用 1：启用 数据字典MAINDATA_STATUS")
+	private Integer status;
+
+	@ApiModelProperty(value = "来源  数据字典SOURCE：1.新增 2.excel导入 3.接口导入")
+	private Integer source;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "导入批次号")
+	private String importBatchNumber;
+
+	@ApiModelProperty(value = "所属组织ID")
+	private Long organizationId;
+
+	@ApiModelProperty(value = "所属组织编码")
+	private String organizationCode;
+
+	@ApiModelProperty(value = "所属组织名称")
+	private String organizationName;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "企业ID")
+	private Long enterpriseId;
+
+	@ApiModelProperty(value = "公司名称")
+	private String enterpriseName;
+
+	@ApiModelProperty(value = "扩展字段1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "扩展字段2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "扩展字段3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "扩展字段4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "扩展字段5")
+	private String extStr5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段6")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段7")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段8")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段9")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段10")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "扩展字段11")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "扩展字段12")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "扩展字段13")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "扩展字段14")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "扩展字段15")
+	private BigDecimal extNum5;
+
+	@ApiModelProperty(value = "系统标志")
+	private String carrierSysFlag;
+
+	@ApiModelProperty(value = "系统标志名称")
+	private String carrierSysFlagName;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/CarriersByEncodingNameDTO.java

@@ -0,0 +1,273 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 根据承运商编码名称查询承运商资料DTO
+ *
+ * @className :CarriersByEncodingNameDTO
+ * @author :fanzw
+ * @creationTime :2023/09/19
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2023/09/19
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("根据承运商编码名称查询承运商资料DTO")
+public class CarriersByEncodingNameDTO implements Serializable {
+
+	private static final long serialVersionUID = 7896540776635883877L;
+
+	@ApiModelProperty(value = "承运商ID")
+	private Long id;
+
+	@ApiModelProperty(value = "承运商编码")
+	private String code;
+
+	@ApiModelProperty(value = "承运商名称")
+	private String name;
+
+	@ApiModelProperty(value = "承运商简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区编码")
+	private String district;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "合作性质 数据字典：COOPERATIVE_NATURE：1合同 2临时")
+	private Integer cooperativeNature;
+
+	@ApiModelProperty(value = "税务登记号")
+	private String taxRegisterNumber;
+
+	@ApiModelProperty(value = "营业执照号")
+	private String businessLicenseNumber;
+
+	@ApiModelProperty(value = "道路许可证")
+	private String roadPermit;
+
+	@ApiModelProperty(value = "法人代表")
+	private String legalman;
+
+	@ApiModelProperty(value = "发票抬头")
+	private String invoice;
+
+	@ApiModelProperty(value = "税号")
+	private String invoiceTaxNumber;
+
+	@ApiModelProperty(value = "注册资金")
+	private String registeredCapital;
+
+	@ApiModelProperty(value = "开户行  数据字典BANK")
+	private Integer bank;
+
+	@ApiModelProperty(value = "银行账号")
+	private String bankAccount;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "成立时间")
+	private Date established;
+
+	@ApiModelProperty(value = "注册地址")
+	private String registeredAddress;
+
+	@ApiModelProperty(value = "提货签到 数据字典WHETHER:0否，1是")
+	private Integer pickUpSign;
+
+	@ApiModelProperty(value = "自动提货签到 数据字典WHETHER:0否，1是")
+	private Integer autoPickUpSign;
+
+	@ApiModelProperty(value = "提货图片 数据字典WHETHER:0否，1是")
+	private Integer pickUpPicture;
+
+	@ApiModelProperty(value = "默认提货围栏")
+	private BigDecimal defaultPickUpRail;
+
+	@ApiModelProperty(value = "送达签到 数据字典WHETHER:0否，1是")
+	private Integer deliverySign;
+
+	@ApiModelProperty(value = "自动送达签到 数据字典WHETHER:0否，1是")
+	private Integer autoDeliverySign;
+
+	@ApiModelProperty(value = "送达图片 数据字典WHETHER:0否，1是")
+	private Integer deliveryPicture;
+
+	@ApiModelProperty(value = "默认送达围栏")
+	private BigDecimal defaultDeliveryRail;
+
+	@ApiModelProperty(value = "是否要求回单  数据字典WHETHER:0否，1是")
+	private Integer returnOrderFlag;
+
+	@ApiModelProperty(value = "回单期限")
+	private Integer returnOrderDeadline;
+
+	@ApiModelProperty(value = "0：停用 1：启用 数据字典MAINDATA_STATUS")
+	private Integer status;
+
+	@ApiModelProperty(value = "来源  数据字典SOURCE：1.新增 2.excel导入 3.接口导入")
+	private Integer source;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "导入批次号")
+	private String importBatchNumber;
+
+	@ApiModelProperty(value = "所属组织ID")
+	private Long organizationId;
+
+	@ApiModelProperty(value = "所属组织编码")
+	private String organizationCode;
+
+	@ApiModelProperty(value = "所属组织名称")
+	private String organizationName;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "企业ID")
+	private Long enterpriseId;
+
+	@ApiModelProperty(value = "公司名称")
+	private String enterpriseName;
+
+	@ApiModelProperty(value = "扩展字段1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "扩展字段2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "扩展字段3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "扩展字段4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "扩展字段5")
+	private String extStr5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段6")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段7")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段8")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段9")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段10")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "扩展字段11")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "扩展字段12")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "扩展字段13")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "扩展字段14")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "扩展字段15")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+
+	@ApiModelProperty(value = "系统标志")
+	private String carrierSysFlag;
+
+	@ApiModelProperty(value = "承运商类型 数据字典CARRIERS_TYPE:1.三方快递  2.三方物流")
+	private Integer carriersType;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/CustomerByEncodingNameDTO.java

@@ -0,0 +1,175 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 根据客户编码名称查询客户资料DTO
+ *
+ * @className :CustomerByEncodingNameDTO
+ * @author :fanzw
+ * @creationTime :2022/05/10
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/05/10
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("根据客户编码名称查询客户资料DTO")
+public class CustomerByEncodingNameDTO implements Serializable {
+
+	private static final long serialVersionUID = -5014256956934201693L;
+
+	@ApiModelProperty(value = "客户ID")
+	private Long id;
+
+	@ApiModelProperty(value = "客户编码")
+	private String code;
+
+	@ApiModelProperty(value = "客户名称")
+	private String name;
+
+	@ApiModelProperty(value = "客户简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "货主ID")
+	private Long cargoOwnerId;
+
+	@ApiModelProperty(value = "货主编码")
+	private String cargoOwnerCode;
+
+	@ApiModelProperty(value = "货主名称")
+	private String cargoOwnerName;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区编码")
+	private String district;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "合作性质 数据字典：COOPERATIVE_NATURE：1合同 2临时")
+	private Integer cooperativeNature;
+
+	@ApiModelProperty(value = "税务登记号")
+	private String taxRegisterNumber;
+
+	@ApiModelProperty(value = "营业执照号")
+	private String businessLicenseNumber;
+
+	@ApiModelProperty(value = "道路许可证")
+	private String roadPermit;
+
+	@ApiModelProperty(value = "法人代表")
+	private String legalman;
+
+	@ApiModelProperty(value = "发票抬头")
+	private String invoice;
+
+	@ApiModelProperty(value = "税号")
+	private String invoiceTaxNumber;
+
+	@ApiModelProperty(value = "注册资金")
+	private String registeredCapital;
+
+	@ApiModelProperty(value = "开户行")
+	private Integer bank;
+
+	@ApiModelProperty(value = "银行账号")
+	private String bankAccount;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "成立时间")
+	private Date established;
+
+	@ApiModelProperty(value = "注册地址")
+	private String registeredAddress;
+
+	@ApiModelProperty(value = "提货签到 数据字典WHETHER:0否，1是")
+	private Integer pickUpSign;
+
+	@ApiModelProperty(value = "自动提货签到 数据字典WHETHER:0否，1是")
+	private Integer autoPickUpSign;
+
+	@ApiModelProperty(value = "提货图片 数据字典WHETHER:0否，1是")
+	private Integer pickUpPicture;
+
+	@ApiModelProperty(value = "默认提货围栏")
+	private BigDecimal defaultPickUpRail;
+
+	@ApiModelProperty(value = "送达签到 数据字典WHETHER:0否，1是")
+	private Integer deliverySign;
+
+	@ApiModelProperty(value = "自动送达签到 数据字典WHETHER:0否，1是")
+	private Integer autoDeliverySign;
+
+	@ApiModelProperty(value = "送达图片 数据字典WHETHER:0否，1是")
+	private Integer deliveryPicture;
+
+	@ApiModelProperty(value = "默认送达围栏")
+	private BigDecimal defaultDeliveryRail;
+
+	@ApiModelProperty(value = "是否要求回单 数据字典WHETHER:0否，1是")
+	private Integer returnOrderFlag;
+
+	@ApiModelProperty(value = "回单期限")
+	private Integer returnOrderDeadline;
+
+	@ApiModelProperty(value = "回单图片 数据字典WHETHER:0否，1是")
+	private Integer returnOrderPicture;
+
+	@ApiModelProperty(value = "收货方信息")
+	private CustomerConsigneeByEncodingNameDTO consignee;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/CustomerCarrierDTO.java

@@ -0,0 +1,55 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ *
+ *
+ * 客户匹配唯一承运方DTO
+ *
+ * @className :CustomerCarrierDTO
+ * @author :lhb
+ * @creationTime :2022/06/16
+ * @description :
+ *
+ * @modifier :
+ * @modifyTime :
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("客户匹配唯一承运方DTO")
+public class CustomerCarrierDTO {
+
+    @ApiModelProperty(value = "承运方类型 数据字典LINE_CARRIER_TYPE:1.承运商  2.司机")
+    private Integer carrierType;
+
+    @ApiModelProperty(value = "承运方ID")
+    private Long carrierId;
+
+    @ApiModelProperty(value = "承运方编码")
+    private String carrierCode;
+
+    @ApiModelProperty(value = "承运方名称")
+    private String carrierName;
+
+    @ApiModelProperty(value = "承运方(司机)手机号")
+    private String carrierPhoneNumber;
+
+    @ApiModelProperty(value = "车辆ID")
+    private Long vehicleId;
+
+    @ApiModelProperty(value = "车辆编号")
+    private String vehicleCode;
+
+    @ApiModelProperty(value = "车辆名称")
+    private String vehicleName;
+
+    @ApiModelProperty(value = "车牌号")
+    private String vehiclePlateNumber;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/CustomerConsigneeByEncodingNameDTO.java

@@ -0,0 +1,102 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 根据客户收货方编码名称查询客户收货方资料DTO
+ *
+ * @className :CustomerConsigneeByEncodingNameDTO
+ * @author :fanzw
+ * @creationTime :2022/05/10
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/05/10
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("根据客户收货方编码名称查询客户收货方资料DTO")
+public class CustomerConsigneeByEncodingNameDTO implements Serializable {
+
+	private static final long serialVersionUID = -2578624632959100027L;
+
+	@ApiModelProperty(value = "收货方ID")
+	private Long id;
+
+	@ApiModelProperty(value = "收货方编码")
+	private String code;
+
+	@ApiModelProperty(value = "收货方名称")
+	private String name;
+
+	@ApiModelProperty(value = "收货方简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "客户ID 关联TMS_BASE_CUSTOMER表主键")
+	private Long customerId;
+
+	@ApiModelProperty(value = "客户编号")
+	private String customerCode;
+
+	@ApiModelProperty(value = "客户名称")
+	private String customerName;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "关联手机号")
+	private String relationPhoneNumber;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区编码")
+	private String district;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "配送方式  字典 1配送 2自提")
+	private Integer deliveryPattern;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/ImportMatchingDataDTO.java

@@ -0,0 +1,231 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import com.prolog.framework.core.annotation.Column;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 运单导入时匹配资料DTO
+ *
+ * @className :ImportMatchingDataDTO
+ * @author :fanzw
+ * @creationTime :2022/11/05
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/11/05
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("运单导入时匹配资料DTO")
+public class ImportMatchingDataDTO implements Serializable {
+
+	private static final long serialVersionUID = 497706631377135153L;
+
+	@ApiModelProperty(value = "发货方单位ID")
+	private Long shipperUnitId;
+
+	@ApiModelProperty(value = "发货方单位编码")
+	private String shipperUnitCode;
+
+	@ApiModelProperty(value = "发货方单位名称")
+	private String shipperUnitName;
+
+	@ApiModelProperty(value = "发货方ID")
+	private Long shipperId;
+
+	@ApiModelProperty(value = "发货方编码")
+	private String shipperCode;
+
+	@ApiModelProperty(value = "发货方名称")
+	private String shipperName;
+
+	@ApiModelProperty(value = "发货方联系人")
+	private String shipperContact;
+
+	@ApiModelProperty(value = "发货方手机号")
+	private String shipperPhoneNumber;
+
+	@ApiModelProperty(value = "发货方座机号")
+	private String shipperLandlineNumber;
+
+	@ApiModelProperty(value = "发货方邮箱")
+	private String shipperEmail;
+
+	@ApiModelProperty(value = "发货方关联手机号")
+	private String shipperRelatedPhoneNumber;
+
+	@ApiModelProperty(value = "发货方省编码")
+	private String shipperProvince;
+
+	@ApiModelProperty(value = "发货方省名称")
+	private String shipperProvinceName;
+
+	@ApiModelProperty(value = "发货方市编码")
+	private String shipperCity;
+
+	@ApiModelProperty(value = "发货方市名称")
+	private String shipperCityName;
+
+	@ApiModelProperty(value = "发货方区/县编码")
+	private String shipperDistrict;
+
+	@ApiModelProperty(value = "发货方区/县名称")
+	private String shipperDistrictName;
+
+	@ApiModelProperty(value = "发货方详细地址")
+	private String shipperAddress;
+
+	@ApiModelProperty(value = "发货方经度")
+	private BigDecimal shipperLongitude;
+
+	@ApiModelProperty(value = "发货方纬度")
+	private BigDecimal shipperLatitude;
+
+	@ApiModelProperty(value = "发货方备注")
+	private String shipperMemo;
+
+	@ApiModelProperty(value = "提货签到 数据字典WHETHER:0否，1是")
+	private Integer shipperPickUpSign;
+
+	@ApiModelProperty(value = "自动提货签到 数据字典WHETHER:0否，1是")
+	private Integer shipperAutoPickUpSign;
+
+	@ApiModelProperty(value = "提货图片 数据字典WHETHER:0否，1是")
+	private Integer shipperPickUpPicture;
+
+	@ApiModelProperty(value = "默认提货围栏(km)")
+	private BigDecimal shipperPickUpRail;
+
+	@ApiModelProperty(value = "发货方签到时间点 数据字典PICK_UP_SIGN_TIME 10预计提货开始时间 20预计提货结束时间 " +
+			"30下单时间 40提交时间 50审核时间 60调度时间 70调度审核时间")
+	private Integer shipperSignTime;
+
+	@ApiModelProperty(value = "发货方签到时间期间")
+	private Integer shipperSignTimeDura;
+
+	@ApiModelProperty(value = "发货方签到时间单位 数据字典SIGN_TIME_UNIT 1分钟 2小时 3天")
+	private Integer shipperSignTimeUnit;
+
+	@ApiModelProperty(value = "收货方单位ID")
+	private Long consigneeUnitId;
+
+	@ApiModelProperty(value = "收货方单位编码")
+	private String consigneeUnitCode;
+
+	@ApiModelProperty(value = "收货方单位名称")
+	private String consigneeUnitName;
+
+	@ApiModelProperty(value = "收货方ID")
+	private Long consigneeId;
+
+	@ApiModelProperty(value = "收货方编码")
+	private String consigneeCode;
+
+	@ApiModelProperty(value = "收货方名称")
+	private String consigneeName;
+
+	@ApiModelProperty(value = "收货方联系人")
+	private String consigneeContact;
+
+	@ApiModelProperty(value = "收货方手机号")
+	private String consigneePhoneNumber;
+
+	@ApiModelProperty(value = "收货方座机号")
+	private String consigneeLandlineNumber;
+
+	@ApiModelProperty(value = "收货方邮箱")
+	private String consigneeEmail;
+
+	@ApiModelProperty(value = "收货方关联手机号")
+	private String consigneeRelatedPhoneNumber;
+
+	@ApiModelProperty(value = "收货方省编码")
+	private String consigneeProvince;
+
+	@ApiModelProperty(value = "收货方省名称")
+	private String consigneeProvinceName;
+
+	@ApiModelProperty(value = "收货方市编码")
+	private String consigneeCity;
+
+	@ApiModelProperty(value = "收货方市名称")
+	private String consigneeCityName;
+
+	@ApiModelProperty(value = "收货方区/县编码")
+	private String consigneeDistrict;
+
+	@ApiModelProperty(value = "收货方区/县名称")
+	private String consigneeDistrictName;
+
+	@ApiModelProperty(value = "收货方详细地址")
+	private String consigneeAddress;
+
+	@ApiModelProperty(value = "收货方经度")
+	private BigDecimal consigneeLongitude;
+
+	@ApiModelProperty(value = "收货方纬度")
+	private BigDecimal consigneeLatitude;
+
+	@ApiModelProperty(value = "收货方备注")
+	private String consigneeMemo;
+
+	@ApiModelProperty(value = "送达签到 数据字典WHETHER:0否，1是")
+	private Integer consigneeDeliverySign;
+
+	@ApiModelProperty(value = "自动送达签到 数据字典WHETHER:0否，1是")
+	private Integer consigneeAutoDeliverySign;
+
+	@ApiModelProperty(value = "收货方签到时间点 数据字典DELIVERY_SIGN_TIME 10预计送达开始时间 20预计送达结束时间 " +
+			"30下单时间 40提交时间 50审核时间 60调度时间 70调度审核时间")
+	private Integer consigneeSignTime;
+
+	@ApiModelProperty(value = "收货方签到时间期间")
+	private Integer consigneeSignTimeDura;
+
+	@ApiModelProperty(value = "收货方签到时间单位 数据字典SIGN_TIME_UNIT 1分钟 2小时 3天")
+	private Integer consigneeSignTimeUnit;
+
+	@ApiModelProperty(value = "送货图片 数据字典WHETHER:0否，1是")
+	private Integer consigneeDeliveryPicture;
+
+	@ApiModelProperty(value = "默认送货围栏(km)")
+	private BigDecimal consigneeDeliveryRail;
+
+	@ApiModelProperty(value = "是否要求回单 数据字典WHETHER:0否，1是")
+	private Integer returnOrderFlag;
+
+	@ApiModelProperty(value = "回单期限")
+	private Integer returnOrderDeadline;
+
+	@ApiModelProperty(value = "回单图片 数据字典WHETHER:0否，1是")
+	private Integer consigneeReturnOrderPicture;
+
+	@ApiModelProperty(value = "配送方式  字典 1配送 2自提")
+	private Integer deliveryPattern;
+
+	@ApiModelProperty(value = "站点ID")
+	private Long stationId;
+
+	@ApiModelProperty(value = "站点编号")
+	private String stationCode;
+
+	@ApiModelProperty(value = "站点名称")
+	private String stationName;
+
+	@ApiModelProperty(value = "站点区域")
+	private String stationAreas;
+
+	@ApiModelProperty(value = "站点配送顺序")
+	private BigDecimal stationDeliveryOrder;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/ItemByEncodingNameDTO.java

@@ -0,0 +1,177 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * 根据商品编码名称查询商品资料DTO
+ *
+ * @className :ItemByEncodingNameDTO
+ * @author :fanzw
+ * @creationTime :2022/05/10
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/05/10
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("根据商品编码名称查询商品资料DTO")
+public class ItemByEncodingNameDTO implements Serializable {
+
+	private static final long serialVersionUID = -1703244645797387669L;
+
+	@ApiModelProperty(value = "商品ID")
+	private Long itemId;
+
+	@ApiModelProperty(value = "商品编码")
+	private String itemCode;
+
+	@ApiModelProperty(value = "商品名称")
+	private String itemName;
+
+	@ApiModelProperty(value = "商品简称")
+	private String itemShortName;
+
+	@ApiModelProperty(value = "商品英文名称")
+	private String itemEnglishName;
+
+	@ApiModelProperty(value = "商品助记码")
+	private String zjm;
+
+	@ApiModelProperty(value = "商品品类ID")
+	private Long itemCategoryId;
+
+	@ApiModelProperty(value = "商品品类编码")
+	private String itemCategoryCode;
+
+	@ApiModelProperty(value = "商品品类名称")
+	private String itemCategoryName;
+
+	@ApiModelProperty(value = "商品品类层级  数据字典ITEM_CATEGORY_LEVEL")
+	private Integer itemCategoryLevel;
+
+	@ApiModelProperty(value = "包装类型  数据字典PACK_TYPE:1纸箱  2包装袋")
+	private Integer packType;
+
+	@ApiModelProperty(value = "货物温层  数据字典CARGO_THERMOSPHERE:1常温 2冷藏 3冷冻")
+	private Integer cargoThermosphere;
+
+	@ApiModelProperty(value = "长(cm)")
+	private BigDecimal length;
+
+	@ApiModelProperty(value = "宽(cm)")
+	private BigDecimal width;
+
+	@ApiModelProperty(value = "高(cm)")
+	private BigDecimal heigth;
+
+	@ApiModelProperty(value = "重量(kg)")
+	private BigDecimal weight;
+
+	@ApiModelProperty(value = "体积(cm3)")
+	private BigDecimal volume;
+
+	@ApiModelProperty(value = "货值")
+	private BigDecimal cargoValue;
+
+	@ApiModelProperty(value = "货主ID")
+	private Long cargoOwnerId;
+
+	@ApiModelProperty(value = "货主编码")
+	private String cargoOwnerCode;
+
+	@ApiModelProperty(value = "货主名称")
+	private String cargoOwnerName;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "库存件数")
+	private Integer inventoryPcs;
+
+	@ApiModelProperty(value = "暂存位")
+	private String stagingLocation;
+
+	@ApiModelProperty(value = "仓库ID")
+	private Long branchId;
+
+	@ApiModelProperty(value = "仓库编码")
+	private String branchCode;
+
+	@ApiModelProperty(value = "仓库名称")
+	private String branchName;
+
+	@ApiModelProperty(value = "温控区间（上限）")
+	private BigDecimal temperatureCtlUpperLimit;
+
+	@ApiModelProperty(value = "温控区间（下限）")
+	private BigDecimal temperatureCtlLowerLimit;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/ItemCategoryCheckDTO.java

@@ -0,0 +1,122 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * 商品品类查看DTO
+ *
+ * @className :ItemCategoryCheckDTO
+ * @author :fanzw
+ * @creationTime :2022/02/24
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/02/24
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("商品品类查看DTO")
+public class ItemCategoryCheckDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "商品品类ID")
+	private Long itemCategoryId;
+
+	@ApiModelProperty(value = "商品品类编码")
+	private String itemCategoryCode;
+
+	@ApiModelProperty(value = "商品品类名称")
+	private String itemCategoryName;
+
+	@ApiModelProperty(value = "商品品类层级  数据字典ITEM_CATEGORY_LEVEL")
+	private Integer itemCategoryLevel;
+
+	@ApiModelProperty(value = "上级商品品类ID")
+	private Long fatherItemCategoryId;
+
+	@ApiModelProperty(value = "上级商品品类编码")
+	private String fatherItemCategoryCode;
+
+	@ApiModelProperty(value = "上级商品品类名称")
+	private String fatherItemCategoryName;
+
+	@ApiModelProperty(value = "上级商品品类层级  数据字典ITEM_CATEGORY_LEVEL")
+	private Integer fatherItemCategoryLevel;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用")
+	private String statusName;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/ItemCheckDTO.java

@@ -0,0 +1,185 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 商品资料查看DTO
+ *
+ * @className :ItemCheckDTO
+ * @author :fanzw
+ * @creationTime :2022/02/25
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/02/25
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("商品资料查看DTO")
+public class ItemCheckDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "商品ID")
+	private Long itemId;
+
+	@ApiModelProperty(value = "商品编码")
+	private String itemCode;
+
+	@ApiModelProperty(value = "商品名称")
+	private String itemName;
+
+	@ApiModelProperty(value = "商品品类ID")
+	private Long itemCategoryId;
+
+	@ApiModelProperty(value = "商品品类编码")
+	private String itemCategoryCode;
+
+	@ApiModelProperty(value = "商品品类名称")
+	private String itemCategoryName;
+
+	@ApiModelProperty(value = "商品品类层级  数据字典ITEM_CATEGORY_LEVEL")
+	private Integer itemCategoryLevel;
+
+	@ApiModelProperty(value = "包装类型  数据字典PACK_TYPE:1纸箱  2包装袋")
+	private Integer packType;
+
+	@ApiModelProperty(value = "货物温层  数据字典CARGO_THERMOSPHERE:1常温 2冷藏 3冷冻")
+	private Integer cargoThermosphere;
+
+	@ApiModelProperty(value = "长(cm)")
+	private BigDecimal length;
+
+	@ApiModelProperty(value = "宽(cm)")
+	private BigDecimal width;
+
+	@ApiModelProperty(value = "高(cm)")
+	private BigDecimal heigth;
+
+	@ApiModelProperty(value = "重量(kg)")
+	private BigDecimal weight;
+
+	@ApiModelProperty(value = "体积(cm3)")
+	private BigDecimal volume;
+
+	@ApiModelProperty(value = "货值")
+	private BigDecimal cargoValue;
+
+	@ApiModelProperty(value = "货主ID")
+	private Long cargoOwnerId;
+
+	@ApiModelProperty(value = "货主编码")
+	private String cargoOwnerCode;
+
+	@ApiModelProperty(value = "货主名称")
+	private String cargoOwnerName;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用")
+	private String statusName;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "库存件数")
+	private Integer inventoryPcs;
+
+	@ApiModelProperty(value = "暂存位")
+	private String stagingLocation;
+
+	@ApiModelProperty(value = "仓库ID")
+	private Long branchId;
+
+	@ApiModelProperty(value = "仓库编码")
+	private String branchCode;
+
+	@ApiModelProperty(value = "仓库名称")
+	private String branchName;
+
+	@ApiModelProperty(value = "温控区间（上限）")
+	private BigDecimal temperatureCtlUpperLimit;
+
+	@ApiModelProperty(value = "温控区间（下限）")
+	private BigDecimal temperatureCtlLowerLimit;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/ItemPagingQueryDTO.java

@@ -0,0 +1,235 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * 商品资料分页查询DTO
+ *
+ * @className :ItemPagingQueryDTO
+ * @author :fanzw
+ * @creationTime :2022/02/25
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/02/25
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("商品资料分页查询DTO")
+public class ItemPagingQueryDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "商品ID")
+	private Long itemId;
+
+	@ApiModelProperty(value = "商品编码")
+	private String itemCode;
+
+	@ApiModelProperty(value = "商品名称")
+	private String itemName;
+
+	@ApiModelProperty(value = "商品品类ID")
+	private Long itemCategoryId;
+
+	@ApiModelProperty(value = "商品品类编码")
+	private String itemCategoryCode;
+
+	@ApiModelProperty(value = "商品品类名称")
+	private String itemCategoryName;
+
+	@ApiModelProperty(value = "商品品类层级  数据字典ITEM_CATEGORY_LEVEL")
+	private Integer itemCategoryLevel;
+
+	@ApiModelProperty(value = "包装类型  数据字典PACK_TYPE:1纸箱  2包装袋")
+	private Integer packType;
+
+	@ApiModelProperty(value = "包装类型  数据字典PACK_TYPE:1纸箱  2包装袋")
+	private String packTypeName;
+
+	@ApiModelProperty(value = "货物温层  数据字典CARGO_THERMOSPHERE:1常温 2冷藏 3冷冻")
+	private Integer cargoThermosphere;
+
+	@ApiModelProperty(value = "货物温层  数据字典CARGO_THERMOSPHERE:1常温 2冷藏 3冷冻")
+	private String cargoThermosphereName;
+
+	@ApiModelProperty(value = "长(cm)")
+	private BigDecimal length;
+
+	@ApiModelProperty(value = "宽(cm)")
+	private BigDecimal width;
+
+	@ApiModelProperty(value = "高(cm)")
+	private BigDecimal heigth;
+
+	@ApiModelProperty(value = "重量(kg)")
+	private BigDecimal weight;
+
+	@ApiModelProperty(value = "体积(cm3)")
+	private BigDecimal volume;
+
+	@ApiModelProperty(value = "货值")
+	private BigDecimal cargoValue;
+
+	@ApiModelProperty(value = "货主ID")
+	private Long cargoOwnerId;
+
+	@ApiModelProperty(value = "货主编码")
+	private String cargoOwnerCode;
+
+	@ApiModelProperty(value = "货主名称")
+	private String cargoOwnerName;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用")
+	private String statusName;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+
+	@ApiModelProperty(value = "库存件数")
+	private Integer inventoryPcs;
+
+	@ApiModelProperty(value = "暂存位")
+	private String stagingLocation;
+
+	@ApiModelProperty(value = "仓库ID")
+	private Long branchId;
+
+	@ApiModelProperty(value = "仓库编码")
+	private String branchCode;
+
+	@ApiModelProperty(value = "仓库名称")
+	private String branchName;
+
+	@ApiModelProperty(value = "温控区间（上限）")
+	private BigDecimal temperatureCtlUpperLimit;
+
+	@ApiModelProperty(value = "温控区间（下限）")
+	private BigDecimal temperatureCtlLowerLimit;
+
+	@ApiModelProperty(value = "批准文号")
+	private String symbol;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "批准文号有效期")
+	private Date symbolExpirationDate;
+
+	@ApiModelProperty(value = "上市许可持有人")
+	private String licensor;
+
+	@ApiModelProperty(value = "商品规格")
+	private String capacity;
+
+	@ApiModelProperty(value = "生产厂商")
+	private String factory;
+
+	@ApiModelProperty(value = "产地")
+	private String origin;
+
+	@ApiModelProperty(value = "件包装数")
+	private BigDecimal packSize;
+
+	@ApiModelProperty(value = "剂型 数据字典ITEM_DOSE_TYPE: 1胶囊 2药片")
+	private Integer doseType;
+
+	@ApiModelProperty(value = "剂型 数据字典ITEM_DOSE_TYPE: 1胶囊 2药片")
+	private String doseTypeName;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/LineByCustomerQueryDTO.java

@@ -0,0 +1,41 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 根据客户查询线路DTO
+ *
+ * @className :LineByCustomerQueryDTO
+ * @author :fanzw
+ * @creationTime :2022/07/06
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/07/06
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("根据客户查询线路DTO")
+public class LineByCustomerQueryDTO implements Serializable {
+
+	private static final long serialVersionUID = 599424027147115216L;
+
+	@ApiModelProperty(value = "线路ID")
+	private Long lineId;
+
+	@ApiModelProperty(value = "线路编号")
+	private String lineCode;
+
+	@ApiModelProperty(value = "线路名称")
+	private String lineName;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/LineShipperConsigneeDTO.java

@@ -0,0 +1,22 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class LineShipperConsigneeDTO implements Serializable {
+
+	private static final long serialVersionUID = -2692526468987082672L;
+
+	@ApiModelProperty(value = "线路ID")
+	private Long lineId;
+
+	@ApiModelProperty(value = "线路的发货方集合")
+	private List<TmsShipperDTO> shipperDTOS;
+
+	@ApiModelProperty(value = "线路的收货方集合")
+	private List<TmsArriverDTO> consigneeDTOS;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/ProviderCheckDTO.java

@@ -0,0 +1,206 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 供应商资料查看DTO
+ * 
+ * @author Eton Woo
+ * @date 2022/03/28
+ */
+@Data
+@ApiModel("供应商资料查看DTO")
+public class ProviderCheckDTO implements Serializable {
+
+	private static final long serialVersionUID = 9129262925347082592L;
+
+	@ApiModelProperty(value = "供应商ID")
+	private Long id;
+	
+	@ApiModelProperty(value = "供应商编码")
+	private String code;
+	
+	@ApiModelProperty(value = "供应商名称")
+	private String name;
+	
+	@ApiModelProperty(value = "供应商简称")
+	private String shortName;
+	
+	@ApiModelProperty(value = "所属货主ID")
+	private Long cargoOwnerId;
+	
+	@ApiModelProperty(value = "所属货主编码")
+	private String cargoOwnerCode;
+	
+	@ApiModelProperty(value = "所属货主名称")
+	private String cargoOwnerName;
+	
+	@ApiModelProperty(value = "合同性质 数据字典 CONTRACT_NATURE 1-合同 2-临时")
+	private Integer contractNature;
+	
+	@ApiModelProperty(value = "税务登记号")
+	private String taxRegisterNumber;
+	
+	@ApiModelProperty(value = "营业执照号")
+	private String businessLicenseNumber;
+	
+	@ApiModelProperty(value = "备注")
+	private String memo;
+	
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+	
+	@ApiModelProperty(value = "联系人手机号")
+	private String phoneNumber;
+	
+	@ApiModelProperty(value = "联系人座机号")
+	private String landlineNumber;
+	
+	@ApiModelProperty(value = "联系人邮箱")
+	private String email;
+	
+	@ApiModelProperty(value = "联系人邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区/县编码")
+	private String district;
+
+	@ApiModelProperty(value = "区/县名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "法人代表")
+	private String legalman;
+
+	@ApiModelProperty(value = "发票抬头")
+	private String invoice;
+
+	@ApiModelProperty(value = "税号")
+	private String invoiceTaxNumber;
+
+	@ApiModelProperty(value = "注册资金")
+	private String registeredCapital;
+
+	@ApiModelProperty(value = "开户行  数据字典BANK")
+	private Integer bank;
+
+	@ApiModelProperty(value = "银行账号")
+	private String bankAccount;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@ApiModelProperty(value = "成立时间")
+	private Date established;
+
+	@ApiModelProperty(value = "注册地址")
+	private String registeredAddress;
+	
+	@ApiModelProperty(value = "提货签到 数据字典WHETHER:0否，1是")
+	private Integer pickUpSign;
+	
+	@ApiModelProperty(value = "自动提货签到 数据字典WHETHER:0否，1是")
+	private Integer autoPickUpSign;
+	
+	@ApiModelProperty(value = "提货图片 数据字典WHETHER:0否，1是")
+	private Integer pickUpPicture;
+	
+	@ApiModelProperty(value = "默认提货围栏(km)")
+	private BigDecimal defaultPickUpRail;
+	
+	@ApiModelProperty(value = "送达签到 数据字典WHETHER:0否，1是")
+	private Integer deliverySign;
+	
+	@ApiModelProperty(value = "自动送达签到 数据字典WHETHER:0否，1是")
+	private Integer autoDeliverySign;
+	
+	@ApiModelProperty(value = "送货图片 数据字典WHETHER:0否，1是")
+	private Integer deliveryPicture;
+	
+	@ApiModelProperty(value = "默认送货围栏(km)")
+	private BigDecimal defaultDeliveryRail;
+	
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/ProviderShipperCheckDTO.java

@@ -0,0 +1,136 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 供应商发货方资料查看DTO
+ * 
+ * @author Eton Woo
+ * @date 2022/03/28
+ */
+@Data
+@ApiModel("供应商发货方资料查看DTO")
+public class ProviderShipperCheckDTO implements Serializable {
+
+	private static final long serialVersionUID = 9116357640031104935L;
+
+	@ApiModelProperty(value = "发货方ID")
+	private Long id;
+	
+	@ApiModelProperty(value = "发货方编码")
+	private String code;
+	
+	@ApiModelProperty(value = "发货方名称")
+	private String name;
+	
+	@ApiModelProperty(value = "发货方简称")
+	private String shortName;
+	
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+	
+	@ApiModelProperty(value = "联系人手机号")
+	private String phoneNumber;
+	
+	@ApiModelProperty(value = "联系人座机号")
+	private String landlineNumber;
+	
+	@ApiModelProperty(value = "联系人邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区/县编码")
+	private String district;
+
+	@ApiModelProperty(value = "区/县名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用 数据字典MAINDATA_STATUS")
+	private Integer status;
+	
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/StartingStationViewDTO.java

@@ -0,0 +1,51 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 
+ *
+ * 始发站点资料查看DTO
+ *
+ * @className :StartingStationViewDTO
+ * @author :xyf
+ * @creationTime :2022/04/14
+ * @description :
+ *
+ * @modifier :xyf
+ * @modifyTime :2022/04/14
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("始发站点资料查看DTO")
+public class StartingStationViewDTO implements Serializable {
+
+	private static final long serialVersionUID = 2587512965896470451L;
+
+	@ApiModelProperty(value = "主键id")
+	private Long id;
+
+	@ApiModelProperty(value = "始发站点ID")
+	private Long startingStationId;
+
+	@ApiModelProperty(value = "始发站点编号")
+	private String startingStationCode;
+
+	@ApiModelProperty(value = "始发站点名称")
+	private String startingStationName;
+
+	@ApiModelProperty(value = "距离")
+	private BigDecimal distance;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/StationDistanceDTO.java

@@ -0,0 +1,45 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 
+ *
+ * 站点距离DTO
+ *
+ * @className :StationDistanceDTO
+ * @author :xyf
+ * @creationTime :2022/04/14
+ * @description :
+ *
+ * @modifier :xyf
+ * @modifyTime :2022/04/14
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("站点距离DTO")
+public class StationDistanceDTO implements Serializable {
+
+	private static final long serialVersionUID = 2587512965896470451L;
+
+	@ApiModelProperty(value = "站点名称")
+	private String stationName;
+
+	@ApiModelProperty(value = "始发站点名称")
+	private String startingStationName;
+
+	@ApiModelProperty(value = "距离")
+	private BigDecimal distance;
+
+	/*@ApiModelProperty(value = "始发站点集合")
+	List<StartingStationViewDTO> StartingStationList;*/
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/StationViewDTO.java

@@ -0,0 +1,163 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 
+ *
+ * 站点资料查看DTO
+ *
+ * @className :StationViewDTO
+ * @author :xyf
+ * @creationTime :2022/04/14
+ * @description :
+ *
+ * @modifier :xyf
+ * @modifyTime :2022/04/14
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("站点资料查看DTO")
+public class StationViewDTO implements Serializable {
+
+	private static final long serialVersionUID = 2587512965896470451L;
+
+	@ApiModelProperty(value = "站点ID")
+	private Long id;
+
+	@ApiModelProperty(value = "站点编号")
+	private String code;
+
+	@ApiModelProperty(value = "站点名称")
+	private String name;
+
+	@ApiModelProperty(value = "配送顺序")
+	private Integer deliveryOrder;
+
+	@ApiModelProperty(value = "站点类型 数据字典STATION_TYPE:10.实际 20.虚拟")
+	private Integer type;
+
+	@ApiModelProperty(value = "站点类型名称")
+	private String typeName;
+
+	@ApiModelProperty(value = "上级站点ID")
+	private Long higherLevelStationId;
+
+	@ApiModelProperty(value = "上级站点编号")
+	private String higherLevelStationCode;
+
+	@ApiModelProperty(value = "上级站点名称")
+	private String higherLevelStationName;
+
+	@ApiModelProperty(value = "站点级别 数据字典STATION_LEVEL:1,2,3,4,5")
+	private Integer level;
+
+	@ApiModelProperty(value = "站点区域")
+	private String areas;
+
+	@ApiModelProperty(value = "站点-行政区域")
+	private String administrativeAreas;
+
+	@ApiModelProperty(value = "站点-上级行政区域")
+	private String administrativeAreasFather;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "状态 数据字典MAINDATA_STATUS: 0停用 10启用")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态 数据字典MAINDATA_STATUS: 0停用 10启用")
+	private String statusName;
+
+	@ApiModelProperty(value = "来源  数据字典SOURCE：1.新增 2.excel导入 3.接口导入")
+	private Integer source;
+
+	@ApiModelProperty(value = "导入批次号")
+	private String importBatchNumber;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "企业ID")
+	private Long enterpriseId;
+
+	@ApiModelProperty(value = "企业名称")
+	private String enterpriseName;
+
+	@ApiModelProperty(value = "字符扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+
+	@ApiModelProperty(value = "始发站点信息")
+	List<StartingStationViewDTO> startingStationViewDTOList;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/TmsArriverDTO.java

@@ -0,0 +1,58 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TmsArriverDTO implements Serializable {
+
+	private static final long serialVersionUID = -2692526468987082672L;
+
+	@ApiModelProperty(value = "线路ID")
+	private Long lineId;
+
+	@ApiModelProperty(value = "线路名称")
+	private String lineName;
+
+	@ApiModelProperty(value = "客户ID")
+	private Long customerId;
+
+	@ApiModelProperty(value = "客户编码")
+	private String customerCode;
+
+	@ApiModelProperty(value = "客户名称")
+	private String customerName;
+
+	@ApiModelProperty(value = "收货方ID")
+	private Long consigneeId;
+
+	@ApiModelProperty(value = "收货方编码")
+	private String consigneeCode;
+
+	@ApiModelProperty(value = "收货方名称")
+	private String consigneeName;
+
+	@ApiModelProperty(value = "收货方联系人")
+	private String consigneeContact;
+
+	@ApiModelProperty(value = "收货方手机号")
+	private String consigneePhoneNumber;
+
+	@ApiModelProperty(value = "收货方详细地址")
+	private String consigneeAddress;
+
+	@ApiModelProperty(value = "收货方备注")
+	private String consigneeMemo;
+
+	@ApiModelProperty(value = "配送顺序")
+	private Integer deliveryOrder;
+
+	@ApiModelProperty("经度")
+	private double longitude;
+
+	@ApiModelProperty("纬度")
+	private double latitude;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/TmsBaseBranchApTimeDTO.java

@@ -0,0 +1,26 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel("仓库预约时间段DTO")
+public class TmsBaseBranchApTimeDTO implements Serializable {
+
+	private static final long serialVersionUID = -1703244645797387669L;
+
+	@ApiModelProperty(value = "ID(主键)")
+	private Long id;
+
+	@ApiModelProperty(value = "仓库ID")
+	private Long branchId;
+
+	@ApiModelProperty(value = "预约起始时刻")
+	private String startTime;
+
+	@ApiModelProperty(value = "预约截至时刻")
+	private String endTime;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/TmsBaseBranchDTO.java

@@ -0,0 +1,324 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TmsBaseBranchDTO implements Serializable {
+
+	private static final long serialVersionUID = -1703244645797387669L;
+
+	@ApiModelProperty(value = "仓库ID (主键)")
+	private Long id;
+
+	@ApiModelProperty(value = "仓库编码")
+	private String code;
+
+	@ApiModelProperty(value = "仓库名称")
+	private String name;
+
+	@ApiModelProperty(value = "仓库简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区编码")
+	private String district;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "提货签到 数据字典WHETHER:0否，1是")
+	private String pickUpSign;
+
+	@ApiModelProperty(value = "自动提货签到 数据字典WHETHER:0否，1是")
+	private Integer autoPickUpSign;
+
+	@ApiModelProperty(value = "提货图片 数据字典WHETHER:0否，1是")
+	private String pickUpPicture;
+
+	@ApiModelProperty(value = "默认提货围栏")
+	private BigDecimal defaultPickUpRail;
+
+	@ApiModelProperty(value = "送达签到 数据字典WHETHER:0否，1是")
+	private String deliverySign;
+
+	@ApiModelProperty(value = "自动送达签到 数据字典WHETHER:0否，1是")
+	private Integer autoDeliverySign;
+
+	@ApiModelProperty(value = "送达图片 数据字典WHETHER:0否，1是")
+	private String deliveryPicture;
+
+	@ApiModelProperty(value = "回单图片 数据字典WHETHER:0否，1是")
+	private Integer returnOrderPicture;
+
+	@ApiModelProperty(value = "默认送达围栏")
+	private BigDecimal defaultDeliveryRail;
+
+	@ApiModelProperty(value = "每日作业开始时间")
+	private String startTime;
+
+	@ApiModelProperty(value = "每日作业结束时间")
+	private String endTime;
+
+	@ApiModelProperty(value = "作业时长")
+	private BigDecimal workingTime;
+
+	@ApiModelProperty(value = "企业ID")
+	private Long enterpriseId;
+
+	@ApiModelProperty(value = "企业名称")
+	private String enterpriseName;
+
+	@ApiModelProperty(value = "状态")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态")
+	private String statusName;
+
+	@ApiModelProperty(value = "来源")
+	private Integer source;
+
+	@ApiModelProperty(value = "导入批次号")
+	private String importBatchNumber;
+
+	@ApiModelProperty(value = "扩展字段1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "扩展字段2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "扩展字段3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "扩展字段4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "扩展字段5")
+	private String extStr5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段6")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段7")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段8")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段9")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段10")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "扩展字段11")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "扩展字段12")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "扩展字段13")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "扩展字段14")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "扩展字段15")
+	private BigDecimal extNum5;
+
+	@ApiModelProperty(value = "部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+
+	@ApiModelProperty(value = "提货签到时间点 数据字典PICK_UP_SIGN_TIME 10预计提货开始时间 20预计提货结束时间 " +
+			"30下单时间 40提交时间 50审核时间 60调度时间 70调度审核时间")
+	private Integer pickUpSignTime;
+
+	@ApiModelProperty(value = "提货签到时间期间")
+	private Integer pickUpSignTimeDura;
+
+	@ApiModelProperty(value = "提货签到时间单位 数据字典SIGN_TIME_UNIT 1分钟 2小时 3天")
+	private Integer pickUpSignTimeUnit;
+
+	@ApiModelProperty(value = "送达签到时间点 数据字典PICK_UP_SIGN_TIME 10预计送达开始时间 20预计送达结束时间 " +
+			"30下单时间 40提交时间 50审核时间 60调度时间 70调度审核时间")
+	private Integer deliverySignTime;
+
+	@ApiModelProperty(value = "送达签到时间期间")
+	private Integer deliverySignTimeDura;
+
+	@ApiModelProperty(value = "送达签到时间单位 数据字典SIGN_TIME_UNIT 1分钟 2小时 3天")
+	private Integer deliverySignTimeUnit;
+
+	@ApiModelProperty(value = "可预约时间点 数据字典AVAILABLE_TIME 10预计提货时间 20下单时间 30提交时间 40审核时间 50调度时间 60调度审核时间")
+	private Integer aptTime;
+
+	@ApiModelProperty(value = "可预约时间点 数据字典AVAILABLE_TIME 10预计提货时间 20下单时间 30提交时间 40审核时间 50调度时间 60调度审核时间")
+	private String aptTimeName;
+
+	@ApiModelProperty(value = "预约时间期间")
+	private Integer aptTimeDura;
+
+	@ApiModelProperty(value = "可预约时间单位 数据字典AVAILABLE_UNIT 1小时 2天")
+	private Integer aptUnit;
+
+	@ApiModelProperty(value = "可预约时间单位 数据字典AVAILABLE_UNIT 1小时 2天")
+	private String aptUnitName;
+
+	@ApiModelProperty(value = "班次允许预约数")
+	private Integer aptNum;
+
+	@ApiModelProperty(value = "预约模式 数据字典 APPOINTMENT_TYPE 10仅提货预约 20仅送货预约 30提货,送货皆预约")
+	private Integer aptType;
+
+	@ApiModelProperty(value = "预约模式 数据字典 APPOINTMENT_TYPE 10仅提货预约 20仅送货预约 30提货,送货皆预约")
+	private String aptTypeName;
+
+	@ApiModelProperty(value = "预约不可取消时间点 数据字典AVAILABLE_TIME 10预计提货时间 20下单时间 30提交时间 40审核时间 50调度时间 60调度审核时间")
+	private Integer aptCanNotCancel;
+
+	@ApiModelProperty(value = "预约不可取消时间点 数据字典AVAILABLE_TIME 10预计提货时间 20下单时间 30提交时间 40审核时间 50调度时间 60调度审核时间")
+	private String aptCanNotCancelName;
+
+	@ApiModelProperty(value = "预约不可取消期间")
+	private Integer aptCanNotCancelDura;
+
+	@ApiModelProperty(value = "预约不可时间单位 数据字典AVAILABLE_UNIT 1小时 2天")
+	private Integer aptCanNotCancelUnit;
+
+	@ApiModelProperty(value = "预约不可时间单位 数据字典AVAILABLE_UNIT 1小时 2天")
+	private String aptCanNotCancelUnitName;
+
+	@ApiModelProperty(value = "叫号处理方式 数据字典 10等待区先叫号 20按照排队号叫号")
+	private Integer callHandleType;
+
+	@ApiModelProperty(value = "叫号处理方式 数据字典 10等待区先叫号 20按照排队号叫号")
+	private String callHandleTypeName;
+
+	@ApiModelProperty(value = "过号处理方式 数据字典  10重新取号 20往后排三位 30往后排五位")
+	private Integer overNumHandleType;
+
+	@ApiModelProperty(value = "过号处理方式 数据字典  10重新取号 20往后排三位 30往后排五位")
+	private String overNumHandleTypeName;
+
+	@ApiModelProperty(value = "签到自动取号 数据字典WHETHER:0否，1是")
+	private Integer signInAutoPickUpNum;
+
+	@ApiModelProperty(value = "签到自动取号 数据字典WHETHER:0否，1是")
+	private String signInAutoPickUpNumName;
+
+	@ApiModelProperty(value = "装车时长")
+	private BigDecimal loadingTime;
+
+	@ApiModelProperty(value = "不可预约日期 数据字典 NON_ABL_DT 10按周 20按月")
+	private Integer nonAptDt;
+
+	@ApiModelProperty(value = "不可预约日期 多个日期逗号隔开")
+	private String nonAptDura;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "不可预约指定开始日期")
+	private Date nonAptSpecStartDate;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "不可预约指定结束日期")
+	private Date nonAptSpecEndDate;
+
+	@ApiModelProperty(value = "可预约时间段集合")
+	private List<TmsBaseBranchApTimeDTO> apTimeDTOList;
+
+	@ApiModelProperty(value = "可预约时间段")
+	private String apTimeDuras;
+
+	@ApiModelProperty(value = "站点ID")
+	private Long stationId;
+
+	@ApiModelProperty(value = "站点编号")
+	private String stationCode;
+
+	@ApiModelProperty(value = "站点名称")
+	private String stationName;
+
+	@ApiModelProperty(value = "站点区域")
+	private String stationAreas;
+
+	@ApiModelProperty(value = "站点配送顺序")
+	private BigDecimal stationDeliveryOrder;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/TmsBaseCarportDTO.java

@@ -0,0 +1,113 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TmsBaseCarportDTO {
+
+	@ApiModelProperty(value = "车位ID (主键)")
+	private Long id;
+
+	@ApiModelProperty(value = "车位编码")
+	private String code;
+	
+	@ApiModelProperty(value = "车位名称")
+	private String name;
+	
+	@ApiModelProperty(value = "仓库ID")
+	private Long branchId;
+	
+	@ApiModelProperty(value = "描述")
+	private String description;
+	
+	@ApiModelProperty(value = "状态")
+	private int status;
+	
+	@ApiModelProperty(value = "状态转义")
+	private String statusName;
+	
+	@ApiModelProperty(value = "类型")
+	private Integer type;
+	
+	@ApiModelProperty(value = "类型转义")
+	private String typeName;
+	
+	@ApiModelProperty(value = "适用车型")
+	private String carType;
+	
+	@ApiModelProperty(value = "适用车型转义")
+	private String carTypeName;
+	
+	@ApiModelProperty(value = "来源")
+	private int datasource;
+	
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "操作员ID")
+	private String operatorIds;
+
+	@ApiModelProperty(value = "操作员名称")
+	private String operatorNames;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/TmsBaseCustomerDTO.java

@@ -0,0 +1,305 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * 客户分页查询DTO
+ *
+ * @className :TmsBaseCustomerDTO
+ * @author :xyf
+ * @creationTime :2022/04/13
+ * @description :
+ *
+ * @modifier :xyf
+ * @modifyTime :2022/04/13
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("客户分页查询DTO")
+public class TmsBaseCustomerDTO implements Serializable {
+
+	private static final long serialVersionUID = -7781989555848323894L;
+
+	@ApiModelProperty(value = "客户ID")
+	private Long id;
+
+	@ApiModelProperty(value = "客户编码")
+	private String code;
+
+	@ApiModelProperty(value = "客户名称")
+	private String name;
+
+	@ApiModelProperty(value = "客户简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "货主ID")
+	private Long cargoOwnerId;
+
+	@ApiModelProperty(value = "货主编码")
+	private String cargoOwnerCode;
+
+	@ApiModelProperty(value = "货主名称")
+	private String cargoOwnerName;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区编码")
+	private String district;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "合作性质 数据字典：COOPERATIVE_NATURE：1合同 2临时")
+	private Integer cooperativeNature;
+
+	@ApiModelProperty(value = "合作性质 数据字典：COOPERATIVE_NATURE：1合同 2临时")
+	private String cooperativeNatureName;
+
+	@ApiModelProperty(value = "税务登记号")
+	private String taxRegisterNumber;
+
+	@ApiModelProperty(value = "营业执照号")
+	private String businessLicenseNumber;
+
+	@ApiModelProperty(value = "道路许可证")
+	private String roadPermit;
+
+	@ApiModelProperty(value = "法人代表")
+	private String legalman;
+
+	@ApiModelProperty(value = "发票抬头")
+	private String invoice;
+
+	@ApiModelProperty(value = "税号")
+	private String invoiceTaxNumber;
+
+	@ApiModelProperty(value = "注册资金")
+	private String registeredCapital;
+
+	@ApiModelProperty(value = "开户行")
+	private Integer bank;
+
+	@ApiModelProperty(value = "银行账号")
+	private String bankAccount;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "成立时间")
+	private Date established;
+
+	@ApiModelProperty(value = "注册地址")
+	private String registeredAddress;
+
+	@ApiModelProperty(value = "提货签到 数据字典WHETHER:0否，1是")
+	private Integer pickUpSign;
+
+	@ApiModelProperty(value = "自动提货签到 数据字典WHETHER:0否，1是")
+	private Integer autoPickUpSign;
+
+	@ApiModelProperty(value = "提货图片 数据字典WHETHER:0否，1是")
+	private Integer pickUpPicture;
+
+	@ApiModelProperty(value = "默认提货围栏")
+	private BigDecimal defaultPickUpRail;
+
+	@ApiModelProperty(value = "送达签到 数据字典WHETHER:0否，1是")
+	private Integer deliverySign;
+
+	@ApiModelProperty(value = "自动送达签到 数据字典WHETHER:0否，1是")
+	private Integer autoDeliverySign;
+
+	@ApiModelProperty(value = "送达图片 数据字典WHETHER:0否，1是")
+	private Integer deliveryPicture;
+
+	@ApiModelProperty(value = "回单图片 数据字典WHETHER:0否，1是")
+	private Integer renturnOrderPicture;
+
+	@ApiModelProperty(value = "默认送达围栏")
+	private BigDecimal defaultDeliveryRail;
+
+	@ApiModelProperty(value = "是否要求回单 数据字典WHETHER:0否，1是")
+	private Integer returnOrderFlag;
+
+	@ApiModelProperty(value = "回单期限")
+	private Integer returnOrderDeadline;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用 数据字典MAINDATA_STATUS")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用 数据字典MAINDATA_STATUS")
+	private String statusName;
+
+	@ApiModelProperty(value = "来源  数据字典SOURCE：1.新增 2.excel导入 3.接口导入")
+	private Integer source;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "导入批次号")
+	private String importBatchNumber;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "公司ID")
+	private Long enterpriseId;
+
+	@ApiModelProperty(value = "公司名称")
+	private String enterpriseName;
+
+	@ApiModelProperty(value = "扩展字段1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "扩展字段2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "扩展字段3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "扩展字段4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "扩展字段5")
+	private String extStr5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段6")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段7")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段8")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段9")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段10")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "扩展字段11")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "扩展字段12")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "扩展字段13")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "扩展字段14")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "扩展字段15")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+
+	@ApiModelProperty(value = "提货签到时间点 数据字典PICK_UP_SIGN_TIME 10预计提货开始时间 20预计提货结束时间 " +
+			"30下单时间 40提交时间 50审核时间 60调度时间 70调度审核时间")
+	private Integer pickUpSignTime;
+
+	@ApiModelProperty(value = "提货签到时间点名称")
+	private String pickUpSignTimeName;
+
+	@ApiModelProperty(value = "提货签到时间期间")
+	private Integer pickUpSignTimeDura;
+
+	@ApiModelProperty(value = "提货签到时间单位 数据字典SIGN_TIME_UNIT 1分钟 2小时 3天")
+	private Integer pickUpSignTimeUnit;
+
+	@ApiModelProperty(value = "提货签到时间单位名称")
+	private String pickUpSignTimeUnitName;
+
+	@ApiModelProperty(value = "送达签到时间点 数据字典PICK_UP_SIGN_TIME 10预计送达开始时间 20预计送达结束时间 " +
+			"30下单时间 40提交时间 50审核时间 60调度时间 70调度审核时间")
+	private Integer deliverySignTime;
+
+	@ApiModelProperty(value = "送达签到时间点名称")
+	private String deliverySignTimeName;
+
+	@ApiModelProperty(value = "送达签到时间期间")
+	private Integer deliverySignTimeDura;
+
+	@ApiModelProperty(value = "送达签到时间单位 数据字典SIGN_TIME_UNIT 1分钟 2小时 3天")
+	private Integer deliverySignTimeUnit;
+
+	@ApiModelProperty(value = "送达签到时间单位名称")
+	private String deliverySignTimeUnitName;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/TmsBaseCustomerReceiverNewDTO.java

@@ -0,0 +1,227 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * 客户收货方查询DTO
+ *
+ * @className :TmsBaseCustomerReceiverDTO
+ * @author :xyf
+ * @creationTime :2022/04/13
+ * @description :
+ *
+ * @modifier :xyf
+ * @modifyTime :2022/04/13
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("客户收货方查询DTO")
+public class TmsBaseCustomerReceiverNewDTO implements Serializable {
+
+	private static final long serialVersionUID = 7192088886320809042L;
+
+	@ApiModelProperty(value = "收货方ID")
+	private Long id;
+
+	@ApiModelProperty(value = "收货方编码")
+	private String code;
+
+	@ApiModelProperty(value = "收货方名称")
+	private String name;
+
+	@ApiModelProperty(value = "收货方简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "客户ID 关联TMS_BASE_CUSTOMER表主键")
+	private Long customerId;
+
+	@ApiModelProperty(value = "客户编号")
+	private String customerCode;
+
+	@ApiModelProperty(value = "客户名称")
+	private String customerName;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "关联手机号")
+	private String relationPhoneNumber;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区编码")
+	private String district;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用 数据字典MAINDATA_STATUS")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用 数据字典MAINDATA_STATUS")
+	private String statusName;
+
+	@ApiModelProperty(value = "来源  数据字典SOURCE：1.新增 2.excel导入 3.接口导入")
+	private Integer source;
+
+	@ApiModelProperty(value = "导入批次号")
+	private String importBatchNumber;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "公司ID")
+	private Long enterpriseId;
+
+	@ApiModelProperty(value = "公司名称")
+	private String enterpriseName;
+
+	@ApiModelProperty(value = "扩展字段1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "扩展字段2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "扩展字段3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "扩展字段4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "扩展字段5")
+	private String extStr5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段6")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段7")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段8")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段9")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "扩展字段10")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "扩展字段11")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "扩展字段12")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "扩展字段13")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "扩展字段14")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "扩展字段15")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+
+	@ApiModelProperty(value = "默认承运方类型 字典LINE_CARRIER_TYPE")
+	private Integer carrierType;
+
+	@ApiModelProperty(value = "默认承运方类型")
+	private String carrierTypeName;
+
+	@ApiModelProperty(value = "承运方ID")
+	private Long carrierId;
+
+	@ApiModelProperty(value = "承运方编码")
+	private String carrierCode;
+
+	@ApiModelProperty(value = "承运方名称")
+	private String carrierName;
+
+	@ApiModelProperty(value = "承运方(司机)手机号")
+	private String carrierPhoneNumber;
+
+	@ApiModelProperty(value = "车辆ID")
+	private Long vehicleId;
+
+	@ApiModelProperty(value = "车辆编号")
+	private String vehicleCode;
+
+	@ApiModelProperty(value = "车辆名称")
+	private String vehicleName;
+
+	@ApiModelProperty(value = "车牌号")
+	private String vehiclePlateNumber;
+
+	@ApiModelProperty(value = "配送方式DELIVERY_PATTERN  字典 1配送 2自提")
+	private Integer deliveryPattern;
+
+	@ApiModelProperty(value = "配送方式")
+	private String deliveryPatternName;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/TmsBaseTranslineViewDTO.java

@@ -0,0 +1,221 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class TmsBaseTranslineViewDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "线路ID")
+	private Long lineId;
+
+	@ApiModelProperty(value = "线路编号")
+	private String lineCode;
+
+	@ApiModelProperty(value = "线路名称")
+	private String lineName;
+
+	@ApiModelProperty(value = "线路类型 数据字典LINE_TYPE:1.干线 2.短驳")
+	private Integer lineType;
+
+	@ApiModelProperty(value = "划分类型 数据字典DISTINGUISH_TYPE:1.收货方 2.行政区域")
+	private Integer distinguishType;
+
+	@ApiModelProperty(value = "线路起点类型 数据字典START_LINE_TYPE:1.发货方 2.行政区域")
+	private Integer startLineType;
+
+	@ApiModelProperty(value = "线路起点类型名称 数据字典START_LINE_TYPE:1.发货方 2.行政区域")
+	private String startLineTypeName;
+
+
+	@ApiModelProperty(value = "状态")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态名称")
+	private String statusName;
+
+	@ApiModelProperty(value = "线路类型名称 数据字典LINE_TYPE:1.干线 2.短驳")
+	private String lineTypeName;
+
+	@ApiModelProperty(value = "划分类型名称 数据字典DISTINGUISH_TYPE:1.收货方 2.行政区域")
+	private String distinguishTypeName;
+
+	@ApiModelProperty(value = "线路起点ID")
+	private Long startLineId;
+
+	@ApiModelProperty(value = "承运方类型")
+	private String carrierTypeName;
+
+	@ApiModelProperty(value = "限制依据名称")
+	private String basisName;
+
+	@ApiModelProperty(value = "线路起点编码")
+	private String startLineCode;
+
+	@ApiModelProperty(value = "线路起点名称")
+	private String startLineName;
+
+	@ApiModelProperty(value = "线路起点经度")
+	private double startLineLongitude;
+
+	@ApiModelProperty(value = "线路起点纬度")
+	private double startLineLatitude;
+
+	@ApiModelProperty(value = "线路终点类型")
+	private Integer endLineType;
+
+	@ApiModelProperty(value = "线路终点ID")
+	private Long endLineId;
+
+	@ApiModelProperty(value = "线路终点编码")
+	private String endLineCode;
+
+	@ApiModelProperty(value = "线路终点名称")
+	private String endLineName;
+
+	@ApiModelProperty(value = "线路终点经度")
+	private double endLineLongitude;
+
+	@ApiModelProperty(value = "线路终点纬度")
+	private double endLineLatitude;
+
+	@ApiModelProperty(value = "承运方类型")
+	private Integer carrierType;
+
+	@ApiModelProperty(value = "是否承运方份额限制")
+	private Integer limit;
+
+	@ApiModelProperty(value = "限制依据")
+	private Integer basis;
+
+	@ApiModelProperty(value = "总里程数")
+	private BigDecimal totalMileage;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "所属组织ID")
+	private Long organizationId;
+
+	@ApiModelProperty(value = "所属组织编码")
+	private String organizationCode;
+
+	@ApiModelProperty(value = "所属组织名称")
+	private String organizationName;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+
+	@ApiModelProperty(value = "周,逗号分割")
+	private String week;
+
+	@ApiModelProperty(value = "天,逗号分割")
+	private String day;
+
+	@ApiModelProperty(value = "收货方-行政区域")
+	private List<String> administrativeAreas;
+
+	@ApiModelProperty(value = "发货方-行政区域")
+	private List<String> shipperAdministrativeAreas;
+
+	@ApiModelProperty(value = "收货方集合")
+	private List<TmsArriverDTO> tmsArriverDTOs;
+
+	@ApiModelProperty(value = "承运方集合")
+	private List<TmsCarrierDTO> tmsCarrierDTOs;
+
+	@ApiModelProperty(value = "发货方集合")
+	private List<TmsShipperDTO> tmsShipperDTOs;
+
+	@ApiModelProperty(value = "线路方向 数据字典LINE_DIRECTION 10正向 20逆向")
+	private Integer lineDirection;
+
+	@ApiModelProperty(value = "线路方向名称")
+	private String lineDirectionName;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/TmsCarrierDTO.java

@@ -0,0 +1,46 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class TmsCarrierDTO implements Serializable {
+
+	private static final long serialVersionUID = -3627258836690337687L;
+
+	@ApiModelProperty(value = "线路ID")
+	private Long lineId;
+
+	@ApiModelProperty(value = "承运方ID")
+	private Long carrierId;
+
+	@ApiModelProperty(value = "承运方编码")
+	private String carrierCode;
+
+	@ApiModelProperty(value = "承运方名称")
+	private String carrierName;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "车牌号")
+	private String vehiclePlateNumber;
+
+	@ApiModelProperty(value = "车辆ID")
+	private Long vehicleId;
+
+	@ApiModelProperty(value = "车辆编号")
+	private String vehicleCode;
+
+	@ApiModelProperty(value = "车辆名称")
+	private String vehicleName;
+
+	@ApiModelProperty(value = "份额")
+	private BigDecimal shares;
+
+	@ApiModelProperty(value = "承运方类型 数据字典CARRIER_TYPE:1.承运商  2.司机")
+	private Integer type;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/TmsLineMapDTO.java

@@ -0,0 +1,38 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class TmsLineMapDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "线路ID")
+	private Long lineId;
+
+	@ApiModelProperty(value = "线路编号")
+	private String lineCode;
+
+	@ApiModelProperty(value = "线路名称")
+	private String lineName;
+
+	@ApiModelProperty(value = "总里程数")
+	private BigDecimal totalMileage;
+
+	@ApiModelProperty(value = "提货点数")
+	private Integer pickUpSiteNumber;
+
+	@ApiModelProperty(value = "送货点数")
+	private Integer deliverySiteNumber;
+
+	@ApiModelProperty(value = "总站点数")
+	private Integer totalStations;
+
+	@ApiModelProperty(value = "线路的站点信息")
+	List<TmsLineWaySiteDTO> siteDTOs;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/TmsLineWaySiteDTO.java

@@ -0,0 +1,64 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class TmsLineWaySiteDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "站点顺序")
+	private Integer siteOrder;
+
+	@ApiModelProperty(value = "站点类型")
+	private String siteTypeName;
+
+	@ApiModelProperty(value = "站点编码")
+	private String siteCode;
+
+	@ApiModelProperty(value = "站点名称")
+	private String siteName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "线路-客户收货方或者客户发货方主键")
+	private String linkId;
+
+	@ApiModelProperty(value = "站点经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "站点纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "客户ID")
+	private Long customerId;
+
+	@ApiModelProperty(value = "客户编号")
+	private String customerCode;
+
+	@ApiModelProperty(value = "客户名称")
+	private String customerName;
+
+	@ApiModelProperty(value = "收货方ID")
+	private Long consigneeId;
+
+	@ApiModelProperty(value = "收货方编码")
+	private String consigneeCode;
+
+	@ApiModelProperty(value = "收货方名称")
+	private String consigneeName;
+
+	@ApiModelProperty(value = "仓库ID")
+	private Long branchId;
+
+	@ApiModelProperty(value = "仓库编码")
+	private String branchCode;
+
+	@ApiModelProperty(value = "仓库名称")
+	private String branchName;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/TmsShipperDTO.java

@@ -0,0 +1,62 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class TmsShipperDTO implements Serializable {
+
+	private static final long serialVersionUID = -2692526468987082672L;
+
+	@ApiModelProperty(value = "ID")
+	private String id;
+
+	@ApiModelProperty(value = "线路ID")
+	private Long lineId;
+
+	@ApiModelProperty(value = "线路编号")
+	private String lineCode;
+
+	@ApiModelProperty(value = "线路名称")
+	private String lineName;
+
+	@ApiModelProperty(value = "仓库ID")
+	private Long branchId;
+
+	@ApiModelProperty(value = "仓库编码")
+	private String branchCode;
+
+	@ApiModelProperty(value = "仓库名称")
+	private String branchName;
+
+	@ApiModelProperty(value = "提货顺序")
+	private Integer pickupOrder;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "联系方式")
+	private String contactTel;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "发货方备注")
+	private String shipperMemo;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/basicData/TmsTransferStationByViewDTO.java

@@ -0,0 +1,170 @@
+package com.prolog.rdc.tms.model.dto.basicData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel("中转站资料查看DTO")
+public class TmsTransferStationByViewDTO implements Serializable {
+
+	private static final long serialVersionUID = 6442979501242754970L;
+
+	@ApiModelProperty(value = "中转站ID")
+	private Long id;
+
+	@ApiModelProperty(value = "中转站编码")
+	private String code;
+
+	@ApiModelProperty(value = "中转站名称")
+	private String name;
+
+	@ApiModelProperty(value = "中转站简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "类型 数据字典TRANSFER_STATION_TYPE:1仓库  2物流园区")
+	private Integer type;
+
+	@ApiModelProperty(value = "类型名称")
+	private String typeName;
+
+	@ApiModelProperty(value = "仓库ID")
+	private Long branchId;
+
+	@ApiModelProperty(value = "仓库编码")
+	private String branchCode;
+
+	@ApiModelProperty(value = "仓库名称")
+	private String branchName;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "省")
+	private String province;
+
+	@ApiModelProperty(value = "市")
+	private String city;
+
+	@ApiModelProperty(value = "区")
+	private String district;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "0：停用 1：启用 数据字典MAINDATA_STATUS")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态名称")
+	private String statusName;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "所属组织ID")
+	private Long organizationId;
+
+	@ApiModelProperty(value = "所属组织编码")
+	private String organizationCode;
+
+	@ApiModelProperty(value = "所属组织名称")
+	private String organizationName;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/e6/EquipInfoDTO.java

@@ -0,0 +1,127 @@
+package com.prolog.rdc.tms.model.dto.e6;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 获取设备的最新位置信息DTO
+ * @author hongbo.pan
+ * @date 2023/3/21
+ */
+@Data
+public class EquipInfoDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String equipCode;
+
+    @ApiModelProperty(value = "定位时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date gpsTime;
+
+    @ApiModelProperty(value = "速度")
+    private BigDecimal speed;
+
+    @ApiModelProperty(value = "里程")
+    private BigDecimal odometer;
+
+    @ApiModelProperty(value = "纬度(WGS-84坐标系)")
+    private BigDecimal lat;
+
+    @ApiModelProperty(value = "经度(WGS-84坐标系)")
+    private BigDecimal lon;
+
+    @ApiModelProperty(value = "车头方向0-360(0为正北 顺时针递加)")
+    private BigDecimal direction;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "省")
+    private String provice;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区")
+    private String district;
+
+    @ApiModelProperty(value = "路名信息")
+    private String roadName;
+
+    @ApiModelProperty(value = "温度1(℃)")
+    private BigDecimal t1;
+
+    @ApiModelProperty(value = "温度2(℃)")
+    private BigDecimal t2;
+
+    @ApiModelProperty(value = "温度3(℃)")
+    private BigDecimal t3;
+
+    @ApiModelProperty(value = "温度4(℃)")
+    private BigDecimal t4;
+
+    @ApiModelProperty(value = "温度1采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date tempTime1;
+
+    @ApiModelProperty(value = "温度2采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date tempTime2;
+
+    @ApiModelProperty(value = "温度3采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date tempTime3;
+
+    @ApiModelProperty(value = "温度4采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date tempTime4;
+
+    @ApiModelProperty(value = "湿度1(%RH)")
+    private BigDecimal h1;
+
+    @ApiModelProperty(value = "湿度2(%RH)")
+    private BigDecimal h2;
+
+    @ApiModelProperty(value = "湿度3(%RH)")
+    private BigDecimal h3;
+
+    @ApiModelProperty(value = "湿度4(%RH)")
+    private BigDecimal h4;
+
+    @ApiModelProperty(value = "湿度1采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date humiTime1;
+
+    @ApiModelProperty(value = "湿度2采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date humiTime2;
+
+    @ApiModelProperty(value = "湿度3采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date humiTime3;
+
+    @ApiModelProperty(value = "湿度4采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date humiTime4;
+
+    @ApiModelProperty(value = "电量百分比数值")
+    private BigDecimal voltage;
+
+    @ApiModelProperty(value = "电源状态")
+    private String powerStatus;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/e6/EquipInfoHistoryDTO.java

@@ -0,0 +1,81 @@
+package com.prolog.rdc.tms.model.dto.e6;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 获取设备的轨迹信息DTO
+ * @author hongbo.pan
+ * @date 2023/3/21
+ */
+@Data
+public class EquipInfoHistoryDTO {
+
+    @ApiModelProperty(value = "设备编号")
+    private String equipCode;
+
+    @ApiModelProperty(value = "定位时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date gpsTime;
+
+    @ApiModelProperty(value = "速度")
+    private BigDecimal speed;
+
+    @ApiModelProperty(value = "里程")
+    private BigDecimal odometer;
+
+    @ApiModelProperty(value = "纬度(WGS-84坐标系)")
+    private BigDecimal lat;
+
+    @ApiModelProperty(value = "经度(WGS-84坐标系)")
+    private BigDecimal lon;
+
+    @ApiModelProperty(value = "车头方向0-360(0为正北 顺时针递加)")
+    private BigDecimal direction;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "省")
+    private String provice;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区")
+    private String district;
+
+    @ApiModelProperty(value = "路名信息")
+    private String roadName;
+
+    @ApiModelProperty(value = "温度1(℃)")
+    private BigDecimal t1;
+
+    @ApiModelProperty(value = "温度2(℃)")
+    private BigDecimal t2;
+
+    @ApiModelProperty(value = "温度3(℃)")
+    private BigDecimal t3;
+
+    @ApiModelProperty(value = "温度4(℃)")
+    private BigDecimal t4;
+
+    @ApiModelProperty(value = "湿度1(%RH)")
+    private BigDecimal h1;
+
+    @ApiModelProperty(value = "湿度2(%RH)")
+    private BigDecimal h2;
+
+    @ApiModelProperty(value = "湿度3(%RH)")
+    private BigDecimal h3;
+
+    @ApiModelProperty(value = "湿度4(%RH)")
+    private BigDecimal h4;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/e6/TrackDetailDTO.java

@@ -0,0 +1,86 @@
+package com.prolog.rdc.tms.model.dto.e6;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 获取车辆的轨迹信息DTO
+ * @author hongbo.pan
+ * @date 2023/3/21
+ */
+@Data
+public class TrackDetailDTO {
+
+    @ApiModelProperty(value = "车牌")
+    @JSONField(name = "Vehicle")
+    private String vehicle;
+
+    @ApiModelProperty(value = "定位时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "GPSTime")
+    private Date gpsTime;
+
+    @ApiModelProperty(value = "纬度(WGS-84坐标系)")
+    @JSONField(name = "Lat")
+    private BigDecimal lat;
+
+    @ApiModelProperty(value = "经度(WGS-84坐标系)")
+    @JSONField(name = "Lon")
+    private BigDecimal lon;
+
+    @ApiModelProperty(value = "车头方向0-360(0为正北 顺时针递加)")
+    @JSONField(name = "Direction")
+    private BigDecimal direction;
+
+    @ApiModelProperty(value = "里程")
+    @JSONField(name = "Odometer")
+    private BigDecimal odometer;
+
+    @ApiModelProperty(value = "速度")
+    @JSONField(name = "Speed")
+    private BigDecimal speed;
+
+    @ApiModelProperty(value = "车辆位置")
+    @JSONField(name = "PlaceName")
+    private String placeName;
+
+    @ApiModelProperty(value = "路名信息")
+    @JSONField(name = "RoadName")
+    private String roadName;
+
+    @ApiModelProperty(value = "1路温度(℃)")
+    @JSONField(name = "Temp1")
+    private BigDecimal temp1;
+
+    @ApiModelProperty(value = "2路温度(℃)")
+    @JSONField(name = "Temp2")
+    private BigDecimal temp2;
+
+    @ApiModelProperty(value = "3路温度(℃)")
+    @JSONField(name = "Temp3")
+    private BigDecimal temp3;
+
+    @ApiModelProperty(value = "4路温度(℃)")
+    @JSONField(name = "Temp4")
+    private BigDecimal temp4;
+
+    @ApiModelProperty(value = "根据参数isoffsetlonlat返回的纬度")
+    @JSONField(name = "Lat02")
+    private BigDecimal lat02;
+
+    @ApiModelProperty(value = "根据参数isoffsetlonlat返回的经度")
+    @JSONField(name = "Lon02")
+    private BigDecimal lon02;
+
+    @ApiModelProperty(value = "ACC开,3D定位,天线正常,冷机开,门关,门关4")
+    @JSONField(name = "Status")
+    private String status;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/e6/VehicleInfoDTO.java

@@ -0,0 +1,202 @@
+package com.prolog.rdc.tms.model.dto.e6;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 获取车辆的最新位置信息DTO
+ * @author hongbo.pan
+ * @date 2023/3/21
+ */
+@Data
+public class VehicleInfoDTO {
+
+    @ApiModelProperty(value = "车牌")
+    @JSONField(name = "Vehicle")
+    private String vehicle;
+
+    @ApiModelProperty(value = "定位时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "GPSTime")
+    private Date gpsTime;
+
+    @ApiModelProperty(value = "速度")
+    @JSONField(name = "Speed")
+    private BigDecimal speed;
+
+    @ApiModelProperty(value = "里程")
+    @JSONField(name = "Odometer")
+    private BigDecimal odometer;
+
+    @ApiModelProperty(value = "纬度(WGS-84坐标系)")
+    @JSONField(name = "Lat")
+    private BigDecimal lat;
+
+    @ApiModelProperty(value = "经度(WGS-84坐标系)")
+    @JSONField(name = "Lon")
+    private BigDecimal lon;
+
+    @ApiModelProperty(value = "车头方向0-360(0为正北 顺时针递加)")
+    @JSONField(name = "Direction")
+    private BigDecimal direction;
+
+    @ApiModelProperty(value = "状态")
+    @JSONField(name = "Status")
+    private String status;
+
+    @ApiModelProperty(value = "车辆位置")
+    @JSONField(name = "PlaceName")
+    private String placeName;
+
+    @ApiModelProperty(value = "省")
+    @JSONField(name = "Provice")
+    private String provice;
+
+    @ApiModelProperty(value = "市")
+    @JSONField(name = "City")
+    private String city;
+
+    @ApiModelProperty(value = "区")
+    @JSONField(name = "District")
+    private String district;
+
+    @ApiModelProperty(value = "路名信息")
+    @JSONField(name = "RoadName")
+    private String roadName;
+
+    @ApiModelProperty(value = "温度1(℃)")
+    @JSONField(name = "T1")
+    private BigDecimal t1;
+
+    @ApiModelProperty(value = "温度2(℃)")
+    @JSONField(name = "T2")
+    private BigDecimal t2;
+
+    @ApiModelProperty(value = "温度3(℃)")
+    @JSONField(name = "T3")
+    private BigDecimal t3;
+
+    @ApiModelProperty(value = "温度4(℃)")
+    @JSONField(name = "T4")
+    private BigDecimal t4;
+
+    @ApiModelProperty(value = "根据参数isoffsetlonlat返回的纬度")
+    @JSONField(name = "Lat02")
+    private BigDecimal lat02;
+
+    @ApiModelProperty(value = "根据参数isoffsetlonlat返回的经度")
+    @JSONField(name = "Lon02")
+    private BigDecimal lon02;
+
+    @ApiModelProperty(value = "地标名称")
+    @JSONField(name = "AreaName")
+    private String areaName;
+
+    @ApiModelProperty(value = "温度1采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "Time1")
+    private Date time1;
+
+    @ApiModelProperty(value = "温度2采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "Time2")
+    private Date time2;
+
+    @ApiModelProperty(value = "温度3采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "Time3")
+    private Date time3;
+
+    @ApiModelProperty(value = "温度4采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "Time4")
+    private Date time4;
+
+    @ApiModelProperty(value = "湿度1(%RH)")
+    @JSONField(name = "H1")
+    private BigDecimal h1;
+
+    @ApiModelProperty(value = "湿度2(%RH)")
+    @JSONField(name = "H2")
+    private BigDecimal h2;
+
+    @ApiModelProperty(value = "湿度3(%RH)")
+    @JSONField(name = "H3")
+    private BigDecimal h3;
+
+    @ApiModelProperty(value = "湿度4(%RH)")
+    @JSONField(name = "H4")
+    private BigDecimal h4;
+
+    @ApiModelProperty(value = "湿度1采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "HT1")
+    private Date ht1;
+
+    @ApiModelProperty(value = "湿度2采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "HT2")
+    private Date ht2;
+
+    @ApiModelProperty(value = "湿度3采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "HT3")
+    private Date ht3;
+
+    @ApiModelProperty(value = "湿度4采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "HT4")
+    private Date ht4;
+
+    @ApiModelProperty(value = "设备类型")
+    @JSONField(name = "DeviceTypeStr")
+    private String deviceTypeStr;
+
+    @ApiModelProperty(value = "设备编号")
+    @JSONField(name = "EquipCode")
+    private String equipCode;
+
+    @ApiModelProperty(value = "当前油量")
+    @JSONField(name = "Oil")
+    private String oil;
+
+    @ApiModelProperty(value = "海拔高度 单位米")
+    @JSONField(name = "Height")
+    private BigDecimal height;
+
+    @ApiModelProperty(value = "停车时长 单位秒")
+    @JSONField(name = "StopSec")
+    private BigDecimal stopSec;
+
+    @ApiModelProperty(value = "最后上报ACC状态;0 无,1关,2开")
+    @JSONField(name = "ACC")
+    private String acc;
+
+    @ApiModelProperty(value = "真实车牌")
+    @JSONField(name = "VehicleNo")
+    private String vehicleNo;
+
+    @ApiModelProperty(value = "油量欧姆值")
+    @JSONField(name = "Ohm")
+    private String ohm;
+
+    @ApiModelProperty(value = "当前ACC状态 1:在线   0:不在线   2:未知")
+    @JSONField(name = "CurAccSta")
+    private String curAccSta;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/e6/VehicleTemperatureInfoDTO.java

@@ -0,0 +1,61 @@
+package com.prolog.rdc.tms.model.dto.e6;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 查询车辆的温度信息DTO
+ * @author hongbo.pan
+ * @date 2023/3/21
+ */
+@Data
+public class VehicleTemperatureInfoDTO {
+
+    @ApiModelProperty(value = "车牌")
+    @JSONField(name = "Vehicle")
+    private String vehicle;
+
+    @ApiModelProperty(value = "定位时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "GPSTime")
+    private Date gpsTime;
+
+    @ApiModelProperty(value = "纬度(WGS-84坐标系)")
+    @JSONField(name = "Lat")
+    private BigDecimal lat;
+
+    @ApiModelProperty(value = "经度(WGS-84坐标系)")
+    @JSONField(name = "Lon")
+    private BigDecimal lon;
+
+    @ApiModelProperty(value = "1路温度(℃)")
+    @JSONField(name = "Temperature")
+    private BigDecimal temperature;
+
+    @ApiModelProperty(value = "2路温度(℃)")
+    @JSONField(name = "Temperature2")
+    private BigDecimal temperature2;
+
+    @ApiModelProperty(value = "3路温度(℃)")
+    @JSONField(name = "Temperature3")
+    private BigDecimal temperature3;
+
+    @ApiModelProperty(value = "4路温度(℃)")
+    @JSONField(name = "Temperature4")
+    private BigDecimal temperature4;
+
+    @ApiModelProperty(value = "冷机状态")
+    @JSONField(name = "ColdStatus")
+    private String coldStatus;
+
+    @ApiModelProperty(value = "门状态(一个门开则认为是开)1：门开 0：门关 -1：无门磁")
+    @JSONField(name = "DoorSta")
+    private String doorSta;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/e6/VehiclesAllAlarmInfoDTO.java

@@ -0,0 +1,80 @@
+package com.prolog.rdc.tms.model.dto.e6;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 查询车辆的温度信息DTO
+ * @author hongbo.pan
+ * @date 2023/3/21
+ */
+@Data
+public class VehiclesAllAlarmInfoDTO {
+
+    @ApiModelProperty(value = "车牌")
+    @JSONField(name = "Vehicle")
+    private String vehicle;
+
+    @ApiModelProperty(value = "报警类型")
+    @JSONField(name = "AlarmType")
+    private String alarmType;
+
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "BTime")
+    private Date bTime;
+
+    @ApiModelProperty(value = "开始位置")
+    @JSONField(name = "BPlaceName")
+    private String bPlaceName;
+
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(name = "ETime")
+    private Date eTime;
+
+    @ApiModelProperty(value = "结束位置")
+    @JSONField(name = "EPlaceName")
+    private String ePlaceName;
+
+    @ApiModelProperty(value = "报警内容")
+    @JSONField(name = "AlarmContent")
+    private String alarmContent;
+
+    @ApiModelProperty(value = "持续时长(秒)")
+    @JSONField(name = "Duration")
+    private BigDecimal duration;
+
+    @ApiModelProperty(value = "所属部门")
+    @JSONField(name = "OrgName")
+    private String orgName;
+
+    @ApiModelProperty(value = "开始位置维度")
+    @JSONField(name = "BLat")
+    private BigDecimal bLat;
+
+    @ApiModelProperty(value = "开始位置经度")
+    @JSONField(name = "BLon")
+    private BigDecimal bLon;
+
+    @ApiModelProperty(value = "结束位置维度")
+    @JSONField(name = "ELat")
+    private BigDecimal eLat;
+
+    @ApiModelProperty(value = "结束位置经度")
+    @JSONField(name = "ELon")
+    private BigDecimal eLon;
+
+    @ApiModelProperty(value = "处理方式(0:未处理，1:已处理，2:已忽略)")
+    @JSONField(name = "HandleType")
+    private String handleType;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/fleetManagement/ContainerDTO.java

@@ -0,0 +1,192 @@
+package com.prolog.rdc.tms.model.dto.fleetManagement;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.prolog.framework.core.annotation.Id;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Company: 湖北普罗格科技股份有限公司
+ *
+ * @author zhangsj
+ * @since 2022/3/16 18:27
+ */
+@Data
+public class ContainerDTO implements Serializable {
+
+	private static final long serialVersionUID = -2186438736071079479L;
+
+	@ApiModelProperty(value = "容器ID")
+	@Id
+	private Long id;
+
+	@ApiModelProperty(value = "物流中心/仓ID")
+	private Long branchId;
+
+	@ApiModelProperty(value = "物流中心/仓编号")
+	private String branchCode;
+
+	@ApiModelProperty(value = "物流中心/仓名称")
+	private String branchName;
+
+	@ApiModelProperty(value = "容器编号")
+	private String code;
+
+	@ApiModelProperty(value = "容器名称")
+	private String name;
+
+	@ApiModelProperty(value = "容器类型（01：托盘 02：周转箱 03：保温箱）")
+	private Integer type;
+
+	@ApiModelProperty(value = "容器类型名称")
+	private String typeName;
+
+	@ApiModelProperty(value = "设备类型")
+	private Integer deviceType;
+
+	@ApiModelProperty(value = "设备类型名称")
+	private String deviceTypeName;
+
+	@ApiModelProperty(value = "设备ID")
+	private Long deviceId;
+
+	@ApiModelProperty(value = "设备编号")
+	private String deviceCode;
+
+	@ApiModelProperty(value = "设备名称")
+	private String deviceName;
+
+	@ApiModelProperty(value = "状态")
+	private Integer status;
+
+	@ApiModelProperty(value = "状态名称")
+	private String statusName;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "企业ID")
+	private Long enterpriseId;
+
+	@ApiModelProperty(value = "企业名称")
+	private String enterpriseName;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createtime;
+
+	@ApiModelProperty(value = "创建人")
+	private String createperson;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "修改时间")
+	private Date updatetime;
+
+	@ApiModelProperty(value = "修改人")
+	private String updateperson;
+
+	@ApiModelProperty(value = "长(m)")
+	private BigDecimal length;
+
+	@ApiModelProperty(value = "宽(m)")
+	private BigDecimal width;
+
+	@ApiModelProperty(value = "高(m)")
+	private BigDecimal height;
+
+	@ApiModelProperty(value = "重量(kg)")
+	private BigDecimal weight;
+
+	@ApiModelProperty(value = "体积(m3)")
+	private BigDecimal volume;
+
+	@ApiModelProperty(value = "隶属机构ID")
+	private Long affiliationId;
+
+	@ApiModelProperty(value = "隶属机构编码")
+	private String affiliationCode;
+
+	@ApiModelProperty(value = "隶属机构名称")
+	private String affiliationName;
+
+	@ApiModelProperty(value = "归属")
+	private String belongTo;
+
+	@ApiModelProperty(value = "部门id")
+	private String departmentId;
+
+	@ApiModelProperty(value = "部门code")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "归属名称")
+	private String belongToName;
+
+	@ApiModelProperty(value = "车辆关联id")
+	private String linkId;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/fleetManagement/DriverAutomaticDTO.java

@@ -0,0 +1,53 @@
+package com.prolog.rdc.tms.model.dto.fleetManagement;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 司机查询或新增VO
+ *
+ * @className :DriverAutomaticDTO
+ * @author :fanzw
+ * @creationTime :2022/08/11
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/08/11
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("司机查询或新增VO")
+public class DriverAutomaticDTO implements Serializable {
+
+	private static final long serialVersionUID = -239921442115081568L;
+
+	@ApiModelProperty(value = "司机ID")
+	private Long driverId;
+
+	@ApiModelProperty(value = "司机编号")
+	private String driverCode;
+
+	@ApiModelProperty(value = "司机名称")
+	private String driverName;
+
+	@ApiModelProperty(value = "司机手机号")
+	private String driverPhoneNumber;
+
+	@ApiModelProperty(value = "隶属机构ID")
+	private Long affiliationId;
+
+	@ApiModelProperty(value = "隶属机构编码")
+	private String affiliationCode;
+
+	@ApiModelProperty(value = "隶属机构名称")
+	private String affiliationName;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/fleetManagement/DriverCheckDTO.java

@@ -0,0 +1,151 @@
+package com.prolog.rdc.tms.model.dto.fleetManagement;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * 司机资料查看DTO
+ *
+ * @className :DriverCheckDTO
+ * @author :fanzw
+ * @creationTime :2022/03/15
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/03/15
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("司机资料查看DTO")
+public class DriverCheckDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "司机ID")
+	private Long id;
+
+	@ApiModelProperty(value = "司机编号")
+	private String code;
+
+	@ApiModelProperty(value = "司机名称")
+	private String name;
+
+	@ApiModelProperty(value = "司机类型：数据字典DRIVER_TYPE 1自有、2挂靠、3临时")
+	private Integer type;
+
+	@ApiModelProperty(value = "司机类型：数据字典DRIVER_TYPE 1自有、2挂靠、3临时")
+	private String typeName;
+
+	@ApiModelProperty(value = "隶属机构ID")
+	private Long affiliationId;
+
+	@ApiModelProperty(value = "隶属机构编码")
+	private String affiliationCode;
+
+	@ApiModelProperty(value = "隶属机构名称")
+	private String affiliationName;
+
+	@ApiModelProperty(value = "隶属机构类型")
+	private Integer affiliationType;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "密码")
+	private String password;
+
+	@ApiModelProperty(value = "0：停用 1：启用 数据字典MAINDATA_STATUS")
+	private Integer status;
+
+	@ApiModelProperty(value = "0：停用 1：启用 数据字典MAINDATA_STATUS")
+	private String statusName;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "所属组织ID")
+	private Long organizationId;
+
+	@ApiModelProperty(value = "所属组织编码")
+	private String organizationCode;
+
+	@ApiModelProperty(value = "所属组织名称")
+	private String organizationName;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/fleetManagement/DriverPopupDTO.java

@@ -0,0 +1,201 @@
+package com.prolog.rdc.tms.model.dto.fleetManagement;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * 司机资料弹窗DTO
+ *
+ * @className :DriverPopupDTO
+ * @author :fanzw
+ * @creationTime :2022/03/15
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/03/15
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("司机资料弹窗DTO")
+public class DriverPopupDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "司机ID")
+	private Long id;
+
+	@ApiModelProperty(value = "司机编号")
+	private String code;
+
+	@ApiModelProperty(value = "司机名称")
+	private String name;
+
+	@ApiModelProperty(value = "司机类型：数据字典DRIVER_TYPE 1自有、2挂靠、3临时")
+	private Integer type;
+
+	@ApiModelProperty(value = "司机类型：数据字典DRIVER_TYPE 1自有、2挂靠、3临时")
+	private String typeName;
+
+	@ApiModelProperty(value = "隶属机构ID")
+	private Long affiliationId;
+
+	@ApiModelProperty(value = "隶属机构编码")
+	private String affiliationCode;
+
+	@ApiModelProperty(value = "隶属机构名称")
+	private String affiliationName;
+
+	@ApiModelProperty(value = "隶属机构类型")
+	private Integer affiliationType;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "密码")
+	private String password;
+
+	@ApiModelProperty(value = "车辆ID")
+	private Long vehicleId;
+
+	@ApiModelProperty(value = "车辆编号")
+	private String vehicleCode;
+
+	@ApiModelProperty(value = "车牌号")
+	private String vehiclePlateNumber;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "所属组织ID")
+	private Long organizationId;
+
+	@ApiModelProperty(value = "所属组织编码")
+	private String organizationCode;
+
+	@ApiModelProperty(value = "所属组织名称")
+	private String organizationName;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "车型ID")
+	private Long vehicleTypeId;
+
+	@ApiModelProperty(value = "车型编码")
+	private String vehicleTypeCode;
+
+	@ApiModelProperty(value = "车型名称")
+	private String vehicleTypeName;
+
+	@ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+	private Integer vehicleTypeCategory;
+
+	@ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+	private String vehicleTypeCategoryName;
+
+	@ApiModelProperty(value = "车辆类型：数据字典VEHICLE_TYPE: 1自有、2挂靠、3临时")
+	private Integer vehType;
+
+	@ApiModelProperty(value = "车辆类型：数据字典VEHICLE_TYPE: 1自有、2挂靠、3临时")
+	private String vehTypeName;
+
+	@ApiModelProperty(value = "载重(kg)")
+	private BigDecimal weight;
+
+	@ApiModelProperty(value = "载方(m³)")
+	private BigDecimal volume;
+
+	@ApiModelProperty(value = "证件编码")
+	private String paperCode;
+
+	@ApiModelProperty(value = "车辆归属")
+	private Integer vehicleAscription;
+
+	@ApiModelProperty(value = "车辆归属")
+	private String vehicleAscriptionName;
+
+	@ApiModelProperty(value = "有指定车型的司机 1:有，0:没有")
+	private String hasVehicleTypeDriver;
+
+	@ApiModelProperty(value = "最大行驶时间(小时)")
+	private BigDecimal maxTravelTime;
+
+	@ApiModelProperty(value = "最大行驶里程(公里)")
+	private BigDecimal maxMileage;
+
+	@ApiModelProperty(value = "最多配送客户数")
+	private BigDecimal maxDeliveryCustomer;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/fleetManagement/VehicleAndDriverDTO.java

@@ -0,0 +1,38 @@
+package com.prolog.rdc.tms.model.dto.fleetManagement;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 司机车辆查询或新增VO
+ *
+ * @className :VehicleAndDriverDTO
+ * @author :fanzw
+ * @creationTime :2022/08/11
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/08/11
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("司机车辆查询或新增VO")
+public class VehicleAndDriverDTO implements Serializable {
+
+	private static final long serialVersionUID = 5386203145611609454L;
+
+	@ApiModelProperty(value = "司机信息")
+	private DriverAutomaticDTO driver;
+
+	@ApiModelProperty(value = "车辆")
+	private VehicleAutomaticDTO vehicle;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/fleetManagement/VehicleAutomaticDTO.java

@@ -0,0 +1,44 @@
+package com.prolog.rdc.tms.model.dto.fleetManagement;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * 车辆查询或新增VO
+ *
+ * @className :VehicleAutomaticDTO
+ * @author :fanzw
+ * @creationTime :2022/08/11
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/08/11
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+@ApiModel("车辆查询或新增VO")
+public class VehicleAutomaticDTO implements Serializable {
+
+	private static final long serialVersionUID = 7769256574111421815L;
+
+	@ApiModelProperty(value = "车辆ID")
+	private Long vehicleId;
+
+	@ApiModelProperty(value = "车辆编号")
+	private String vehicleCode;
+
+	@ApiModelProperty(value = "车辆名称")
+	private String vehicleName;
+
+	@ApiModelProperty(value = "车牌号")
+	private String vehiclePlateNumber;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/fleetManagement/VehiclePopupDTO.java

@@ -0,0 +1,181 @@
+package com.prolog.rdc.tms.model.dto.fleetManagement;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 车辆资料弹窗DTO
+ * 
+ * @author Eton Woo
+ * @date 2022/03/21
+ */
+@Data
+@ApiModel("车辆资料弹窗DTO")
+public class VehiclePopupDTO implements Serializable {
+
+	private static final long serialVersionUID = -7741060632016683479L;
+
+	@ApiModelProperty(value = "车辆ID")
+	private Long id;
+
+	@ApiModelProperty(value = "车辆编码")
+	private String code;
+
+	@ApiModelProperty(value = "车牌号")
+	private String plateNumber;
+
+	@ApiModelProperty(value = "车辆类型：数据字典VEHICLE_TYPE: 1自有、2挂靠、3临时")
+	private Integer type;
+
+	@ApiModelProperty(value = "车辆类型：数据字典VEHICLE_TYPE: 1自有、2挂靠、3临时")
+	private String typeName;
+
+	@ApiModelProperty(value = "载重(kg)")
+	private BigDecimal weight;
+
+	@ApiModelProperty(value = "载方(m³)")
+	private BigDecimal volume;
+
+	@ApiModelProperty(value = "隶属机构ID")
+	private Long affiliationId;
+
+	@ApiModelProperty(value = "隶属机构编码")
+	private String affiliationCode;
+
+	@ApiModelProperty(value = "隶属机构名称")
+	private String affiliationName;
+
+	@ApiModelProperty(value = "所属组织ID")
+	private Long organizationId;
+
+	@ApiModelProperty(value = "所属组织编码")
+	private String organizationCode;
+
+	@ApiModelProperty(value = "所属组织名称")
+	private String organizationName;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+
+	@ApiModelProperty(value = "里程管理:0：否 1：是 数据字典MILEAGE_MANAGEMENT")
+	private Integer mileageManagement;
+
+	@ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+	private Integer typeCategory;
+
+	@ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+	private String typeCategoryName;
+
+	@ApiModelProperty(value = "设备ID")
+	private Long deviceId;
+
+	@ApiModelProperty(value = "设备编号")
+	private String deviceCode;
+
+	@ApiModelProperty(value = "设备名称")
+	private String deviceName;
+
+	@ApiModelProperty(value = "车型ID")
+	private Long vehicleTypeId;
+
+	@ApiModelProperty(value = "车型编码")
+	private String vehicleTypeCode;
+
+	@ApiModelProperty(value = "车型名称")
+	private String vehicleTypeName;
+
+	@ApiModelProperty(value = "容器ID")
+	private String containerId;
+
+	@ApiModelProperty(value = "容器编码")
+	private String containerCode;
+
+	@ApiModelProperty(value = "容器名称")
+	private String containerName;
+
+	@ApiModelProperty(value = "车辆归属")
+	private Integer vehicleAscription;
+
+	@ApiModelProperty(value = "车辆归属")
+	private String vehicleAscriptionName;
+
+	@ApiModelProperty(value = "长")
+	private BigDecimal length;
+
+	@ApiModelProperty(value = "宽")
+	private BigDecimal width;
+
+	@ApiModelProperty(value = "高")
+	private BigDecimal height;
+
+	@ApiModelProperty(value = "车辆规格")
+	private String vehicleSpec;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/fleetManagement/VehicleTypeCheckDTO.java

@@ -0,0 +1,139 @@
+package com.prolog.rdc.tms.model.dto.fleetManagement;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 车型资料查看DTO
+ * 
+ * @author Eton Woo
+ * @date 2022/03/14
+ */
+@Data
+@ApiModel("车型资料查看DTO")
+public class VehicleTypeCheckDTO implements Serializable {
+
+	private static final long serialVersionUID = -2435637717335601529L;
+
+	@ApiModelProperty(value = "车型ID")
+	private Long id;
+	 
+	@ApiModelProperty(value = "车型编码")
+	private String code;
+	 
+	@ApiModelProperty(value = "车型名称")
+	private String name;
+	 
+	@ApiModelProperty(value = "车型品牌 数据字典VEHICLE_TYPE_BRAND：1长安、2依维柯")
+	private Integer brand;
+	 
+	@ApiModelProperty(value = "车型品牌 数据字典VEHICLE_TYPE_BRAND：1长安、2依维柯")
+	private String brandName;
+	 
+	@ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+	private Integer type;
+	 
+	@ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+	private String typeName;
+	 
+	@ApiModelProperty(value = "长(m)")
+	private BigDecimal length;
+	 
+	@ApiModelProperty(value = "宽(m)")
+	private BigDecimal width;
+	 
+	@ApiModelProperty(value = "高(m)")
+	private BigDecimal height;
+	 
+	@ApiModelProperty(value = "最大行驶里程(km)")
+	private BigDecimal maxMileage;
+	 
+	@ApiModelProperty(value = "载重(kg)")
+	private BigDecimal weight;
+	 
+	@ApiModelProperty(value = "载方(m³)")
+	private BigDecimal volume;
+	
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "所属组织ID")
+	private Long organizationId;
+
+	@ApiModelProperty(value = "所属组织编码")
+	private String organizationCode;
+
+	@ApiModelProperty(value = "所属组织名称")
+	private String organizationName;
+
+	@ApiModelProperty(value = "所属部门ID")
+	private String departmentId;
+
+	@ApiModelProperty(value = "所属部门编码")
+	private String departmentCode;
+
+	@ApiModelProperty(value = "所属部门名称")
+	private String departmentName;
+
+	@ApiModelProperty(value = "字符属性扩展1")
+	private String extStr1;
+
+	@ApiModelProperty(value = "字符属性扩展2")
+	private String extStr2;
+
+	@ApiModelProperty(value = "字符属性扩展3")
+	private String extStr3;
+
+	@ApiModelProperty(value = "字符属性扩展4")
+	private String extStr4;
+
+	@ApiModelProperty(value = "字符属性扩展5")
+	private String extStr5;
+
+	@ApiModelProperty(value = "数值属性扩展1")
+	private BigDecimal extNum1;
+
+	@ApiModelProperty(value = "数值属性扩展2")
+	private BigDecimal extNum2;
+
+	@ApiModelProperty(value = "数值属性扩展3")
+	private BigDecimal extNum3;
+
+	@ApiModelProperty(value = "数值属性扩展4")
+	private BigDecimal extNum4;
+
+	@ApiModelProperty(value = "数值属性扩展5")
+	private BigDecimal extNum5;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展1")
+	private Date extDate1;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展2")
+	private Date extDate2;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展3")
+	private Date extDate3;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展4")
+	private Date extDate4;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "日期属性扩展5")
+	private Date extDate5;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/g7/CTemperatureProbeInfoDTO.java

@@ -0,0 +1,77 @@
+package com.prolog.rdc.tms.model.dto.g7;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ *
+ * 车辆当前定位V1.0DTO
+ *
+ * @className :ItemResultDTO
+ * @author :fanzw
+ * @creationTime :2022/08/12
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/08/12
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class CTemperatureProbeInfoDTO {
+
+    @ApiModelProperty(value = "光感")
+    private String t0Light;
+
+    @ApiModelProperty(value = "告警类型")
+    private String t0AlarmTypes;
+
+    @ApiModelProperty(value = "探头0温度")
+    private String t0Temperature;
+
+    @ApiModelProperty(value = "探头0湿度")
+    private String t0Humidity;
+
+    @ApiModelProperty(value = "告警状态值")
+    private String t0AlarmStatus;
+
+    @ApiModelProperty(value = "探头1温度")
+    private String t1Temperature;
+
+    @ApiModelProperty(value = "探头1")
+    private String t1HumidityAlarmStatus;
+
+    @ApiModelProperty(value = "探头1")
+    private String t1TemperatureAlarmStatus;
+
+    @ApiModelProperty(value = "探头2温度")
+    private String t2Temperature;
+
+    @ApiModelProperty(value = "探头2")
+    private String t2HumidityAlarmStatus;
+
+    @ApiModelProperty(value = "探头2")
+    private String t2TemperatureAlarmStatus;
+
+    @ApiModelProperty(value = "探头3温度")
+    private String t3Temperature;
+
+    @ApiModelProperty(value = "探头3")
+    private String t3HumidityAlarmStatus;
+
+    @ApiModelProperty(value = "探头3")
+    private String t3TemperatureAlarmStatus;
+
+    @ApiModelProperty(value = "探头4温度")
+    private String t4Temperature;
+
+    @ApiModelProperty(value = "探头4")
+    private String t4HumidityAlarmStatus;
+
+    @ApiModelProperty(value = "探头4")
+    private String t4TemperatureAlarmStatus;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/g7/CTemperaturePropertiesDTO.java

@@ -0,0 +1,31 @@
+package com.prolog.rdc.tms.model.dto.g7;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ *
+ * 车辆当前定位V1.0DTO
+ *
+ * @className :ItemResultDTO
+ * @author :fanzw
+ * @creationTime :2022/08/12
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/08/12
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class CTemperaturePropertiesDTO {
+
+    @ApiModelProperty(value = "电量")
+    private BigDecimal batteryPower;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/g7/ColdchainAlarmDTO.java

@@ -0,0 +1,133 @@
+package com.prolog.rdc.tms.model.dto.g7;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ *
+ * 冷链报警列表接口DTO
+ *
+ * @className :ColdchainAlarmDTO
+ * @author :fanzw
+ * @creationTime :2022/08/12
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/08/12
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class ColdchainAlarmDTO {
+
+    @ApiModelProperty(value = "G7车辆id")
+    private String truckid;
+
+    @ApiModelProperty(value = "车牌号")
+    private String carnum;
+
+    @ApiModelProperty(value = "设备号")
+    private String gpsno;
+
+    @ApiModelProperty(value = "设备类型,0:固定式,1:便携式")
+    private Integer devicetype;
+
+    @ApiModelProperty(value = "探头名称")
+    private String probename;
+
+    @ApiModelProperty(value = "警报类型: 1 低温预警, 2 低温报警, 3 高温预警, ")
+    private Integer alarmtype;
+
+    @ApiModelProperty(value = "报警温度")
+    private BigDecimal temperature;
+
+    @ApiModelProperty(value = "警戒温度 (设置温度范围)")
+    private String temperatureSetting;
+
+    @ApiModelProperty(value = "报警开始时间")
+    private String starttime;
+
+    @ApiModelProperty(value = "报警结束时间")
+    private String endtime;
+
+    @ApiModelProperty(value = "持续时间(秒)")
+    private String difftime;
+
+    @ApiModelProperty(value = "开始纬度")
+    private BigDecimal startlat;
+
+    @ApiModelProperty(value = "开始经度")
+    private BigDecimal startlng;
+
+    @ApiModelProperty(value = "结束纬度")
+    private BigDecimal endlat;
+
+    @ApiModelProperty(value = "结束经度")
+    private BigDecimal endlng;
+
+    @ApiModelProperty(value = "车速")
+    private BigDecimal speed;
+
+    @ApiModelProperty(value = "冷机状态 0:关 1:开")
+    private Integer coldstatus;
+
+    @ApiModelProperty(value = "结束标志 0:未结束 1:结束")
+    private Integer end;
+
+    @ApiModelProperty(value = "引擎状态")
+    private Integer acc;
+
+    @ApiModelProperty(value = "压缩机状态")
+    private Integer compressor;
+
+    @ApiModelProperty(value = "门磁状态")
+    private Integer door;
+
+    @ApiModelProperty(value = "电量")
+    private Integer elecvalue;
+
+    @ApiModelProperty(value = "开始湿度")
+    private BigDecimal startHumidity;
+
+    @ApiModelProperty(value = "结束湿度")
+    private BigDecimal endHumidity;
+
+    @ApiModelProperty(value = "最高温度")
+    private BigDecimal maxTemperature;
+
+    @ApiModelProperty(value = "最低温度")
+    private BigDecimal lowestTemperature;
+
+    @ApiModelProperty(value = "平均温度")
+    private BigDecimal averageTemperature;
+
+    @ApiModelProperty(value = "报警等级")
+    private Integer alarmLevel;
+
+    @ApiModelProperty(value = "处理标志")
+    private Integer mark;
+
+    @ApiModelProperty(value = "处理方式")
+    private Integer processingMode;
+
+    @ApiModelProperty(value = "处理人")
+    private String handler;
+
+    @ApiModelProperty(value = "处理时间")
+    private String handleTime;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "0.未处置 1.已及时整改 2.拒不整改")
+    private String handleResult;
+
+    @ApiModelProperty(value = "报警处置说明：电话、短信、系统错误")
+    private String handleContent;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/g7/CurrentGpsLocationDTO.java

@@ -0,0 +1,55 @@
+package com.prolog.rdc.tms.model.dto.g7;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ *
+ * 车辆当前定位V1.0DTO
+ *
+ * @className :CurrentLocationDTO
+ * @author :fanzw
+ * @creationTime :2022/08/12
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/08/12
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class CurrentGpsLocationDTO {
+
+    @ApiModelProperty(value = "gps设备号")
+    private String gpsno;
+
+    @ApiModelProperty(value = "经度，GCJ02坐标系")
+    private BigDecimal lng;
+
+    @ApiModelProperty(value = "纬度，GCJ02坐标系")
+    private BigDecimal lat;
+
+    @ApiModelProperty(value = "方向角(°)，360度，正北为0")
+    private BigDecimal course;
+
+    @ApiModelProperty(value = "最后通讯时间")
+    private String time;
+
+    @ApiModelProperty(value = "最后定位时间")
+    private String gps_time;
+
+    @ApiModelProperty(value = "状态，同G7系统全图监控设备状态(G7自定义状态，0=无法定位（设备没有上报过数据）；1=信号中断；2=未定位；3=车辆静止；4=车辆运动中; 6=未启用)")
+    private Integer status;
+
+    @ApiModelProperty(value = "两个相邻经纬度点的距离|单位:厘米")
+    private BigDecimal altitude;
+
+    @ApiModelProperty(value = "速度，km/h")
+    private BigDecimal speed;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/g7/CurrentLocationDTO.java

@@ -0,0 +1,45 @@
+package com.prolog.rdc.tms.model.dto.g7;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ *
+ * 车辆当前定位V1.0DTO
+ *
+ * @className :CurrentLocationDTO
+ * @author :fanzw
+ * @creationTime :2022/08/12
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/08/12
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class CurrentLocationDTO {
+
+    @ApiModelProperty(value = "经度，GCJ02坐标系")
+    private BigDecimal lng;
+
+    @ApiModelProperty(value = "纬度，GCJ02坐标系")
+    private BigDecimal lat;
+
+    @ApiModelProperty(value = "速度，km/h")
+    private Integer speed;
+
+    @ApiModelProperty(value = "方向角(°)，360度，正北为0")
+    private String course;
+
+    @ApiModelProperty(value = "定位时间 unix timestamp, 精度毫秒ms")
+    private String time;
+
+    @ApiModelProperty(value = "两个相邻经纬度点的距离|单位:厘米")
+    private Integer distance;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/g7/CurrentTemperatureDTO.java

@@ -0,0 +1,57 @@
+package com.prolog.rdc.tms.model.dto.g7;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ *
+ * 车辆当前定位V1.0DTO
+ *
+ * @className :CurrentTemperatureDTO
+ * @author :fanzw
+ * @creationTime :2022/08/12
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/08/12
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class CurrentTemperatureDTO {
+
+    @ApiModelProperty(value = "车辆编号")
+    private String truckid;
+
+    @ApiModelProperty(value = "机构号")
+    private String orgcode;
+
+    @ApiModelProperty(value = "车牌号")
+    private String carnum;
+
+    @ApiModelProperty(value = "设备号")
+    private String gpsno;
+
+    @ApiModelProperty(value = "1 - 固定; 2 - 便携")
+    private String coldchaintype;
+
+    @ApiModelProperty(value = "1.固定式")
+    private String properties;
+
+    @ApiModelProperty(value = "温度采集时间")
+    private String time;
+
+    @ApiModelProperty(value = "探头温度")
+    private CTemperatureProbeInfoDTO probeInfo;
+
+    @ApiModelProperty(value = "经度，GCJ02坐标系")
+    private BigDecimal lng;
+
+    @ApiModelProperty(value = "纬度，GCJ02坐标系")
+    private BigDecimal lat;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/g7/HistoryLocationByGpsnoDTO.java

@@ -0,0 +1,49 @@
+package com.prolog.rdc.tms.model.dto.g7;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ *
+ * 设备历史轨迹0DTO
+ *
+ * @className :HistoryLocationByGpsnoDTO
+ * @author :fanzw
+ * @creationTime :2022/08/12
+ * @description :
+ *
+ * @modifier :fanzw
+ * @modifyTime :2022/08/12
+ * @reviseRemarks:
+ *
+ * @version :1.0.0
+ *
+ */
+@Data
+public class HistoryLocationByGpsnoDTO {
+
+    @ApiModelProperty(value = "经度，GCJ02坐标系")
+    private BigDecimal lng;
+
+    @ApiModelProperty(value = "纬度，GCJ02坐标系")
+    private BigDecimal lat;
+
+    @ApiModelProperty(value = "速度，km/h")
+    private Integer speed;
+
+    @ApiModelProperty(value = "方向角(°)，360度，正北为0")
+    private String course;
+
+    @ApiModelProperty(value = "距上一点的距离(厘米)")
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "高程，单位米")
+    private String altitude;
+
+    @ApiModelProperty(value = "定位时间, unix timestamp, 精度毫秒ms")
+    private String time;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/intelligent/BranchDTO.java

@@ -0,0 +1,207 @@
+package com.prolog.rdc.tms.model.dto.intelligent;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 仓库资料 DTO
+ * <p>
+ * Copyright: Copyright (C) 2023 prolog-int, Inc. All rights reserved.
+ * <p>
+ * Company: 湖北普罗格科技股份有限公司
+ *
+ *
+ * @author hongbo.pan
+ * @since 2023-08-29 12:27:10
+ */
+@Data
+public class BranchDTO {
+
+	@ApiModelProperty(value = "仓库ID (主键)")
+	private Long id;
+
+	@ApiModelProperty(value = "仓库编码")
+	private String code;
+
+	@ApiModelProperty(value = "仓库名称")
+	private String name;
+
+	@ApiModelProperty(value = "仓库简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区编码")
+	private String district;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "提货签到 数据字典WHETHER:0否，1是")
+	private Integer pickUpSign;
+
+	@ApiModelProperty(value = "自动提货签到 数据字典WHETHER:0否，1是")
+	private Integer autoPickUpSign;
+
+	@ApiModelProperty(value = "提货图片 数据字典WHETHER:0否，1是")
+	private Integer pickUpPicture;
+
+	@ApiModelProperty(value = "默认提货围栏")
+	private BigDecimal defaultPickUpRail;
+
+	@ApiModelProperty(value = "送达签到 数据字典WHETHER:0否，1是")
+	private Integer deliverySign;
+
+	@ApiModelProperty(value = "自动送达签到 数据字典WHETHER:0否，1是")
+	private Integer autoDeliverySign;
+
+	@ApiModelProperty(value = "送达图片 数据字典WHETHER:0否，1是")
+	private Integer deliveryPicture;
+
+	@ApiModelProperty(value = "回单图片 数据字典WHETHER:0否，1是")
+	private Integer returnOrderPicture;
+
+	@ApiModelProperty(value = "默认送达围栏")
+	private BigDecimal defaultDeliveryRail;
+
+	@ApiModelProperty(value = "每日作业开始时间")
+	private String startTime;
+
+	@ApiModelProperty(value = "每日作业结束时间")
+	private String endTime;
+
+	@ApiModelProperty(value = "作业时长")
+	private BigDecimal workingTime;
+
+	@ApiModelProperty(value = "状态")
+	private Integer status;
+
+	@ApiModelProperty(value = "可预约时间点 数据字典AVAILABLE_TIME 10预计提货时间 20下单时间 30提交时间 40审核时间 50调度时间 60调度审核时间")
+	private Integer aptTime;
+
+	@ApiModelProperty(value = "预约时间期间")
+	private Integer aptTimeDura;
+
+	@ApiModelProperty(value = "可预约时间单位 数据字典AVAILABLE_UNIT 1小时 2天")
+	private Integer aptUnit;
+
+	@ApiModelProperty(value = "班次允许预约数")
+	private Integer aptNum;
+
+	@ApiModelProperty(value = "预约模式 数据字典 APPOINTMENT_TYPE 10仅提货预约 20仅送货预约 30提货,送货皆预约")
+	private Integer aptType;
+
+	@ApiModelProperty(value = "预约不可取消时间点 数据字典AVAILABLE_TIME 10预计提货时间 20下单时间 30提交时间 40审核时间 50调度时间 60调度审核时间")
+	private Integer aptCanNotCancel;
+
+	@ApiModelProperty(value = "预约不可取消期间")
+	private Integer aptCanNotCancelDura;
+
+	@ApiModelProperty(value = "预约不可时间单位 数据字典AVAILABLE_UNIT 1小时 2天")
+	private Integer aptCanNotCancelUnit;
+
+	@ApiModelProperty(value = "叫号处理方式 数据字典 10等待区先叫号 20按照排队号叫号")
+	private Integer callHandleType;
+
+	@ApiModelProperty(value = "过号处理方式 数据字典  10重新取号 20往后排三位 30往后排五位")
+	private Integer overNumHandleType;
+
+	@ApiModelProperty(value = "签到自动取号 数据字典WHETHER:0否，1是")
+	private Integer signInAutoPickUpNum;
+
+	@ApiModelProperty(value = "装车时长")
+	private BigDecimal loadingTime;
+
+	@ApiModelProperty(value = "不可预约日期 数据字典 NON_ABL_DT 10按周 20按月")
+	private Integer nonAptDt;
+
+	@ApiModelProperty(value = "不可预约日期 多个日期逗号隔开")
+	private String nonAptDura;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "不可预约指定开始日期")
+	private Date nonAptSpecStartDate;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "不可预约指定结束日期")
+	private Date nonAptSpecEndDate;
+
+	@ApiModelProperty(value = "提货签到时间点 数据字典PICK_UP_SIGN_TIME 10预计提货开始时间 20预计提货结束时间 " +
+			"30下单时间 40提交时间 50审核时间 60调度时间 70调度审核时间")
+	private Integer pickUpSignTime;
+
+	@ApiModelProperty(value = "提货签到时间期间")
+	private Integer pickUpSignTimeDura;
+
+	@ApiModelProperty(value = "提货签到时间单位 数据字典SIGN_TIME_UNIT 1分钟 2小时 3天")
+	private Integer pickUpSignTimeUnit;
+
+	@ApiModelProperty(value = "送达签到时间点 数据字典DELIVERY_SIGN_TIME 10预计送达开始时间 20预计送达结束时间 " +
+			"30下单时间 40提交时间 50审核时间 60调度时间 70调度审核时间")
+	private Integer deliverySignTime;
+
+	@ApiModelProperty(value = "送达签到时间期间")
+	private Integer deliverySignTimeDura;
+
+	@ApiModelProperty(value = "送达签到时间单位 数据字典SIGN_TIME_UNIT 1分钟 2小时 3天")
+	private Integer deliverySignTimeUnit;
+
+	@ApiModelProperty(value = "站点ID")
+	private Long stationId;
+
+	@ApiModelProperty(value = "站点编号")
+	private String stationCode;
+
+	@ApiModelProperty(value = "站点名称")
+	private String stationName;
+
+	@ApiModelProperty(value = "站点区域")
+	private String stationAreas;
+
+	@ApiModelProperty(value = "站点配送顺序")
+	private BigDecimal stationDeliveryOrder;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/intelligent/ConsigneeDTO.java

@@ -0,0 +1,144 @@
+package com.prolog.rdc.tms.model.dto.intelligent;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 客户收货方 DTO
+ * <p>
+ * Copyright: Copyright (C) 2023 prolog-int, Inc. All rights reserved.
+ * <p>
+ * Company: 湖北普罗格科技股份有限公司
+ *
+ *
+ * @author hongbo.pan
+ * @since 2023-08-29 12:27:10
+ */
+@Data
+public class ConsigneeDTO {
+
+	@ApiModelProperty(value = "收货方ID")
+	private Long id;
+
+	@ApiModelProperty(value = "收货方编码")
+	private String code;
+
+	@ApiModelProperty(value = "收货方名称")
+	private String name;
+
+	@ApiModelProperty(value = "收货方简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "客户ID 关联TMS_BASE_CUSTOMER表主键")
+	private Long customerId;
+
+	@ApiModelProperty(value = "客户编号")
+	private String customerCode;
+
+	@ApiModelProperty(value = "客户名称")
+	private String customerName;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "关联手机号")
+	private String relationPhoneNumber;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区编码")
+	private String district;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用 数据字典MAINDATA_STATUS")
+	private Integer status;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "默认承运方类型")
+	private Integer carrierType;
+
+	@ApiModelProperty(value = "承运方ID")
+	private Long carrierId;
+
+	@ApiModelProperty(value = "承运方编码")
+	private String carrierCode;
+
+	@ApiModelProperty(value = "承运方名称")
+	private String carrierName;
+
+	@ApiModelProperty(value = "承运方(司机)手机号")
+	private String carrierPhoneNumber;
+
+	@ApiModelProperty(value = "车辆ID")
+	private String vehicleId;
+
+	@ApiModelProperty(value = "车辆编号")
+	private String vehicleCode;
+
+	@ApiModelProperty(value = "车辆名称")
+	private String vehicleName;
+
+	@ApiModelProperty(value = "车牌号")
+	private String vehiclePlateNumber;
+
+	@ApiModelProperty(value = "配送方式 DELIVERY_PATTERN  字典 1配送 2自提")
+	private Integer deliveryPattern;
+
+	@ApiModelProperty(value = "站点ID")
+	private Long stationId;
+
+	@ApiModelProperty(value = "站点编号")
+	private String stationCode;
+
+	@ApiModelProperty(value = "站点名称")
+	private String stationName;
+
+	@ApiModelProperty(value = "站点配送顺序")
+	private BigDecimal stationDeliveryOrder;
+
+	@ApiModelProperty(value = "站点区域")
+	private String stationAreas;
+
+	@ApiModelProperty(value = "每日作业开始时间")
+	private String startTime;
+
+	@ApiModelProperty(value = "每日作业结束时间")
+	private String endTime;
+
+	@ApiModelProperty(value = "平均装卸时长(min)")
+	private Long loadingTime;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/intelligent/CustomerDTO.java

@@ -0,0 +1,184 @@
+package com.prolog.rdc.tms.model.dto.intelligent;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 客户资料表 DTO
+ * <p>
+ * Copyright: Copyright (C) 2023 prolog-int, Inc. All rights reserved.
+ * <p>
+ * Company: 湖北普罗格科技股份有限公司
+ *
+ *
+ * @author hongbo.pan
+ * @since 2023-08-29 12:27:10
+ */
+@Data
+public class CustomerDTO {
+
+	@ApiModelProperty(value = "客户ID")
+	private Long id;
+
+	@ApiModelProperty(value = "客户编码")
+	private String code;
+
+	@ApiModelProperty(value = "客户名称")
+	private String name;
+
+	@ApiModelProperty(value = "客户简称")
+	private String shortName;
+
+	@ApiModelProperty(value = "货主ID")
+	private Long cargoOwnerId;
+
+	@ApiModelProperty(value = "货主编码")
+	private String cargoOwnerCode;
+
+	@ApiModelProperty(value = "货主名称")
+	private String cargoOwnerName;
+
+	@ApiModelProperty(value = "省编码")
+	private String province;
+
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	@ApiModelProperty(value = "市编码")
+	private String city;
+
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "区编码")
+	private String district;
+
+	@ApiModelProperty(value = "区名称")
+	private String districtName;
+
+	@ApiModelProperty(value = "详细地址")
+	private String address;
+
+	@ApiModelProperty(value = "联系人")
+	private String contact;
+
+	@ApiModelProperty(value = "手机号")
+	private String phoneNumber;
+
+	@ApiModelProperty(value = "座机号")
+	private String landlineNumber;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "经度")
+	private BigDecimal longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private BigDecimal latitude;
+
+	@ApiModelProperty(value = "合作性质 数据字典：COOPERATIVE_NATURE：1合同 2临时")
+	private Integer cooperativeNature;
+
+	@ApiModelProperty(value = "税务登记号")
+	private String taxRegisterNumber;
+
+	@ApiModelProperty(value = "营业执照号")
+	private String businessLicenseNumber;
+
+	@ApiModelProperty(value = "道路许可证")
+	private String roadPermit;
+
+	@ApiModelProperty(value = "法人代表")
+	private String legalman;
+
+	@ApiModelProperty(value = "发票抬头")
+	private String invoice;
+
+	@ApiModelProperty(value = "税号")
+	private String invoiceTaxNumber;
+
+	@ApiModelProperty(value = "注册资金")
+	private String registeredCapital;
+
+	@ApiModelProperty(value = "开户行")
+	private Integer bank;
+
+	@ApiModelProperty(value = "银行账号")
+	private String bankAccount;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "成立时间")
+	private Date established;
+
+	@ApiModelProperty(value = "注册地址")
+	private String registeredAddress;
+
+	@ApiModelProperty(value = "提货签到 数据字典WHETHER:0否，1是")
+	private Integer pickUpSign;
+
+	@ApiModelProperty(value = "自动提货签到 数据字典WHETHER:0否，1是")
+	private Integer autoPickUpSign;
+
+	@ApiModelProperty(value = "提货图片 数据字典WHETHER:0否，1是")
+	private Integer pickUpPicture;
+
+	@ApiModelProperty(value = "默认提货围栏")
+	private BigDecimal defaultPickUpRail;
+
+	@ApiModelProperty(value = "送达签到 数据字典WHETHER:0否，1是")
+	private Integer deliverySign;
+
+	@ApiModelProperty(value = "自动送达签到 数据字典WHETHER:0否，1是")
+	private Integer autoDeliverySign;
+
+	@ApiModelProperty(value = "送达图片 数据字典WHETHER:0否，1是")
+	private Integer deliveryPicture;
+
+	@ApiModelProperty(value = "回单图片 数据字典WHETHER:0否，1是")
+	private Integer returnOrderPicture;
+
+	@ApiModelProperty(value = "默认送达围栏")
+	private BigDecimal defaultDeliveryRail;
+
+	@ApiModelProperty(value = "是否要求回单 数据字典WHETHER:0否，1是")
+	private Integer returnOrderFlag;
+
+	@ApiModelProperty(value = "回单期限")
+	private Integer returnOrderDeadline;
+
+	@ApiModelProperty(value = "状态:0：停用 1：启用 数据字典MAINDATA_STATUS")
+	private Integer status;
+
+	@ApiModelProperty(value = "备注")
+	private String memo;
+
+	@ApiModelProperty(value = "提货签到时间点 数据字典PICK_UP_SIGN_TIME 10预计提货开始时间 20预计提货结束时间 " +
+			"30下单时间 40提交时间 50审核时间 60调度时间 70调度审核时间")
+	private Integer pickUpSignTime;
+
+	@ApiModelProperty(value = "提货签到时间期间")
+	private Integer pickUpSignTimeDura;
+
+	@ApiModelProperty(value = "提货签到时间单位 数据字典SIGN_TIME_UNIT 1分钟 2小时 3天")
+	private Integer pickUpSignTimeUnit;
+
+	@ApiModelProperty(value = "送达签到时间点 数据字典DELIVERY_SIGN_TIME 10预计送达开始时间 20预计送达结束时间 " +
+			"30下单时间 40提交时间 50审核时间 60调度时间 70调度审核时间")
+	private Integer deliverySignTime;
+
+	@ApiModelProperty(value = "送达签到时间期间")
+	private Integer deliverySignTimeDura;
+
+	@ApiModelProperty(value = "送达签到时间单位 数据字典SIGN_TIME_UNIT 1分钟 2小时 3天")
+	private Integer deliverySignTimeUnit;
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/intelligent/VehicleDTO.java

@@ -0,0 +1,62 @@
+package com.prolog.rdc.tms.model.dto.intelligent;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* 车辆 DTO
+* <p>
+* Copyright: Copyright (C) 2023 prolog-int, Inc. All rights reserved.
+* <p>
+* Company: 湖北普罗格科技股份有限公司
+*
+*
+* @author hongbo.pan
+* @since 2023-08-28 12:27:10
+*/
+@Data
+public class VehicleDTO {
+
+    @ApiModelProperty(value = "车辆ID")
+    private Long id;
+
+    @ApiModelProperty(value = "车辆编码")
+    private String code;
+
+    @ApiModelProperty(value = "车牌号")
+    private String plateNumber;
+
+    @ApiModelProperty(value = "车辆类型：数据字典VEHICLE_TYPE: 1自有、2挂靠、3临时")
+    private Integer type;
+
+    @ApiModelProperty(value = "车辆类型：数据字典VEHICLE_TYPE: 1自有、2挂靠、3临时")
+    private String typeName;
+
+    @ApiModelProperty(value = "隶属机构ID")
+    private Long affiliationId;
+
+    @ApiModelProperty(value = "隶属机构编码")
+    private String affiliationCode;
+
+    @ApiModelProperty(value = "隶属机构名称")
+    private String affiliationName;
+
+    @ApiModelProperty(value = "车型ID")
+    private Long vehicleTypeId;
+
+    @ApiModelProperty(value = "车型编码")
+    private String vehicleTypeCode;
+
+    @ApiModelProperty(value = "车型名称")
+    private String vehicleTypeName;
+
+    @ApiModelProperty(value = "备注")
+    private String memo;
+
+    @ApiModelProperty(value = "车辆状态，0闲 1送")
+    private Integer vehicleStatus;
+
+    @ApiModelProperty(value = "车辆状态，0闲 1送")
+    private String vehicleStatusName;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/intelligent/VehicleTypeDTO.java

@@ -0,0 +1,85 @@
+package com.prolog.rdc.tms.model.dto.intelligent;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+* 车型车辆 DTO
+* <p>
+* Copyright: Copyright (C) 2023 prolog-int, Inc. All rights reserved.
+* <p>
+* Company: 湖北普罗格科技股份有限公司
+*
+*
+* @author hongbo.pan
+* @since 2023-08-28 12:27:10
+*/
+@Data
+public class VehicleTypeDTO {
+
+    @ApiModelProperty(value = "车型ID")
+    private Long id;
+
+    @ApiModelProperty(value = "车型编码")
+    private String code;
+
+    @ApiModelProperty(value = "车型名称")
+    private String name;
+
+    @ApiModelProperty(value = "车型品牌 数据字典VEHICLE_TYPE_BRAND：1长安、2依维柯")
+    private Integer brand;
+
+    @ApiModelProperty(value = "车型品牌 数据字典VEHICLE_TYPE_BRAND：1长安、2依维柯")
+    private String brandName;
+
+    @ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+    private Integer type;
+
+    @ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+    private String typeName;
+
+    @ApiModelProperty(value = "长(m)")
+    private BigDecimal length;
+
+    @ApiModelProperty(value = "宽(m)")
+    private BigDecimal width;
+
+    @ApiModelProperty(value = "高(m)")
+    private BigDecimal height;
+
+    @ApiModelProperty(value = "最大行驶里程(km)")
+    private BigDecimal maxMileage;
+
+    @ApiModelProperty(value = "最多订单数量")
+    private BigDecimal maxOrders;
+
+    @ApiModelProperty(value = "最多配送客户数(最多配送网点数)")
+    private BigDecimal sites;
+
+    @ApiModelProperty(value = "载重(kg)")
+    private BigDecimal weight;
+
+    @ApiModelProperty(value = "载方(m³)")
+    private BigDecimal volume;
+
+    @ApiModelProperty(value = "最大装载体积(m3)")
+    private BigDecimal maxLoadingVolume;
+
+    @ApiModelProperty(value = "最大装载重量(kg)")
+    private BigDecimal maxLoadingWeight;
+
+    @ApiModelProperty(value = "最大装载件数")
+    private BigDecimal maxLoadingPcs;
+
+    @ApiModelProperty(value = "最大装载率")
+    private BigDecimal maxLoadingRatio;
+
+    @ApiModelProperty(value = "最小装载率")
+    private BigDecimal minLoadingRatio;
+
+    @ApiModelProperty(value = "备注")
+    private String memo;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/intelligent/VehicleTypeVehicleDTO.java

@@ -0,0 +1,77 @@
+package com.prolog.rdc.tms.model.dto.intelligent;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+* 车型车辆 DTO
+* <p>
+* Copyright: Copyright (C) 2023 prolog-int, Inc. All rights reserved.
+* <p>
+* Company: 湖北普罗格科技股份有限公司
+*
+*
+* @author hongbo.pan
+* @since 2023-08-28 12:27:10
+*/
+@Data
+public class VehicleTypeVehicleDTO {
+
+    @ApiModelProperty(value = "车型ID")
+    private Long id;
+
+    @ApiModelProperty(value = "车型编码")
+    private String code;
+
+    @ApiModelProperty(value = "车型名称")
+    private String name;
+
+    @ApiModelProperty(value = "车型品牌 数据字典VEHICLE_TYPE_BRAND：1长安、2依维柯")
+    private Integer brand;
+
+    @ApiModelProperty(value = "车型品牌 数据字典VEHICLE_TYPE_BRAND：1长安、2依维柯")
+    private String brandName;
+
+    @ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+    private Integer type;
+
+    @ApiModelProperty(value = "车型类别 数据字典VEHICLE_TYPE_CATEGORY：1冷藏车、2平顶车、3厢式货车")
+    private String typeName;
+
+    @ApiModelProperty(value = "长(m)")
+    private BigDecimal length;
+
+    @ApiModelProperty(value = "宽(m)")
+    private BigDecimal width;
+
+    @ApiModelProperty(value = "高(m)")
+    private BigDecimal height;
+
+    @ApiModelProperty(value = "最大行驶里程(km)")
+    private BigDecimal maxMileage;
+
+    @ApiModelProperty(value = "最多订单数量")
+    private BigDecimal maxOrders;
+
+    @ApiModelProperty(value = "最多配送客户数")
+    private BigDecimal sites;
+
+    @ApiModelProperty(value = "载重(kg)")
+    private BigDecimal weight;
+
+    @ApiModelProperty(value = "载方(m³)")
+    private BigDecimal volume;
+
+    @ApiModelProperty(value = "备注")
+    private String memo;
+
+    @ApiModelProperty(value = "车辆集合")
+    private List<VehicleDTO> vehicleDTOList;
+
+    @ApiModelProperty(value = "车辆数量")
+    private Integer vehicleNumber;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/message/SendMessageDTO.java

@@ -0,0 +1,36 @@
+package com.prolog.rdc.tms.model.dto.message;
+
+import com.prolog.product.core.framework.entity.UserEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author hongbo.pan
+ * @date 2022/11/16
+ */
+@NoArgsConstructor
+@RequiredArgsConstructor
+@Data
+public class SendMessageDTO {
+
+    @NonNull
+    @ApiModelProperty(value = "单据类型")
+    private String messageOrderType;
+
+    @NonNull
+    @ApiModelProperty(value = "消息类型")
+    private String messageType;
+
+    @NonNull
+    @ApiModelProperty(value = "单号")
+    private List<String> billCode;
+
+    @ApiModelProperty(value = "用户信息")
+    private UserEntity user;
+
+}

upcloud-jxqn-tms-parent-test/upcloud-jxqn-tms-common-domain/src/main/java/com/prolog/rdc/tms/model/dto/print/PrinterBatchConfigInfoDTO.java

@@ -0,0 +1,23 @@
+package com.prolog.rdc.tms.model.dto.print;
+
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PrinterBatchConfigInfoDTO implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7186908247313099310L;
+
+	@ApiModelProperty(value = "打印模版")
+	private List<PrinterBatchTemplateDTO> printerBatchTemplateDTO;
+
+	@ApiModelProperty(value = "打印配置")
+	private List<PrinterBatchConfigurationDTO> printerBatchConfigurationDTO;
+
+}