1. 手动合并存在重复被合并的文件，并统一包名

zt-module-backend-logistics/pom.xml

@@ -0,0 +1,24 @@
+<?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>dsc-logistics</artifactId>
+        <groupId>com.zt.plat</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modules>
+        <module>zt-module-backend-logistics-api</module>
+        <module>zt-module-backend-logistics-server</module>
+    </modules>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>zt-module-backend-logistics</artifactId>
+    <packaging>pom</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        BackendLogistics 模块。
+    </description>
+
+</project>

zt-module-backend-logistics/zt-module-backend-logistics-api/pom.xml

@@ -0,0 +1,46 @@
+<?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>zt-module-backend-logistics</artifactId>
+        <groupId>com.zt.plat</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>zt-module-backend-logistics-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        暴露给其它模块调用
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-common</artifactId>
+        </dependency>
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>org.springdoc</groupId> <!-- 接口文档：使用最新版本的 Swagger 模型 -->
+            <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>

zt-module-backend-logistics/zt-module-backend-logistics-api/src/main/java/com/zt/plat/module/backendlogistics/enums/YesOrNoEnum.java

@@ -0,0 +1,51 @@
+package com.zt.plat.module.backendlogistics.enums;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "是否，数据字典infra_boolean_string")
+public enum YesOrNoEnum {
+
+    TRUE("true", "是"),
+    FALSE("false", "否");
+
+    private String code;
+
+    private String msg;
+
+    YesOrNoEnum() {
+
+    }
+
+    YesOrNoEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public static String getMsgByCode(String code) {
+        YesOrNoEnum[] values = values();
+        for (YesOrNoEnum dto : values) {
+            if (dto.getCode().equals(code)) {
+                return dto.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static String getCodeByMsg(String msg) {
+        YesOrNoEnum[] values = values();
+        for (YesOrNoEnum dto : values) {
+            if (dto.getMsg().equals(msg)) {
+                return dto.getCode();
+            }
+        }
+        return null;
+    }
+}

zt-module-backend-logistics/zt-module-backend-logistics-api/src/main/java/com/zt/plat/module/backendlogistics/enums/bseMngt/plceAchi/PlceTpEnum.java

@@ -0,0 +1,67 @@
+package com.zt.plat.module.backendlogistics.enums.bseMngt.plceAchi;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Schema(description = "仓库类型，数据字典warehouse_type")
+public enum PlceTpEnum {
+
+    WAREHOUSE("warehouse", "仓库"),
+    FACTORY("factory", "生产厂区"),
+    RAILWAY_STATION("railway-station", "铁路站点"),
+    PORT("port", "港口"),
+    AUNCEL("auncel", "计量点"),
+    GATE("gate", "门岗"),
+    CONSIGNEE_ADDRESS("consignee-address", "客户收货地址");
+
+    private String code;
+
+    private String msg;
+
+    PlceTpEnum() {
+
+    }
+
+    PlceTpEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public static String getMsgByCode(String code) {
+        PlceTpEnum[] values = values();
+        for (PlceTpEnum dto : values) {
+            if (dto.getCode().equals(code)) {
+                return dto.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static String getCodeByMsg(String msg) {
+        PlceTpEnum[] values = values();
+        for (PlceTpEnum dto : values) {
+            if (dto.getMsg().equals(msg)) {
+                return dto.getCode();
+            }
+        }
+        return null;
+    }
+
+    public static Boolean isNoCompany(String code) {
+        List<String> noCompanys = Arrays.asList(PlceTpEnum.WAREHOUSE.getCode(), PlceTpEnum.RAILWAY_STATION.getCode(), PlceTpEnum.CONSIGNEE_ADDRESS.getCode());
+        if (noCompanys.contains(code)) {
+            return true;
+        }
+        return false;
+    }
+}

zt-module-backend-logistics/zt-module-backend-logistics-api/src/main/java/com/zt/plat/module/backendlogistics/enums/bseMngt/plceAchi/QueWyEnum.java

@@ -0,0 +1,51 @@
+package com.zt.plat.module.backendlogistics.enums.bseMngt.plceAchi;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "排队方式，数据字典queue_way")
+public enum QueWyEnum {
+
+    RQ("rq", "远程排队"),
+    AQ("aq", "到厂排队");
+
+    private String code;
+
+    private String msg;
+
+    QueWyEnum() {
+
+    }
+
+    QueWyEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public static String getMsgByCode(String code) {
+        QueWyEnum[] values = values();
+        for (QueWyEnum dto : values) {
+            if (dto.getCode().equals(code)) {
+                return dto.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static String getCodeByMsg(String msg) {
+        QueWyEnum[] values = values();
+        for (QueWyEnum dto : values) {
+            if (dto.getMsg().equals(msg)) {
+                return dto.getCode();
+            }
+        }
+        return null;
+    }
+}

zt-module-backend-logistics/zt-module-backend-logistics-api/src/main/java/com/zt/plat/module/backendlogistics/enums/bseMngt/plceAchi/WrhNtrEnum.java

@@ -0,0 +1,52 @@
+package com.zt.plat.module.backendlogistics.enums.bseMngt.plceAchi;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "仓库性质，数据字典warehouse_nature")
+public enum WrhNtrEnum {
+
+    SW("sw", "现货仓"),
+    FW("fw", "期货仓"),
+    TDW("tdw", "报税仓");
+
+    private String code;
+
+    private String msg;
+
+    WrhNtrEnum() {
+
+    }
+
+    WrhNtrEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public static String getMsgByCode(String code) {
+        WrhNtrEnum[] values = values();
+        for (WrhNtrEnum dto : values) {
+            if (dto.getCode().equals(code)) {
+                return dto.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static String getCodeByMsg(String msg) {
+        WrhNtrEnum[] values = values();
+        for (WrhNtrEnum dto : values) {
+            if (dto.getMsg().equals(msg)) {
+                return dto.getCode();
+            }
+        }
+        return null;
+    }
+}

zt-module-backend-logistics/zt-module-backend-logistics-api/src/main/java/com/zt/plat/module/backendlogistics/enums/bseMngt/plceAchi/WrhTpEnum.java

@@ -0,0 +1,51 @@
+package com.zt.plat.module.backendlogistics.enums.bseMngt.plceAchi;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "仓库类型，数据字典warehouse_type")
+public enum WrhTpEnum {
+
+    FAW("faw", "厂区库"),
+    TPL("tpl", "三方库");
+
+    private String code;
+
+    private String msg;
+
+    WrhTpEnum() {
+
+    }
+
+    WrhTpEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public static String getMsgByCode(String code) {
+        WrhTpEnum[] values = values();
+        for (WrhTpEnum dto : values) {
+            if (dto.getCode().equals(code)) {
+                return dto.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static String getCodeByMsg(String msg) {
+        WrhTpEnum[] values = values();
+        for (WrhTpEnum dto : values) {
+            if (dto.getMsg().equals(msg)) {
+                return dto.getCode();
+            }
+        }
+        return null;
+    }
+}

zt-module-backend-logistics/zt-module-backend-logistics-api/src/main/java/com/zt/plat/module/backendlogistics/enums/bseMngt/xtAcct/AcctStatisEnum.java

@@ -0,0 +1,53 @@
+package com.zt.plat.module.backendlogistics.enums.bseMngt.xtAcct;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "协同账号状态，数据字典account_status")
+public enum AcctStatisEnum {
+    EDIT("0", "编辑"),
+    AWAIT_AUTH("1", "待审核"),
+    REVIEWED("2","已审核"),
+    CONFIRM("3","确认"),
+    CAENCEL("-1","注销");
+
+    private String code;
+
+    private String msg;
+
+    AcctStatisEnum() {
+
+    }
+
+    AcctStatisEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public static String getMsgByCode(String code) {
+        AcctStatisEnum[] values = values();
+        for (AcctStatisEnum dto : values) {
+            if (dto.getCode().equals(code)) {
+                return dto.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static String getCodeByMsg(String msg) {
+        AcctStatisEnum[] values = values();
+        for (AcctStatisEnum dto : values) {
+            if (dto.getMsg().equals(msg)) {
+                return dto.getCode();
+            }
+        }
+        return null;
+    }
+}

zt-module-backend-logistics/zt-module-backend-logistics-api/src/main/java/com/zt/plat/module/backendlogistics/enums/bseMngt/xtAcct/DriverSourceEnum.java

@@ -0,0 +1,51 @@
+package com.zt.plat.module.backendlogistics.enums.bseMngt.xtAcct;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "协同账号来源，数据字典driver_source")
+public enum DriverSourceEnum {
+    DRIVER("DRIVER", "司机"),
+    COLLABORATION("COLLABORATION", "协同平台"),
+    SYSTEM("SYSTEM","管理系统");
+
+    private String code;
+
+    private String msg;
+
+    DriverSourceEnum() {
+
+    }
+
+    DriverSourceEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public static String getMsgByCode(String code) {
+        DriverSourceEnum[] values = values();
+        for (DriverSourceEnum dto : values) {
+            if (dto.getCode().equals(code)) {
+                return dto.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static String getCodeByMsg(String msg) {
+        DriverSourceEnum[] values = values();
+        for (DriverSourceEnum dto : values) {
+            if (dto.getMsg().equals(msg)) {
+                return dto.getCode();
+            }
+        }
+        return null;
+    }
+}