初次提交“

.gitignore

@@ -1,3 +1,12 @@
+target/
+*.iml
+.idea/
+rebel.xml
+.rebel.xml.bak
+out/artifacts/
+dil-api.iml
+src/test
+
 # Compiled class file
 *.class
 

pom.xml

@@ -0,0 +1,142 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.example</groupId>
+    <artifactId>antai-api</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.0.7.RELEASE</version>
+    </parent>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <!--Spring Cloud的版本-->
+                <version>Finchley.SR2</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <repositories>
+        <repository>
+            <id>maven-public</id>
+            <name>steerinfo maven-public</name>
+            <url>https://nexus.steerinfo.com/repository/maven-public/</url>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <repository>
+            <id>maven-releases</id>
+            <name>steerinfo nexus-releases</name>
+            <url>http://nexus.steerinfo.com/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>maven-snapshots</id>
+            <url>http://nexus.steerinfo.com/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <dependencies>
+        <!--websocket-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.24</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.0.7.RELEASE</version>
+        </dependency>
+
+        <!--mybatisPlus-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-security</artifactId>-->
+<!--        </dependency>-->
+
+        <!--swagger-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <!--steerinfo-->
+        <dependency>
+            <groupId>com.steerinfo</groupId>
+            <artifactId>framework</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.mybatis/mybatis -->
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.6</version>
+        </dependency>
+
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+</project>

src/main/java/com/steerinfo/DilApplicationMain.java

@@ -0,0 +1,26 @@
+package com.steerinfo;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/4/21 14:32
+ * @Version 1.0
+ */
+@SpringBootApplication
+@ServletComponentScan
+@EnableScheduling
+@MapperScan({"com.steerinfo.dil.mapper"})
+@EnableFeignClients(basePackages = "com.steerinfo.dil.feign")
+@EnableDiscoveryClient
+public class DilApplicationMain {
+    public static void main(String[] args) {
+        SpringApplication.run(DilApplicationMain.class,args);
+    }
+}

src/main/java/com/steerinfo/dil/config/CorsConfig1.java

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ *
+ */
+@Configuration
+public class CorsConfig1 implements WebMvcConfigurer {
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowedMethods("GET","HEAD","POST","PUT","DELETE","OPTIONS")
+                .allowCredentials(true)
+                .maxAge(3600)
+                .allowedHeaders("*");
+    }
+}

src/main/java/com/steerinfo/dil/config/FileUtils.java

@@ -0,0 +1,12 @@
+package com.steerinfo.dil.config;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+public interface FileUtils {
+
+    public List<String> updateFiles(MultipartFile files[])throws Exception;
+
+     public Object downloadFile(String url) throws Exception;
+}

src/main/java/com/steerinfo/dil/config/ImageFileUtils.java

@@ -0,0 +1,234 @@
+package com.steerinfo.dil.config;
+
+import com.steerinfo.framework.utils.misc.IdGenerator;
+import com.steerinfo.dil.util.UploadUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.*;
+
+@Component
+public class ImageFileUtils implements FileUtils {
+
+    @Value(value = "${piction.path:/shared}" )
+    private String path;
+
+    public static final HashMap fileTypes = new HashMap();
+
+    static {
+
+        // images
+
+        fileTypes.put("FFD8FF", "jpg");
+
+        fileTypes.put("89504E47", "png");
+
+        fileTypes.put("47494638", "gif");
+
+        fileTypes.put("49492A00", "tif");
+
+        fileTypes.put("424D", "bmp");
+
+        // CAD
+
+        fileTypes.put("41433130", "dwg");
+
+        fileTypes.put("38425053", "psd");
+
+        // 日记本
+
+        fileTypes.put("7B5C727466", "rtf");
+
+        fileTypes.put("3C3F786D6C", "xml");
+
+        fileTypes.put("68746D6C3E", "html");
+
+        // 邮件
+
+        fileTypes.put("44656C69766572792D646174653A", "eml");
+
+        fileTypes.put("D0CF11E0", "doc");
+
+        //excel2003版本文件
+
+        fileTypes.put("D0CF11E0", "xls");
+
+        fileTypes.put("5374616E64617264204A", "mdb");
+
+        fileTypes.put("252150532D41646F6265", "ps");
+
+        fileTypes.put("255044462D312E", "pdf");
+
+        fileTypes.put("504B0304", "docx");
+
+        //excel2007以上版本文件
+
+        fileTypes.put("504B0304", "xlsx");
+
+        fileTypes.put("52617221", "rar");
+
+        fileTypes.put("57415645", "wav");
+
+        fileTypes.put("41564920", "avi");
+
+        fileTypes.put("2E524D46", "rm");
+
+        fileTypes.put("000001BA", "mpg");
+
+        fileTypes.put("000001B3", "mpg");
+
+        fileTypes.put("6D6F6F76", "mov");
+
+        fileTypes.put("3026B2758E66CF11", "asf");
+
+        fileTypes.put("4D546864", "mid");
+
+        fileTypes.put("1F8B08", "gz");
+
+    }
+
+
+    /**
+     * 上传多张图片
+     * @param files
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public synchronized List<String> updateFiles(MultipartFile files[]) throws Exception {
+        //首先通过Calendard对象获得年月日
+        Calendar calendar= Calendar.getInstance();
+        int year = calendar.get(Calendar.YEAR);
+        int month = calendar.get(Calendar.MONTH);
+        int day= calendar.get(Calendar.DAY_OF_MONTH);
+        //上传文件夹路径
+        List<String> urls=new ArrayList<>();
+        for (int i=0;i<files.length;i++){
+            String url = UploadUtils.uploadFile(files[i], new IdGenerator(i, 10), path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
+            urls.add(url);
+        }
+        return urls;
+    }
+
+
+    /**
+     * 上传单张图片
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    public synchronized String updateFile(MultipartFile file,long workerId) throws Exception {
+        //首先通过Calendard对象获得年月日
+        Calendar calendar= Calendar.getInstance();
+        int year = calendar.get(Calendar.YEAR);
+        int month = calendar.get(Calendar.MONTH);
+        int day= calendar.get(Calendar.DAY_OF_MONTH);
+        String url = UploadUtils.uploadFile(file, new IdGenerator(workerId%31, 10), path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
+        return url;
+    }
+
+    /**
+     * 下载图片获得字节码
+     * @param filePath
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public Object downloadFile(String filePath) throws Exception {
+        File file = new File(filePath);
+        if(file.isDirectory()){
+
+            throw new RuntimeException("当前路径是目录");
+
+        }
+        byte[] b = bytes(file);
+        String type =getFileHeader(b);
+        String src="data:image/"+type+";base64,"+ Base64.getEncoder().encodeToString(b);
+        return src;
+    }
+
+
+
+
+    /**
+     * @return 文件头信息
+     * @author liang.pan
+     * <p>
+     * 方法描述：根据输入流获取文件头信息
+     */
+    public static String getFileHeader(byte[] b) {
+        String value = bytesToHexString(b);
+
+        if (StringUtils.startsWith(value, "FFD8FF")) {
+            value = value.substring(0, 6);
+        }
+
+        //判断什么类型的
+        Set set = fileTypes.keySet();
+        Iterator iterator = set.iterator();
+        while(iterator.hasNext()){
+            String key=iterator.next().toString();
+            if (value.contains(key)){
+                return fileTypes.get(key).toString();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param src 要读取文件头信息的文件的byte数组
+     * @return 文件头信息
+     * @author liang.pan
+     * <p>
+     * 方法描述：将要读取文件头信息的文件的byte数组转换成string类型表示
+     */
+    private static String bytesToHexString(byte[] src) {
+        StringBuilder builder = new StringBuilder();
+        if (src == null || src.length <= 0) {
+            return null;
+        }
+        String hv;
+        for (int i = 0; i < src.length; i++) {
+            // 以十六进制（基数 16）无符号整数形式返回一个整数参数的字符串表示形式，并转换为大写
+            hv = Integer.toHexString(src[i] & 0xFF).toUpperCase();
+            if (hv.length() < 2) {
+                builder.append(0);
+            }
+            builder.append(hv);
+        }
+        return builder.toString();
+    }
+
+
+    public byte[] bytes(File file) throws Exception {
+        FileInputStream fin = new FileInputStream(file);
+        try {
+            //可能溢出,简单起见就不考虑太多,如果太大就要另外想办法，比如一次传入固定长度byte[]
+            byte[] bytes  = new byte[fin.available()];
+            //将文件内容写入字节数组，提供测试的case
+            fin.read(bytes);
+            fin.close();
+            return bytes;
+        }catch (Exception ex){
+            throw ex;
+        }
+        finally {
+            if (null != fin) {
+
+                try {
+
+                    fin.close();
+
+                } catch (IOException e) {
+
+                }
+
+            }
+        }
+    }
+}

src/main/java/com/steerinfo/dil/config/WebSocketConfig.java

@@ -0,0 +1,43 @@
+package com.steerinfo.dil.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.ChannelRegistration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+@Configuration
+@EnableWebSocketMessageBroker
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry stompEndpointRegistry) {
+        stompEndpointRegistry
+                .addEndpoint("/webSocket")
+                .setAllowedOrigins("*")
+                .withSockJS(); //使用sockJS
+
+    }
+
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry registry) {
+        //这里使用的是内存模式，生产环境可以使用rabbitmq或者其他mq。
+        //这里注册两个，主要是目的是将广播和队列分开。
+        //registry.enableStompBrokerRelay().setRelayHost().setRelayPort() 其他方式
+        registry.enableSimpleBroker("/topic");
+        //设置客户端前缀 即@MessageMapping
+        registry.setApplicationDestinationPrefixes("/app");
+        //点对点发送前缀
+        registry.setUserDestinationPrefix("/user");
+    }
+
+    /**
+     * 输入通道参数配置
+     *
+     * @param registration
+     */
+    @Override
+    public void configureClientInboundChannel(ChannelRegistration registration) {
+    }
+}

src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -0,0 +1,2290 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-09-17 14:10
+ */
+@RestController
+@RequestMapping("${api.version}/ams")
+public class AMScontroller{
+
+    @Autowired
+    AmsFeign amsFeign;
+
+
+    @ApiOperation(value="查询运输预约")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(79)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllPurPlan")
+    public Map<String, Object> getAllPurPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       Integer status,String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAllPurPlan(mapValue, apiId, pageNum, pageSize, status, con);
+    }
+
+    @ApiOperation(value = "通过Id查询请车作业")
+    @PostMapping("/getPurPlanById/{planId}")
+    public Map<String, Object> getPurPlanById(@PathVariable("planId") Integer planId) {
+        return amsFeign.getPurPlanById(planId);
+    }
+
+    @ApiOperation(value = "新增运输计划 状态：0")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amstruckPurplan", value = "运输计划实绩对象", required = false, dataType = "AmstruckPurplan"),
+    })
+    @PostMapping("/addPurPlan")
+    public Map<String, Object> addPurPlan(@RequestBody Map<String, Object> map) {
+        return amsFeign.addPurPlan(map);
+    }
+
+    @ApiOperation(value="修改运输计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amstruckPurplan", value = "请车作业实绩对象", required = false, dataType = "AmstruckPurplan"),
+    })
+    @PostMapping("/updatePurPlan")
+    public Map<String, Object> updatePurPlan(@RequestBody Map<String, Object> amstruckPurplan){
+        return amsFeign.updatePurPlan(amstruckPurplan);
+    }
+
+    @ApiOperation(value = "下发运输计划 状态：1")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/sendPurPlan/{planId}")
+    public Map<String, Object> sendPurPlan(@PathVariable("planId") Integer planId) {
+        return amsFeign.sendPurPlan(planId);
+    }
+
+    @ApiOperation(value = "接收运输计划 状态：2")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/receptionPurPlan/{planId}")
+    public Map<String, Object> receptionPurPlan(@PathVariable("planId") Integer planId) {
+        return amsFeign.receptionPurPlan(planId);
+    }
+
+    //停用运输计划
+    @PostMapping("/changePlanStatus/{planId}")
+    public Map<String,Object>changePlanStatus(@PathVariable("planId") BigDecimal planId){
+        return amsFeign.changePlanStatus(planId);
+    }
+
+
+
+    @ApiOperation(value = "逻辑删除运输计划 状态：3")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/deletePurPlan/{planId}")
+    public Map<String, Object> deletePurPlan(@PathVariable("planId") Integer planId) {
+        return amsFeign.deletePurPlan(planId);
+    }
+
+    //**************************************************************************************
+    @ApiOperation(value = "查询要分派的计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(82)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getDecomposedPlan")
+    public Map<String, Object> getDecomposedPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer planId,
+                                           Integer status,
+                                                 Integer planStatus,
+                                                 String con) {
+        return amsFeign.getDecomposedPlan(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, planId, status, planStatus, con);
+    }
+
+
+    /**
+     * 违约规则
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getBreachList")
+    @ApiOperation(value = "展示违约列表")
+    public Map<String, Object> getBreachList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getBreachList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addContractBreach")
+    @ApiOperation(value = "新增违约规则")
+    Map<String, Object> addContractBreach(@RequestBody Map<String, Object> amsContractBreach) {
+        return amsFeign.addContractBreach(amsContractBreach);
+    }
+
+    @PostMapping("deleteContractBreach/{breachId}")
+    @ApiOperation(value = "逻辑删除违约规则")
+    Map<String, Object> deleteContractBreach(@PathVariable("breachId") BigDecimal breachId) {
+        return amsFeign.deleteContractBreach(breachId);
+    }
+
+    @PostMapping("updateContractBreach")
+    @ApiOperation(value = "修改违约规则")
+    Map<String, Object> updateContractBreach(@RequestBody Map<String, Object> amsContractBreach) {
+        return amsFeign.updateContractBreach(amsContractBreach);
+    }
+
+    @PostMapping("selectBreachToUpdate/{breachId}")
+    @ApiOperation(value = "查询违约规则")
+    Map<String, Object> selectBreachToUpdate(@PathVariable("breachId") BigDecimal breachId) {
+        return amsFeign.selectBreachToUpdate(breachId);
+    }
+
+
+    /**
+     * 港口装卸单价
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getLoadUnloadPriceList")
+    @ApiOperation(value = "展示港口装卸单价列表")
+    public Map<String, Object> getLoadUnloadPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getLoadUnloadPriceList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addLoadUnloadPrice")
+    @ApiOperation(value = "新增港口装卸单价")
+    Map<String, Object> addLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice) {
+        return amsFeign.addLoadUnloadPrice(amsContractOtherPrice);
+    }
+
+    @PostMapping("deleteLoadUnloadPrice/{priceId}")
+    @ApiOperation(value = "逻辑删除港口装卸单价")
+    Map<String, Object> deleteLoadUnloadPrice(@PathVariable("priceId") BigDecimal priceId) {
+        return amsFeign.deleteLoadUnloadPrice(priceId);
+    }
+
+    @PostMapping("updateLoadUnloadPrice")
+    @ApiOperation(value = "修改港口装卸单价")
+    Map<String, Object> updateLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice) {
+        return amsFeign.updateLoadUnloadPrice(amsContractOtherPrice);
+    }
+
+    @PostMapping("selectLoadUnloadPriceToUpdate/{priceId}")
+    @ApiOperation(value = "查询港口装卸单价")
+    Map<String, Object> selectLoadUnloadPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
+        return amsFeign.selectLoadUnloadPriceToUpdate(priceId);
+    }
+
+
+    /**
+     * 火运单价
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getTrainPriceList")
+    @ApiOperation(value = "展示火运单价列表")
+    public Map<String, Object> getTrainPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTrainPriceList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addTrainPrice")
+    @ApiOperation(value = "新增火运单价")
+    Map<String, Object> addTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice) {
+        return amsFeign.addTrainPrice(amsContractTrainPrice);
+    }
+
+    @PostMapping("deleteTrainPrice/{priceId}")
+    @ApiOperation(value = "逻辑删除火运单价")
+    Map<String, Object> deleteTrainPrice(@PathVariable("priceId") BigDecimal priceId) {
+        return amsFeign.deleteTrainPrice(priceId);
+    }
+
+    @PostMapping("updateTrainPrice")
+    @ApiOperation(value = "修改火运单价")
+    Map<String, Object> updateTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice) {
+        return amsFeign.updateTrainPrice(amsContractTrainPrice);
+    }
+
+    @PostMapping("selectTrainPriceToUpdate/{priceId}")
+    @ApiOperation(value = "通过id查询火运单价")
+    Map<String, Object> selectTrainPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
+        return amsFeign.selectTrainPriceToUpdate(priceId);
+    }
+
+    /**
+     * 运费单价
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getShipPriceList")
+    @ApiOperation(value = "展示水运单价列表")
+    public Map<String, Object> getShipPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getShipPriceList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addShipPrice")
+    @ApiOperation(value = "新增水运单价")
+    Map<String, Object> addShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
+        return amsFeign.addShipPrice(amsContractTransportPrice);
+    }
+
+    @PostMapping("deleteShipPrice/{priceId}")
+    @ApiOperation(value = "逻辑删除运费单价")
+    Map<String, Object> deleteShipPrice(@PathVariable("priceId") BigDecimal priceId) {
+        return amsFeign.deleteShipPrice(priceId);
+    }
+
+    @PostMapping("updateShipPrice")
+    @ApiOperation(value = "修改水运单价")
+    Map<String, Object> updateShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
+        return amsFeign.updateShipPrice(amsContractTransportPrice);
+    }
+
+    @PostMapping("selectPriceToUpdate/{priceId}")
+    @ApiOperation(value = "通过id查询运费单价")
+    Map<String, Object> selectPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
+        return amsFeign.selectPriceToUpdate(priceId);
+    }
+
+    @PostMapping("getTruckPriceList")
+    @ApiOperation(value = "展示汽运单价列表")
+    public Map<String, Object> getTruckPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckPriceList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addAmsContractTransportPrice")
+    @ApiOperation(value = "新增汽运单价")
+    Map<String, Object> addAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
+        return amsFeign.addAmsContractTransportPrice(amsContractTransportPrice);
+    }
+
+    @PostMapping("updateAmsContractTransportPrice")
+    @ApiOperation(value = "修改汽运单价")
+    Map<String, Object> updateAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
+        return amsFeign.updateAmsContractTransportPrice(amsContractTransportPrice);
+    }
+
+
+    @PostMapping("getPurchaseOrderList")
+    @ApiOperation(value = "展示采购订单列表")
+    public Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId,
+                                              String con,
+                                                    String sendCompId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId, con, sendCompId);
+    }
+
+    /**
+     * 获取收货地址
+     * @return
+     */
+    @PostMapping("getAddressDeliveryAddress")
+    @ApiOperation(value = "得到地址下拉")
+    @ApiImplicitParam(name = "apiId",value = "255")
+    public Map<String, Object> getAddressDeliveryAddress(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                         Integer apiId,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         String con){
+        return amsFeign.getAddressDeliveryAddress(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @GetMapping("getShipperId")
+    @ApiOperation(value = "得到托运人下拉")
+    public Map<String, Object> getShipperId(){
+        return amsFeign.getShipperId();
+    }
+
+    @GetMapping("getCarrierId")
+    @ApiOperation(value = "得到承运商下拉")
+    public Map<String, Object> getCarrierId(){
+        return amsFeign.getCarrierId();
+    }
+
+    @GetMapping("getCapacityId")
+    @ApiOperation(value = "获取船id下拉列表")
+    public Map<String, Object> getCapacityId(){
+        return amsFeign.getCapacityId();
+    }
+
+    @GetMapping("getMaterialId")
+    @ApiOperation(value = "得到物资下拉")
+    public Map<String, Object> getMaterialId(){
+        return amsFeign.getMaterialId();
+    }
+
+    @GetMapping("getTruckCapacityId")
+    @ApiOperation(value = "得到车牌号下拉")
+    public Map<String, Object> getTruckCapacityId(){
+        return amsFeign.getTruckCapacityId();
+    }
+
+    @GetMapping("getLineId")
+    @ApiOperation(value = "获取运输线路下拉列表")
+    public Map<String, Object> getLineId(){
+        return amsFeign.getLineId();
+    }
+// ----------------------------------销售合同-------------------------------------------
+    /**
+     * 查询汽运单价信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("/getAmsContractTransportPrice1")
+    @ApiOperation(value = "查询汽运单价信息")
+    public Map<String, Object> getAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                             Integer pageNum,
+                                                             Integer pageSize,
+                                                             Integer apiId,
+                                                             String con,
+                                                             Integer deleted) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, con,deleted);
+    }
+
+    @PostMapping("/importDataForAmsContractTransportPrice")
+    @ApiOperation(value = "查询汽运单价信息")
+    public Map<String, Object> importDataForAmsContractTransportPrice(@RequestBody(required = false) List<Map<String,Object>> mapList,
+                                                                      BigDecimal importPriceValue, String importPriceDate) {
+        return amsFeign.importDataForAmsContractTransportPrice(mapList,importPriceValue,importPriceDate);
+    }
+
+    @PostMapping("/deleteSalelPrice")
+    @ApiOperation(value = "删除单价")
+    public Map<String,Object> deleteSalelPrice(@RequestBody(required=false) Map<String,Object> mapValue){
+        return amsFeign.deleteSalelPrice(mapValue);
+    }
+
+    @PostMapping("/getCarrierListByPrice")
+    @ApiOperation(value = "获取所有承运商")
+    public Map<String,Object> getCarrierListByPrice(@RequestBody(required=false) Map<String,Object> mapValue){
+        return amsFeign.getCarrierListByPrice(mapValue);
+    }
+
+    @PostMapping("/updatePriceValue")
+    @ApiOperation(value = "更新单价")
+    public Map<String,Object> updatePriceValue(@RequestBody(required=false) Map<String,Object> mapValue){
+        return amsFeign.updatePriceValue(mapValue);
+    }
+
+    @PostMapping("/updateaddressDeliveryAddress")
+    @ApiOperation(value = "更新卸货地址")
+    public Map<String,Object> updateaddressDeliveryAddress(@RequestBody(required=false) Map<String,Object> mapValue){
+        return amsFeign.updateaddressDeliveryAddress(mapValue);
+    }
+
+    @PostMapping("/getCarrierListByAddress")
+    @ApiOperation(value = "获取数据")
+    public Map<String,Object> getCarrierListByAddress(@RequestBody(required=false) Map<String,Object> mapValue){
+        return amsFeign.getCarrierListByAddress(mapValue);
+    }
+
+    @PostMapping("/updateCarrierName")
+    @ApiOperation(value = "批量更新或者新增承运商")
+    public Map<String,Object> updateCarrierName(@RequestBody(required=false) Map<String,Object> mapValue){
+        return amsFeign.updateCarrierName(mapValue);
+    }
+
+    @PostMapping("/getAmsContractTransportPriceForDetail")
+    @ApiOperation(value = "查询汽运单价信息(计费详单专用)")
+    public Map<String, Object> getAmsContractTransportPriceForDetail(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                             Integer pageNum,
+                                                             Integer pageSize,
+                                                             Integer apiId,
+                                                             String con, String userId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAmsContractTransportPriceForDetail(mapValue, pageNum, pageSize, apiId, con,userId);
+    }
+
+    @PostMapping("/getInwardContractPrice")
+    @ApiOperation(value = "查询内转汽运单价信息")
+    public Map<String, Object> getInwardContractPrice(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                             Integer pageNum,
+                                                             Integer pageSize,
+                                                             Integer apiId,
+                                                             Integer deleted,
+                                                             String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getInwardContractPrice(mapValue, pageNum, pageSize, apiId, deleted,con);
+    }
+
+
+    /**
+     * 新增汽运单价
+     * @param mapVal
+     * @return
+     */
+    @PostMapping("addAmsContractTransportUnitPrice1")
+    @ApiOperation(value = "新增汽运单价")
+    Map<String, Object> addAmsContractTransportUnitPrice1(@RequestBody Map<String, Object> mapVal) {
+        return amsFeign.addAmsContractTransportUnitPrice1(mapVal);
+    }
+
+
+    @PostMapping("insertInwardPrice")
+    @ApiOperation(value = "新增内转运输单价")
+    Map<String, Object> insertInwardPrice(@RequestBody Map<String, Object> mapVal) {
+        return amsFeign.insertInwardPrice(mapVal);
+    }
+
+    @PostMapping("deleteAmsContractTransportPrice1")
+    @ApiOperation(value = "通过主键id删除汽运单价")
+    Map<String, Object> deleteAmsContractTransportPrice1(@RequestParam BigDecimal priceId) {
+        return amsFeign.deleteAmsContractTransportPrice1(priceId);
+    }
+
+    /**
+     * 通过主键修改汽运单价
+     */
+    @PostMapping("updateAmsContractTransportPrice1")
+    @ApiOperation(value = "通过主键id修改汽运单价")
+    Map<String, Object> updateAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapVal) {
+        return amsFeign.updateAmsContractTransportPrice1(mapVal);
+    }
+    /**
+     *通过主键渲染信息
+     */
+    @PostMapping(value = "/getAmsContractTransportPriceByPriceId1")
+    Map<String, Object> getAmsContractTransportPriceByPriceId1(@RequestParam BigDecimal priceId){
+        return amsFeign.getAmsContractTransportPriceByPriceId1(priceId);
+    }
+    /**
+     * 通过主键修改汽运单价
+     */
+    @PostMapping("batchUpdateTransportPriceByOilPrice1")
+    @ApiOperation(value = "油价联动导致运价变动，批量修改运价")
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1(@RequestBody Map<String,Object> map) {
+        return amsFeign.batchUpdateTransportPriceByOilPrice1(map);
+    }
+    @GetMapping("getLineNo")
+    @ApiOperation(value = "得到线路编号下拉")
+    public Map<String, Object> getLineNo(){
+        return amsFeign.getLineNo();
+    }
+    @GetMapping("getCapacityNumber")
+    @ApiOperation(value = "得到运力编号下拉")
+    public Map<String, Object> getCapacityNumber(){
+        return amsFeign.getCapacityNumber();
+    }
+    @GetMapping("getDeliveryAddress")
+    @ApiOperation(value = "得到收货地址下拉")
+    public Map<String, Object> getDeliveryAddress(){
+        return amsFeign.getDeliveryAddress();
+    }
+
+    @GetMapping("getCargoName")
+    @ApiOperation(value = "获取货物类型")
+    public Map<String, Object> getCargoName(){
+        return amsFeign.getCargoName();
+    }
+
+    @GetMapping("getOilTypeName")
+    @ApiOperation(value = "获取油品名称")
+    public Map<String, Object> getOilTypeName(){
+        return amsFeign.getOilTypeName();
+    }
+
+    @PostMapping("/addAmsDispatchSaleOrder")
+    Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
+        return amsFeign.addAmsDispatchSaleOrder(mapVal);
+    }
+    @GetMapping("getCarrierName")
+    @ApiOperation(value = "得到承运商名称")
+    public Map<String, Object> getCarrierName(){
+        return amsFeign.getCarrierName();
+    }
+    @PostMapping("getSaleOrderInfo")
+    @ApiOperation(value = "查询汽运单价信息")
+    public Map<String, Object> getSaleOrderInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderInfo(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @ApiOperation(value="查询已上报销售订单信息")
+    @PostMapping("/getSaleOrderReported")
+    Map<String, Object> getSaleOrderReported(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderReported(mapValue,pageNum,pageSize,apiId);
+    }
+    @PostMapping("getAmsSaleOrderApproved")
+    @ApiOperation(value = "查询财务已审批销售订单信息")
+    public Map<String, Object> getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAmsSaleOrderApproved(mapValue, pageNum, pageSize, apiId);
+    }
+    @PostMapping("getSaleOrderDetail")
+    @ApiOperation(value = "查询汽运单价信息")
+    public Map<String, Object> getSaleOrderDetail(@RequestParam BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderDetail(saleOrderId,mapValue, pageNum, pageSize, apiId);
+    }
+    @PostMapping("uploadSaleOrder")
+    Map<String, Object> uploadSaleOrder(@RequestParam BigDecimal saleOrderId) {
+        return amsFeign.uploadSaleOrder(saleOrderId);
+    }
+    @PostMapping("/addAmsSaleOrder")
+    Map<String, Object> addAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
+        return amsFeign.addAmsSaleOrder(mapVal==null?new HashMap<>():mapVal);
+    }
+    @PostMapping("getAmsSaleOrderBySaleOrderId")
+    Map<String, Object> getAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId) {
+        return amsFeign.getAmsSaleOrderBySaleOrderId(saleOrderId);
+    }
+    @PostMapping("/updateAmsSaleOrder")
+    Map<String, Object> updateAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
+        return amsFeign.updateAmsSaleOrder(mapVal);
+    }
+    @PostMapping("deleteAmsSaleOrderBySaleOrderId")
+    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@RequestBody(required = false) List<Map<String,Object>> mapValue) {
+        return amsFeign.deleteAmsSaleOrderBySaleOrderId(mapValue);
+    }
+    @PostMapping("getSaleOrderUpdateLog")
+    @ApiOperation(value = "查询汽运单价信息")
+    public Map<String, Object> getSaleOrderUpdateLog(BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderUpdateLog(saleOrderId,mapValue, pageNum, pageSize, apiId);
+    }
+    @GetMapping(value = "getSalePlanName")
+    @ApiOperation(value="获取销售计划名称")
+    public Map<String, Object> getSalePlanName(){return amsFeign.getSalePlanName();}
+    @GetMapping("getShipperName")
+    @ApiOperation(value = "得到发货单位下拉")
+    public Map<String, Object> getShipperName(){
+        return amsFeign.getShipperName();
+    }
+    @GetMapping("getConsigneeCompanyName")
+    @ApiOperation(value = "得到收货单位下拉")
+    public Map<String, Object> getConsigneeCompanyName(){
+        return amsFeign.getConsigneeCompanyName();
+    }
+    @PostMapping("addAmsSaleOrderMaterial")
+    Map<String, Object> addAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map) {
+        return amsFeign.addAmsSaleOrderMaterial(map);
+    }
+    @PostMapping("getAmsSaleOrderMaterialBySaleOrderMaterialId")
+    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@RequestParam BigDecimal saleOrderMaterialId) {
+        return amsFeign.getAmsSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
+    }
+    @ApiOperation(value="通过主键修改销售订单物资信息")
+    @PostMapping(value = "/updateAmsSaleOrderMaterial")
+    Map<String, Object> updateAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map){
+        return amsFeign.updateAmsSaleOrderMaterial(map);
+    }
+    @PostMapping("deleteAmsSaleOrderMaterialBySaleOrderMaterialId")
+    Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(BigDecimal saleOrderMaterialId) {
+        return amsFeign.deleteAmsSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
+    }
+    @PostMapping("getAddress")
+    Map<String, Object> getAddress(BigDecimal saleOrderMaterialId) {
+        return amsFeign.getAddress(saleOrderMaterialId);
+    }
+    @PostMapping("updateAddress")
+    Map<String, Object> updateAddress(@RequestBody(required = false)Map<String,Object> map) {
+        return amsFeign.updateAddress(map);
+    }
+    @PostMapping("getSalePlanInfo")
+    @ApiOperation(value = "查询汽运单价信息")
+    public Map<String, Object> getSalePlanInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSalePlanInfo(mapValue, pageNum, pageSize, apiId);
+    }
+    @PostMapping("addAmsSalePlan")
+    Map<String, Object> addAmsSalePlan(@RequestBody(required = false)Map<String,Object> map) {
+        return amsFeign.addAmsSalePlan(map);
+    }
+    @PostMapping("getAmsSalePlanByPlanId")
+    Map<String, Object> getAmsSalePlanByPlanId(@RequestParam BigDecimal planId) {
+        return amsFeign.getAmsSalePlanByPlanId(planId);
+    }
+    @PostMapping("upadteAmsSalePlanByPlanId")
+    Map<String, Object> upadteAmsSalePlanByPlanId(@RequestBody(required = false)Map<String,Object> map) {
+        return amsFeign.upadteAmsSalePlanByPlanId(map);
+    }
+    @PostMapping("deleteAmsSalePlanByPlanId")
+    Map<String, Object> deleteAmsSalePlanByPlanId(@RequestParam BigDecimal planId) {
+        return amsFeign.deleteAmsSalePlanByPlanId(planId);
+    }
+    @GetMapping("getMaterialName")
+    @ApiOperation(value = "得到收货单位下拉")
+    public Map<String, Object> getMaterialName(){
+        return amsFeign.getMaterialName();
+    }
+    @GetMapping("getAreaName")
+    @ApiOperation(value = "得到收货单位下拉")
+    public Map<String, Object> getAreaName(){
+        return amsFeign.getAreaName();
+    }
+
+
+    @PostMapping("getSalePlanMaterialInfo")
+    @ApiOperation(value="查询销售计划物资信息")
+    public Map<String, Object> getSalePlanMaterialInfo(@RequestParam BigDecimal planId,@RequestBody(required=false) Map<String,Object> mapValue,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSalePlanMaterialInfo(planId,mapValue,apiId,pageNum,pageSize);
+    }
+
+    @PostMapping(value = "addAmsSalePlanMaterial")
+    @ApiOperation(value="新增销售计划物资信息")
+    public Map<String, Object> addAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.addAmsSalePlanMaterial(map);
+    }
+
+    @PostMapping(value = "deleteAmsSalePlanMaterial")
+    @ApiOperation(value="通过主键删除销售计划物资信息")
+    Map<String, Object> deleteAmsSalePlanMaterial(@RequestParam BigDecimal planMaterialId){
+        return amsFeign.deleteAmsSalePlanMaterial(planMaterialId);
+    }
+
+    @PostMapping(value = "/getAmsSalePlanMaterialByPlanMaterialId")
+    @ApiOperation(value="通过主键查询销售计划物资信息")
+    Map<String, Object> getAmsSalePlanMaterialByPlanMaterialId(@RequestParam BigDecimal planMaterialId){
+        return amsFeign.getAmsSalePlanMaterialByPlanMaterialId(planMaterialId);
+    }
+
+    @PostMapping(value = "/upadteAmsSalePlanMaterial")
+    @ApiOperation(value="通过主键修改销售计划物资信息")
+    Map<String, Object> upadteAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.upadteAmsSalePlanMaterial(map);
+    }
+
+    @PostMapping("/getTruckNoDetail")
+    @ApiOperation(value="查询销售订单车序号详细信息")
+    Map<String, Object> getTruckNoDetail(@RequestParam BigDecimal saleOrderMaterialId,@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckNoDetail(saleOrderMaterialId,mapValue,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="新增车序号物资信息")
+    @PostMapping(value = "/addAmsSaleTrucknoMaterial")
+    Map<String, Object> addAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.addAmsSaleTrucknoMaterial(map);
+    }
+
+    @ApiOperation(value="通过主键删除车序号物资信息")
+    @PostMapping(value = "/deleteAmsSaleTrucknoMaterial")
+    Map<String, Object> deleteAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId){
+        return amsFeign.deleteAmsSaleTrucknoMaterial(trucknoMaterialId);
+    }
+
+    @ApiOperation(value="通过主键渲染车序号物资信息")
+    @PostMapping(value = "/getAmsSaleTrucknoMaterial")
+    Map<String, Object> getAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId){
+        return amsFeign.getAmsSaleTrucknoMaterial(trucknoMaterialId);
+    }
+
+    @ApiOperation(value="通过主键修改车序号物资信息")
+    @PostMapping(value = "/updateAmsSaleTrucknoMaterial")
+    Map<String, Object> updateAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.updateAmsSaleTrucknoMaterial(map);
+    }
+    //************************************内转物流***************************************************
+    @PostMapping("getAmsContractTransportPriceForConverted")
+    @ApiOperation(value = "内转物流查询汽运单价信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(205)", value = "表头", required = false, dataType = "Interger")
+    })
+   public Map<String,Object> getAmsContractTransportPriceForConverted(@PathVariable("lineId")BigDecimal lineId,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize) {
+        return amsFeign.getAmsContractTransportPriceForConverted(lineId, pageNum, pageSize, apiId);
+    }
+    /**
+     * 下拉框显示线路
+     */
+    @ApiOperation(value="获取线路")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/getLineRoute")
+    public Map<String,Object> getLineRoute(){
+        return amsFeign.getLineRoute();
+    }
+
+    //销售订单-固定派单-公开派单-日计划
+
+    @ApiModelProperty(value = "展示销售公司已审核的订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "105", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleOrderListBySaleCompany")
+    public Map<String,Object> getSaleOrderListBySaleCompany(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String con){
+      return   amsFeign.getSaleOrderListBySaleCompany(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+
+
+
+    //展示销售公司已审核销售订单的车序号列表
+    @PostMapping("/getSaleOrderList")
+    @ApiOperation(value = "查询汽运单价信息")
+    public Map<String,Object> amsSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId,
+                                           Integer status    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.amsSaleOrderList(mapValue, pageNum, pageSize, apiId,status);
+    }
+
+    //固定派单：通过车序号查询收货地址，截取收货地址的区域，去资源管理中查询对应的承运商,将车序号与承运商绑定
+    @PostMapping("/addFixedAmsDispatchSaleOrder")
+    Map<String,Object> addFixedAmsDispatchSaleOrder(@RequestBody(required = false) List<Map<String,Object>> mapValue) {
+        return amsFeign.addFixedAmsDispatchSaleOrder(mapValue);
+    }
+
+    //公开派单
+    //查询未分派车辆的销售订单的车序号
+    @PostMapping("/getAmsSaleOrderMaterial")
+    @ApiOperation(value = "展示车序号列表")
+    public Map<String,Object> getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      Integer status) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAmsSaleOrderMaterial(mapValue, pageNum, pageSize, apiId,status);
+    }
+
+    //新增公开派单
+    @PostMapping("/addOpenAmsDispatchSaleOrder/{orderMaterialId}")
+    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("orderMaterialId") BigDecimal orderMaterialId) {
+        return amsFeign.addOpenAmsDispatchSaleOrder(orderMaterialId);
+    }
+
+    //删除公开派单
+    @PostMapping("/deleteAmsDispatchSaleOrder/{dispatchId}")
+    Map<String,Object> deleteAmsDispatchSaleOrder(@PathVariable("dispatchId") BigDecimal saleOrderId) {
+        return amsFeign.deleteAmsDispatchSaleOrder(saleOrderId);
+    }
+
+    //展示公开派单
+    @PostMapping("/getOpenDispatchSaleOrder")
+    @ApiOperation(value = "公开派单")
+    public Map<String,Object> getOpenDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getOpenDispatchSaleOrder(mapValue, pageNum, pageSize, apiId);
+    }
+
+    //修改公开派单
+    @PostMapping("/updateOpenDispatchSaleOrder")
+    Map<String,Object> updateOpenDispatchSaleOrder(@RequestBody  Map<String, Object> mapVal) {
+        return amsFeign.updateOpenDispatchSaleOrder(mapVal);
+    }
+
+
+    //焦炭、水渣日计划
+    //新增
+    @PostMapping("/addTruckRailDayPlan")
+    public Map<String,Object> addTruckRailDayPlan(@RequestBody  Map<String, Object> mapVal) {
+        return amsFeign.addTruckRailDayPlan(mapVal);
+    }
+    //删除
+    @PostMapping("/deleteTruckRailDayPlan/{dayPlanId}")
+    public Map<String,Object> deleteTruckRailDayPlan(@PathVariable("dayPlanId") BigDecimal dayPlanId) {
+        return amsFeign.deleteTruckRailDayPlan(dayPlanId);
+    }
+    //修改
+    @PostMapping("/updateTruckRailDayPlan")
+    public Map<String,Object> updateTruckRailDayPlan(@RequestBody  Map<String, Object> mapVal) {
+        return amsFeign.updateTruckRailDayPlan(mapVal);
+    }
+    @PostMapping("getDayPlanByDayPlanId/{dayplanId}")
+    Map<String,Object> getDayPlanByDayPlanId(@PathVariable("dayplanId") Integer dayplanId){
+        return amsFeign.getDayPlanByDayPlanId(dayplanId);
+    }
+
+    /**
+     * 修改日期计划 2021年11月20日03:18:05
+     * @param map
+     * @return
+     */
+    @PostMapping("/updateDayPlan")
+    public Map<String,Object> updateDayPlan(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.updateDayPlan(map);
+    }
+
+    /**
+     * 查询所有的承运商
+     * @return
+     */
+    @GetMapping("/getCarrierMes")
+    public  Map<String,Object> getCarrierMes() {
+        return amsFeign.getCarrierMes();
+    }
+
+    //展示日计划
+    @PostMapping("/getTruckRailDayPlanList")
+    @ApiOperation(value = "焦炭日计划")
+    public Map<String, Object> getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                                   Integer status) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckRailDayPlan(mapValue, pageNum, pageSize, apiId, status);
+    }
+    //展示日计划
+    @PostMapping("/getSzTruckRailDayPlanList")
+    @ApiOperation(value = "水渣日计划")
+    public Map<String, Object> getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               Integer status) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSzTruckRailDayPlan(mapValue, pageNum, pageSize, apiId, status);
+    }
+
+    //新增钢材发往异地库计划
+    @PostMapping("/addRailOffsetDayplan")
+    public Map<String,Object> addRailOffsetDayplan(@RequestBody  Map<String, Object> mapVal){
+        return amsFeign.addRailOffsetDayplan(mapVal);
+    }
+    //删除钢材发往异地库计划
+    @PostMapping("/deleteRailOffsetDayplan/{dayplanId}")
+    public Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayplanId") Integer dayplanId) {
+        return amsFeign.deleteRailOffsetDayplan(dayplanId);
+    }
+    //修改钢材发往异地库计划
+    @PostMapping("/updateRailOffsetDayplan")
+    public Map<String,Object> updateRailOffsetDayplan(@RequestBody  Map<String, Object> mapVal){
+        return amsFeign.updateRailOffsetDayplan(mapVal);
+    }
+
+    //钢材发运到异地库查询物资
+    @PostMapping("/getMaterialMesByDayPlanId")
+    public Map<String,Object> getMaterialMesByDayPlanId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        Integer apiId,
+                                                        Integer dayplanId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getMaterialMesByDayPlanId(mapValue,pageNum,pageSize,apiId,dayplanId);
+    }
+
+    //展示钢材发往异地库计划
+    @PostMapping("/getRailOffsetDayplan")
+    @ApiOperation(value = "展示钢材发往异地库计划")
+    public Map<String, Object> getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId,
+                                              Integer dayplanReceiveStatus,
+                                              Integer carrierId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getRailOffsetDayplan(mapValue, pageNum, pageSize, apiId,dayplanReceiveStatus,carrierId);
+    }
+
+    @PostMapping("/getRailOffsetDayplanId")
+    @ApiOperation(value = "根据ID展示钢材发往异地库计划")
+    public Map<String, Object> getRailOffsetDayplanId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer apiId,
+                                                    Integer dayPlanId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getRailOffsetDayplanId(mapValue, pageNum, pageSize, apiId,dayPlanId);
+    }
+
+    @ApiModelProperty(value = "下发钢材发往异地库计划")
+    @PostMapping("/issueRailOffsetDayplan")
+    public Map<String,Object> issueRailOffsetDayplan(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.issueRailOffsetDayplan(mapList);
+    }
+
+    ////************************************内转物流***************************************************
+    /**
+     *新增运输计划
+     */
+    @PostMapping("/addTruckPlan")
+    public Map<String,Object> addTruckPlan(@RequestBody  Map<String, Object> mapVal) {
+        return amsFeign.addTruckPlan(mapVal);
+    }
+    //新增采购内转需求
+    @PostMapping("/addPurInwardRequirement")
+    public Map<String,Object>addPurInwardRequirement(@RequestBody Map<String,Object>mapval){
+        return amsFeign.addPurInwardRequirement(mapval);
+    }
+    //删除
+    @PostMapping("/deleteTruckPlan/{planId}")
+    public Map<String,Object> deleteTruckPlan(@PathVariable("planId") Integer planId) {
+        return amsFeign.deleteTruckPlan(new BigDecimal(planId));
+    }
+
+    //接收
+    @PostMapping("/receiveInwardPlan/{planId}")
+    public Map<String,Object> receiveInwardPlan(@PathVariable("planId") Integer planId) {
+        return amsFeign.receiveInwardPlan(new BigDecimal(planId));
+    }
+
+    /**
+     * 修改渲染
+     * @param planId
+     * @return
+     */
+    @PostMapping("/selectInwardPlanToUpdate/{planId}")
+    public Map<String,Object> selectInwardPlanToUpdate(@PathVariable("planId") Integer planId) {
+        return amsFeign.selectInwardPlanToUpdate(new BigDecimal(planId));
+    }
+
+    /**
+     * 下发
+     * @param mapList
+     * @return
+     */
+    @PostMapping("/downTruckPlan")
+    public Map<String,Object> downTruckPlan(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.downTruckPlan(mapList);
+    }
+    /**
+     * 修改运输计划/下发运输计划/承运商接收运输计划
+     */
+    @PostMapping("/updateTruckPlan")
+    public Map<String,Object> updateTruckPlan(@RequestBody  Map<String, Object> mapVal){
+        return amsFeign.updateTruckPlan(mapVal);
+    }
+    /**
+     * 展示运输计划
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示运输计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "0:257/1,2:258", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getTruckPlanList")
+    public Map<String, Object> getTruckPlanList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                Integer planStatus,
+                                                String carrierId,
+                                                Integer planId,
+                                                String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId,con);
+    }
+
+    @ApiModelProperty(value = "展示运输计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "0:257/1,2:258", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getPlanOrder")
+    public Map<String, Object> getPlanOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            Integer planId,
+                                            Integer requirementId,
+                                            Integer orderStatus) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getPlanOrder(mapValue, pageNum, pageSize, apiId,planId,requirementId,orderStatus);
+    }
+    /**
+     *用车单位提出需求
+     *新增用车需求
+     */
+    @PostMapping("/addTruckRequirement")
+    public Map<String,Object> addTruckRequirement(@RequestBody  Map<String, Object> mapVal) {
+        return amsFeign.addTruckRequirement(mapVal);
+    }
+    //删除用车需求
+    @PostMapping("/deleteTruckRequirement/{requirementId}")
+    public Map<String,Object> deleteTruckReqgetTruckRequirementListuirement(@PathVariable("requirementId") BigDecimal requirementId) {
+        return amsFeign.deleteTruckRequirement(requirementId);
+    }
+    //下发用车需求
+    @PostMapping("/downRequirement")
+    public Map<String,Object> downRequirement(@RequestBody List<Map<String,Object>> requirementIds) {
+        return amsFeign.downRequirement(requirementIds);
+    }
+
+    //接收用车需求
+    @PostMapping("/receiveRequirement/{requirementId}")
+    public Map<String,Object> receiveRequirement(@PathVariable("requirementId") Integer requirementId) {
+        return amsFeign.receiveRequirement(requirementId);
+    }
+    /**
+     * 修改用车需求
+     */
+    @PostMapping("/updateTruckRequirement")
+    public Map<String,Object> updateTruckRequirement(@RequestBody  Map<String, Object> mapVal){
+        return amsFeign.updateTruckRequirement(mapVal);
+    }
+    /**
+     * 查询修改渲染
+     */
+    @PostMapping("/selectRequirement/{requirementId}")
+    public Map<String,Object> selectRequirement(@PathVariable("requirementId") Integer requirementId) {
+        return amsFeign.selectRequirement(requirementId);
+    }
+
+    /*
+    查询需求物资详情
+     */
+    @PostMapping("/getRequirementMaterial/{requirementId}")
+    public Map<String,Object> getRequirementMaterial(@PathVariable("requirementId") Integer requirementId) {
+        return amsFeign.getRequirementMaterial(requirementId);
+    }
+    /**
+     * 展示用车需求
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示用车需求")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "207", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getTruckRequirementList")
+    public Map<String, Object> getTruckRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId,
+                                          Integer requirementStatus,
+                                          String orgCode, String index,String startTime,String endTime) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode,index,startTime,endTime);
+    }
+
+    @ApiModelProperty(value = "展示钢坯用车需求")
+    @PostMapping("/getBilletRequirementList")
+    public Map<String, Object> getBilletRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String orgCode, String index,String startTime,String endTime) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getBilletRequirementList(mapValue, pageNum, pageSize, apiId,orgCode,index,startTime,endTime);
+    }
+
+
+    @PostMapping("/getPurRequirementList")
+    public Map<String, Object> getPurRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       Integer requirementStatus,
+                                                       String con,
+                                                       String userId,
+                                                       String carrierSsoId,
+                                                       String enableStatus,
+                                                       String planStatus,
+                                                     String startTime,
+                                                     String endTime,
+                                                     BigDecimal planId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus,startTime,endTime,planId);
+    }
+    @ApiOperation(value="查询app端公开抢单")
+    @PostMapping("/getDispatchSaleOrderList")
+    public Map<String, Object> getDispatchSaleOrderList() {
+        return amsFeign.getDispatchSaleOrderList();
+    }
+
+    @ApiOperation(value="抢单/接收订单锁定")
+    @PostMapping("/lockDispatchSaleOrder")
+    public Map<String, Object> lockDispatchSaleOrder(Integer dispatchId,String carrierSsoId) {
+        return amsFeign.lockDispatchSaleOrder(dispatchId, carrierSsoId);
+    }
+
+    @ApiOperation(value="查询app端承运商已抢到的单")
+    @PostMapping("/getLockDispatchSaleOrderList")
+    public Map<String, Object> getLockDispatchSaleOrderList(Integer carrierId) {
+        return amsFeign.getLockDispatchSaleOrderList(carrierId);
+    }
+
+    @ApiOperation(value="查询PC端承运商已抢到的单")
+    @PostMapping("/selectDispatchSaleOrderList")
+    public Map<String, Object> selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                           Integer apiId,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           String carrierSsoId){
+        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierSsoId);
+    }
+
+    //获取到站名称
+    @GetMapping("/getArriveName")
+    public Map<String,Object> getArriveName() {
+        return amsFeign.getArriveName();
+    }
+
+//    @ApiModelProperty(value = "查询所有的钢材物资")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
+//    })
+//    @PostMapping("/getAllSteelMaterialMes")
+//    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+//                                                Integer pageNum,
+//                                                Integer pageSize,
+//                                                Integer apiId,
+//                                                String con) {
+//        return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+//    }
+
+    @ApiModelProperty(value = "查询PC端公开抢单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "242", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getPCDispatchSaleOrderList")
+    public Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      Integer dispatchType,
+                                                      @RequestParam String carrierSsoId) {
+        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType,carrierSsoId);
+    }
+
+    @ApiModelProperty(value = "展示批次信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "252", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getPurchaseIdByBatch")
+    public Map<String, Object> getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          Integer apiId) {
+        return amsFeign.getPurchaseIdByBatch(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+    }
+
+    @ApiModelProperty(value = "仓库模代框")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "251", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getWareHouse")
+    public Map<String, Object> getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer apiId,
+                                                    String con) {
+        return amsFeign.getWareHouse(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @ApiModelProperty(value = "车型下拉")
+    @GetMapping("/getCapacityType")
+    public Map<String,Object> getCapacityType() {
+         return amsFeign.getCapacityType();
+    }
+
+    @ApiModelProperty(value = "用车单位下拉")
+    @GetMapping("/getShipperUser")
+    public Map<String,Object> getShipperUser() {
+        return amsFeign.getShipperUser();
+    }
+
+    @ApiModelProperty(value = "承运商下拉")
+    @GetMapping("/getCarrierList")
+    public Map<String,Object> getCarrierList() {
+        return amsFeign.getCarrierList();
+    }
+
+    @ApiModelProperty(value = "到站下拉")
+    @GetMapping("/getdayPlanToTheStationId")
+    public Map<String,Object> getdayPlanToTheStationId() {
+        return amsFeign.getdayPlanToTheStationId();
+    }
+
+    @ApiModelProperty(value = "异地库下拉")
+    @GetMapping("/getOffsetWarehouse")
+    public Map<String,Object> getOffsetWarehouse() {
+        return amsFeign.getOffsetWarehouse();
+    }
+
+    @PostMapping("/finishTruckPlan/{planId}")
+    public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId){
+        return amsFeign.finishTruckPlan(planId);
+    }
+
+
+    //零星订单=======================================================================================================================================================
+
+    @ApiModelProperty(value = "查询零星物资订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "384", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getSporadicOrdersList")
+    public RESTfulResult getSporadicOrdersList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               Integer issueStatus,
+                                               String con,
+                                               Integer dispatchStatus,
+                                               Integer sporadicStatus,
+                                               String carrierSsoId,
+                                               String userId,
+                                               String userIds,
+                                               String startTime,
+                                               String endTime) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId,userId,userIds,startTime,endTime);
+    }
+
+    @ApiModelProperty(value = "查看物资详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "385", required = false, dataType = "Integer")
+    })
+    @PostMapping("/seeAllMaterials")
+    public RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer sporadicOrderId,
+                                                     String con){
+        return amsFeign.seeAllMaterials(mapValue,apiId,pageNum,pageSize,sporadicOrderId,con);
+    }
+
+    @ApiOperation(value="逻辑删除零星物资订单")
+    @PostMapping("/deleteSporadicOrders")
+    public Map<String, Object> deleteSporadicOrders(@RequestParam Integer sporadicOrderId) {
+        return amsFeign.deleteSporadicOrders(sporadicOrderId);
+    }
+
+
+
+
+    @ApiOperation(value="下发零星物资订单")
+    @PostMapping("/issueSporadicOrders")
+    public Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList) {
+        return amsFeign.issueSporadicOrders(mapList);
+    }
+
+    @ApiOperation(value="停止零星订单一车多趟")
+    @PostMapping("/closeSporadicOrder")
+    public Map<String, Object> closeSporadicOrder(@RequestBody Map<String, Object> map) {
+        return amsFeign.closeSporadicOrder(map);
+    }
+
+
+    @ApiOperation(value="内转零星物流添加运输计划")
+    @PostMapping("/addInwardSporadicOrder")
+    public Map<String, Object> addInwardSporadicOrder(@RequestBody Map<String, Object> map) {
+        return amsFeign.addInwardSporadicOrder(map);
+    }
+
+    @ApiOperation(value="新增零星物资进出厂（以及销售钢材退货）")
+    @PostMapping("/addSporadicOrders")
+    public Map<String, Object> addSporadicOrders(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.addSporadicOrders(mapValue);
+    }
+
+
+    @ApiOperation(value="零星一车多趟新增订单")
+    @PostMapping("/addSporadicOrderTimes")
+    public Map<String, Object> addSporadicOrderTimes(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.addSporadicOrderTimes(mapValue);
+    }
+
+    @ApiOperation(value="查询修改渲染")
+    @PostMapping("/selectSporadicOrder")
+    public RESTfulResult selectSporadicOrder(@RequestParam Integer sporadicOrderId) {
+        return amsFeign.selectSporadicOrder(sporadicOrderId);
+    }
+
+    @ApiOperation(value="修改零星物资订单")
+    @PostMapping("/updateSporadicOrder")
+    public Map<String,Object> updateSporadicOrder(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.updateSporadicOrder(mapValue);
+    }
+
+
+    @ApiModelProperty(value = "查询车序号信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "411", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getTruckNoList")
+    public RESTfulResult getTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                         Integer issueStatus){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckNoList(mapValue,apiId,pageNum,pageSize,issueStatus);
+    }
+
+    @PostMapping("getSaleOrderInfoes")
+    @ApiOperation(value = "查询销售订单未上报信息")
+    public Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String consigneeSsoId,
+                                                  @RequestParam(required = false) String con,
+                                                  String startTime,
+                                                  String endTime,
+                                                  String saler) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con,startTime,endTime,saler);
+    }
+
+    @ApiOperation(value="查询已上报销售订单信息")
+    @PostMapping("/getSaleOrderReportedes")
+    Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam(required = false) String consigneeSsoId,
+                                               @RequestParam(required = false) String con,
+                                               String startTime,
+                                               String endTime,
+                                               String saler){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con,startTime,endTime,saler);
+    }
+
+    @ApiModelProperty(value = "展示销售公司已审核的订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "409", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleOrderListBySaleCompanyes")
+    public Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                              Integer pageNum,
+                                                              Integer pageSize,
+                                                              Integer apiId,
+                                                              String con,
+                                                              Integer shipperId,
+                                                              Integer saleType,
+                                                              String consigneeSsoId,
+                                                              String startTime,
+                                                              String endTime,
+                                                              String saler
+    ){
+        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId,startTime,endTime,saler);
+    }
+
+    @PostMapping("getAmsSaleOrderApprovedes")
+    @ApiOperation(value = "查询财务已审批销售订单信息")
+    public Map<String, Object> getAmsSaleOrderApprovedes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAmsSaleOrderApprovedes(mapValue, pageNum, pageSize, apiId,con);
+    }
+
+    /*
+     *  根据销售订单主键展示销售基本信息、物资信息
+     * apiId=410
+     * */
+    @PostMapping(value="/getSaleOrderAndMaterialById")
+    public RESTfulResult  getSaleOrderAndMaterialById(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer saleOrderId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderAndMaterialById(mapValue,apiId,pageNum,pageSize,new BigDecimal(saleOrderId));
+    }
+
+    @ApiOperation(value = "新增车序号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "车序号信息", required = false, dataType = ""),
+    })
+    @PostMapping("/addTruckNo")
+    public Map<String, Object> addTruckNo(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.addTruckNo(mapList);
+    }
+
+    @ApiOperation(value = "下发车序号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "车序号信息", required = false, dataType = ""),
+    })
+    @PostMapping("/issueTruckNo")
+    public Map<String, Object> issueTruckNo(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.issueTruckNo(mapList);
+    }
+
+    @ApiOperation(value = "展示车序号下的物资详情")
+    @PostMapping("/getTruckNoMaterialList")
+    public RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId) {
+        return amsFeign.getTruckNoMaterialList(saleOrderMaterialId);
+    }
+
+    @ApiOperation(value = "展示销售订单下的物资详情")
+    @PostMapping("/getSaleMaterialList")
+    public RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId) {
+        return amsFeign.getSaleMaterialList(saleOrderId);
+    }
+
+    @ApiOperation(value = "展示销售派单物资信息")
+    @PostMapping("/getDispatchMaterialList")
+    public RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId) {
+        return amsFeign.getDispatchMaterialList(dispatchId);
+    }
+
+    @ApiOperation(value="销售新增定向派单且直接下发")
+    @PostMapping("/addDispatchSaleOrder")
+    public Map<String,Object> addDispatchSaleOrder(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.addDispatchSaleOrder(mapValue);
+    }
+
+   //发布通知================================================================================================================================
+    //公告展示
+
+
+    @ApiOperation(value = "销售公司获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(414)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getMarketingNoticeList")
+    public Map<String, Object> getMarketingNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getMarketingNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+
+
+    @ApiOperation(value = "承运商获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(414)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getCarrierNoticeList")
+    public Map<String, Object> getCarrierNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getCarrierNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+
+
+
+    @ApiOperation(value = "收货用户获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(414)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getClientNoticeList")
+    public Map<String, Object> getClientNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getClientNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="销售公司直接选择车牌号派发运输订单")
+    @PostMapping("/dispatchTruckOrderBySale")
+    public Map<String,Object> dispatchTruckOrderBySale(@RequestBody Map<String,Object> mapValue){
+        return amsFeign.dispatchTruckOrderBySale(mapValue);
+    }
+
+    @ApiOperation(value="销售公司直接选择车牌号派发内转钢材运输订单")
+    @PostMapping("/dispatchInwardTruckOrderBySale")
+    public Map<String,Object> dispatchInwardTruckOrderBySale(@RequestBody Map<String,Object> mapValue){
+        return amsFeign.dispatchInwardTruckOrderBySale(mapValue);
+    }
+
+
+    @ApiOperation(value="展示销售焦炭订单")
+    @PostMapping("/getCokeSaleOrderList")
+    public RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         String con) {
+        return amsFeign.getCokeSaleOrderList(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @ApiOperation(value="承运商直接选择车牌号派发运输订单")
+    @PostMapping("/dispatchTruckOrderByCarrier")
+    public Map<String,Object> dispatchTruckOrderByCarrier(@RequestBody Map<String,Object> mapValue){
+        return amsFeign.dispatchTruckOrderByCarrier(mapValue);
+    }
+
+    @ApiOperation(value="关闭销售订单")
+    @PostMapping("closeSaleOrder")
+    public Map<String,Object> closeSaleOrder(@RequestParam Integer saleOrderId){
+        return amsFeign.closeSaleOrder(saleOrderId);
+    }
+
+
+    @ApiOperation(value="新增公告信息", notes="根据DilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
+    @PostMapping(value = "/insertNotice")
+    public Map<String, Object> insertNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.insertNotice(map);
+    }
+
+    @ApiOperation(value="发布公告信息", notes="根据DilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
+    @PostMapping(value = "/releaseNotice")
+    public Map<String, Object> releaseNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.releaseNotice(map);
+    }
+
+    @ApiOperation(value = "更新油价信息", notes = "根据dilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
+    @PostMapping(value = "/updateNotice", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.updateNotice(map);
+    }
+
+
+    @PostMapping(value = "/updateNoticeStatus", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateNoticeStatus(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.updateNoticeStatus(map);
+    }
+
+    @PostMapping(value = "/getNoticeUser", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> getNoticeUser(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @RequestParam("apiId") Integer apiId) {
+        return amsFeign.getNoticeUser(map,pageNum,pageSize,apiId);
+    }
+
+    @PostMapping(value = "/getNoticeAll", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> getNoticeAll(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.getNoticeAll(map);
+    }
+
+    @PostMapping(value = "/readAll", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> readAll(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.readAll(map);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/deleteNotice/{id}")//BigDecimal
+    public Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id) {
+        return amsFeign.deleteNotice(id);
+    }
+
+    @ApiOperation(value="获取名字", notes="根据url的id来获取对象名字")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @PostMapping(value = "/queryName/{userId}")//BigDecimal
+    public Map<String, Object> queryName(@PathVariable("userId") String userId) {
+        return amsFeign.queryName(userId);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getNoticeById/{id}")
+    public Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id){
+        return amsFeign.getNoticeById(id);
+    }
+
+    @ApiOperation(value="获取最新公告详细信息", notes="根据url的permissions来获取详细信息")
+    @ApiImplicitParam(paramType = "name", name = "权限permission", value = "permission", required = true, dataType = "String")
+    @PostMapping(value = "/getNewNoticeByPermission/{permissions}")
+    public Map<String, Object> getNewNoticeByPermission(@PathVariable("permissions") String permissions){
+        return amsFeign.getNewNoticeByPermission(permissions);
+    }
+
+
+
+    //*******************************下拉框************************
+
+
+    @GetMapping("getNoticeTypeId")
+    @ApiOperation(value = "得到公告类型Id")
+    public Map<String,Object> getNoticeTypeId(){
+        return amsFeign.getNoticeTypeId();
+    }
+
+    @ApiOperation(value="抢单/接收订单锁定")
+    @PostMapping("/lockDispatchSaleOrderList")
+    public Map<String, Object> lockDispatchSaleOrderList(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.lockDispatchSaleOrderList(mapValue);
+    }
+
+    @ApiModelProperty(value = "销售订单批量授权给承运商")
+    @PostMapping("/saleOrderEmpowerCarrier")
+    public RESTfulResult saleOrderEmpowerCarrier(@RequestBody(required = false) Map<String,Object> mapValue){
+        return amsFeign.saleOrderEmpowerCarrier(mapValue);
+    }
+
+    @ApiModelProperty(value = "展示销售公司下发给承运商的销售订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "409", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleOrderListByCarrierSsoId")
+    public RESTfulResult getSaleOrderListByCarrierSsoId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                        String carrierSsoId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+
+                                                        Integer apiId,
+                                                        String con) {
+        return amsFeign.getSaleOrderListByCarrierSsoId(mapValue != null ? mapValue : new HashMap<>(), carrierSsoId, pageNum, pageSize, apiId, con);
+    }
+    @ApiOperation(value="边输边查具体地址")
+    @PostMapping("/getRealAddressByLike")
+    public Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index){
+        return amsFeign.getRealAddressByLike(addressId,index);
+    }
+
+    @ApiOperation(value="得到单价和单价id")
+    @PostMapping("/getPriceMap")
+    public Map<String, Object> getPriceMap(@RequestBody Map<String,Object> map){
+        return amsFeign.getPriceMap(map);
+    }
+
+    @ApiOperation(value="得到单价和单价id")
+    @PostMapping("/getBenPrice")
+    public Map<String, Object> getBenPrice(@RequestBody Map<String,Object> map){
+        return amsFeign.getBenPrice(map);
+    }
+
+    @ApiOperation(value="批量拒绝定向派单")
+    @PostMapping(value = "/refuseDispatchSaleOrderList")
+    public Map<String, Object> refuseDispatchSaleOrderList(@RequestBody List<Map<String, Object>> mapList) {
+        return amsFeign.refuseDispatchSaleOrderList(mapList);
+    }
+
+    @ApiModelProperty(value = "新增钢材销售订单")
+    @PostMapping("/addSteelSaleOrder")
+    public Map<String, Object> addSteelSaleOrder(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.addSteelSaleOrder(mapValue);
+    }
+
+    @ApiModelProperty(value = "查询销售订单下的物资")
+    @PostMapping("/getTruckNoAndMaterialList")
+    public RESTfulResult getTruckNoAndMaterialList(@RequestParam Integer saleOrderId) {
+        return amsFeign.getTruckNoAndMaterialList(saleOrderId);
+    }
+
+    @ApiModelProperty(value = "销售钢材派车")
+    @PostMapping("/dispatchSteelOrder")
+    public Map<String, Object> dispatchSteelOrder(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.dispatchSteelOrder(mapList);
+    }
+
+    @ApiModelProperty(value = "根据详细地址匹配承运商")
+    @GetMapping("/getCarrierByPlace")
+    public RESTfulResult getCarrierByPlace(@RequestParam Integer placeId) {
+        return amsFeign.getCarrierByPlace(placeId);
+    }
+
+    @ApiModelProperty(value = "将车序号下发给承运商")
+    @PostMapping("/dispatchToCarrier")
+    public RESTfulResult dispatchToCarrier(@RequestBody(required = false) List<Map<String,Object>> mapList) {
+        return amsFeign.dispatchToCarrier(mapList);
+    }
+
+    @ApiModelProperty(value = "将车序号下发给承运商")
+    @PostMapping("/getSaleOrderListToCarrier")
+    public RESTfulResult getSaleOrderListToCarrier(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam String carrierSsoId,
+                                                   @RequestParam(required = false) String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderListToCarrier(mapValue,pageNum,pageSize,apiId,carrierSsoId,con);
+    }
+
+    @ApiModelProperty(value = "展示未匹配承运商的车序号")
+    @PostMapping("/getSteelTruckNoList")
+    public RESTfulResult getSteelTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam(required = false) String con,
+                                             @RequestParam(required = false) String startTime,
+                                             @RequestParam(required = false)String endTime) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSteelTruckNoList(mapValue,apiId,pageNum,pageSize,con,startTime,endTime);
+    }
+
+    @ApiModelProperty(value = "展示未匹配承运商的车序号详情")
+    @PostMapping("/getTruckNoMaterial")
+    public RESTfulResult getTruckNoMaterial(@RequestParam Integer saleOrderMaterialId) {
+        return amsFeign.getTruckNoMaterial(saleOrderMaterialId);
+    }
+
+    @ApiModelProperty(value = "展示已分配承运商但未派车的车序号")
+    @PostMapping("/getNoCarTruckNoList")
+    public RESTfulResult getNoCarTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam(required = false) String con,
+                                             @RequestParam(required = false) String startTime,
+                                             @RequestParam(required = false)String endTime) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getNoCarTruckNoList(mapValue,apiId,pageNum,pageSize,con,startTime,endTime);
+    }
+
+    @ApiModelProperty(value = "展示已派车的车序号")
+    @PostMapping("/getHaveCarTruckNoList")
+    public RESTfulResult getHaveCarTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam(required = false) String con,
+                                             @RequestParam(required = false) String startTime,
+                                             @RequestParam(required = false) String endTime  ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getHaveCarTruckNoList(mapValue, apiId, pageNum, pageSize, con,startTime,endTime);
+    }
+
+    @ApiOperation(value="获取零星订单的物资详情")
+    @PostMapping(value = "/getSporadic")
+    public Map<String, Object> getSporadic(Integer sporadicId) {
+        return amsFeign.getSporadic(sporadicId);
+    }
+
+    @ApiOperation(value = "查零星订单物资详情")
+    @PostMapping("/getSporadicOfOrder")
+    public Map<String, Object> getSporadicOfOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer sporadicId
+    ) {
+        return amsFeign.getSporadicOfOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,sporadicId);
+    }
+
+
+    @ApiOperation(value = "批量关闭分录")
+    @PostMapping("/closingEntries")
+    public Map<String, Object> closingEntries(@RequestBody List<Map<String, Object>> mapList){
+        return amsFeign.closingEntries(mapList);
+    }
+
+    @ApiOperation(value = "查询内转物流运输单价")
+    @PostMapping("/getInwardPriceBy")
+    public Map<String,Object>getInwardPriceBy(@RequestBody(required = false)Map<String,Object>mapvalue){
+        return amsFeign.getInwardPriceBy(mapvalue);
+    }
+
+    @ApiOperation(value = "删除销售订单")
+    @PostMapping("/deleteSaleOrderById")
+    public Map<String,Object> deleteSaleOrderById(@RequestParam Integer saleOrderId){
+        return amsFeign.deleteSaleOrderById(saleOrderId);
+    }
+
+    @ApiModelProperty(value = "查询出销售订单下的所有数据")
+    @PostMapping("/getAllSaleMessages")
+    public RESTfulResult getAllSaleMessages(@RequestParam Integer saleOrderId) {
+        return amsFeign.getAllSaleMessages(saleOrderId);
+    }
+
+    @ApiModelProperty(value = "修改承运商授权")
+    @PostMapping("/updateTruckNoCarrier")
+    public Map<String,Object> updateTruckNoCarrier(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.updateTruckNoCarrier(mapValue);
+    }
+
+    @ApiModelProperty(value = "批量上传销售订单")
+    @PostMapping("/uploadSaleOrderList")
+    public Map<String,Object> uploadSaleOrderList(@RequestBody List<Map<String,Object>> saleOrderIdList) {
+        return amsFeign.uploadSaleOrderList(saleOrderIdList);
+    }
+
+    @ApiModelProperty(value = "自动匹配出最近的一个地址")
+    @PostMapping("/matchingAddressRecently")
+    public RESTfulResult matchingAddressRecently(@RequestParam Integer receiveId) {
+        return amsFeign.matchingAddressRecently(new BigDecimal(receiveId));
+    }
+
+    @ApiModelProperty(value = "自动匹配上一条运单的司机电话")
+    @PostMapping("/matchingDriverTelRecently")
+    public RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber) {
+        return amsFeign.matchingDriverTelRecently(capacityNumber);
+    }
+
+    @ApiOperation(value = "展示副产品销售订单列表(apiId=481)")
+    @PostMapping("/getFuSaleOrderList")
+    public Map<String, Object> getFuSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String con,
+                                                  Integer deleted,
+                                                  @RequestParam(required = false) String startTime,
+                                                  @RequestParam(required = false)String endTime
+    ) {
+        return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,new BigDecimal(deleted),startTime,endTime);
+    }
+
+    @ApiOperation(value = "修改销售订单中的物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "修改销售订单中的物资", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/updateAllMaterialInSale")
+    public Map<String,Object> updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.updateAllMaterialInSale(mapValue);
+    }
+
+    @ApiOperation(value = "同步关闭金蝶订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "同步关闭金蝶订单", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/deleteSaleOrderSame")
+    public Map<String,Object> deleteSaleOrderSame(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.deleteSaleOrderSame(mapValue);
+    }
+
+    @ApiOperation(value = "修改收货地址")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "修改收货地址", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/updateCarAddress")
+    public Map<String,Object> updateCarAddress(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.updateCarAddress(mapValue);
+    }
+
+    @ApiOperation(value = "展示反审批的钢材订单")
+    @PostMapping("/getSteelOrderDeletedList")
+    public Map<String, Object> getSteelOrderDeletedList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String con,
+                                                        String consigneeSsoId,
+                                                        String startTime,
+                                                        String endTime,String saler
+    ) {
+        return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,startTime,endTime,saler);
+    }
+
+    @ApiOperation(value = "修改厂内未装货车辆的运单车牌号")
+    @PostMapping(value = "/updateCapacityNumberInFactory")
+    public Map<String,Object> updateCapacityNumberInFactory(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.updateCapacityNumberInFactory(mapValue);
+    }
+
+    @ApiModelProperty(value = "修改收货客户的电话(销售)")
+    @PostMapping("/updateConsigneeTel")
+    public Map<String,Object> updateConsigneeTel(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.updateConsigneeTel(mapValue);
+    }
+
+    @ApiModelProperty(value = "展示下发给承运商的车序号和物资")
+    @PostMapping("/getCarrierTruckNoAndMaterialList")
+    public Map<String,Object> getCarrierTruckNoAndMaterialList(@RequestBody Map<String,Object> map) {
+        return amsFeign.getCarrierTruckNoAndMaterialList(map);
+    }
+
+    @ApiModelProperty(value = "关闭单个钢材物资分录")
+    @PostMapping("/closeSteelMaterialId")
+    public Map<String, Object> closeSteelMaterialId(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.closeSteelMaterialId(mapValue);
+    }
+
+    @ApiOperation(value = "展示已审核化产焦炭销售订单列表")
+    @PostMapping("/getSaleCokeOrder")
+    public Map<String, Object> getSaleCokeOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId,
+                                                   String con,
+                                                   String consigneeSsoId,
+                                                   Integer shipperId,
+                                                   String startTime,
+                                                   String endTime
+    ) {
+        return amsFeign.getSaleCokeOrder(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,shipperId,startTime,endTime);
+    }
+
+    @ApiModelProperty(value = "反关闭金蝶单个分录")
+    @PostMapping("/adverseCloseSaleMaterial")
+    public Map<String, Object> adverseCloseSaleMaterial(@RequestParam Integer saleMaterialId) {
+        return amsFeign.adverseCloseSaleMaterial(saleMaterialId);
+    }
+
+    @ApiModelProperty(value = "反关闭金蝶整个销售订单")
+    @PostMapping("/adverseCloseSaleOrder")
+    public Map<String, Object> adverseCloseSaleOrder(@RequestParam Integer saleOrderId) {
+        return amsFeign.adverseCloseSaleOrder(saleOrderId);
+    }
+
+    @ApiOperation(value = "承运起止范围与装货点")
+    @PostMapping("/getRangePoint")
+    public Map<String, Object> getRangePoint(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String con
+    ) {
+        return amsFeign.getRangePoint(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
+    @ApiOperation(value = "更新内转钢材收货客户")
+    @PostMapping("/updateInwardConsignee")
+    public Map<String,Object> updateInwardConsignee(@RequestBody(required = false)Map<String,Object>map){
+        return amsFeign.updateInwardConsignee(map);
+    }
+
+    @ApiOperation(value = "查询库存调拨单")
+    @PostMapping("getKucunList")
+    public Map<String,Object> getKucunList(@RequestBody(required = false) Map<String,Object> map,
+                                           String startTime,
+                                           String endTime,
+                                           String remark,
+                                           String transferIndep,
+                                           String consigneeName,
+                                           String totheStation){
+        return amsFeign.getKucunList(map==null?new HashMap<>():map,startTime,endTime,remark,transferIndep,consigneeName,totheStation);
+    }
+
+    @ApiOperation("批量保存库存调拨单")
+    @PostMapping("batchUpdateInwardConsignee")
+    public Map<String,Object> batchUpdateInwardConsignee(@RequestBody List<Map<String,Object>> mapList){
+        return amsFeign.batchUpdateInwardConsignee(mapList);
+    }
+
+    @ApiOperation(value = "查询通知信息", notes = "根据传过来的orgcode查询")
+    @PostMapping("/getNotice")
+    public RESTfulResult getNotice(@RequestBody(required = false) Map<String, Object> mapValue){
+        return amsFeign.getNotice(mapValue);
+    }
+
+    @ApiOperation(value = "查询日志信息", notes = "条件查询")
+    @PostMapping("/selectAllLog")
+    public RESTfulResult selectAllLog(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      Integer pageNum,
+                                      Integer pageSize,
+                                      Integer apiId){
+        if(mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return amsFeign.selectAllLog(mapValue,pageNum,pageSize,apiId);
+    }
+
+    @ApiOperation(value = "查询规格型号是否正确")
+    @PostMapping("/queryFormat")
+    RESTfulResult queryFormat(@RequestBody List<Map<String,Object>> mapList){
+        return amsFeign.queryFormat(mapList);
+    }
+
+    @ApiOperation(value = "查询物资ID并赋值")
+    @PostMapping("/queryMaterial")
+    RESTfulResult queryMaterial(@RequestBody List<Map<String,Object>> mapList){
+        return amsFeign.queryMaterial(mapList);
+    }
+
+    @ApiOperation("excel导入批量新增销售订单")
+    @PostMapping("addSteelSaleOrderList")
+    public Map<String,Object> addSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
+        return  amsFeign.addSteelSaleOrderList(mapList);
+    }
+
+    @ApiOperation("excel导入批量新增销售订单")
+    @PostMapping("addUnloadSteelSaleOrderList")
+    public Map<String,Object> addUnloadSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
+        return amsFeign.addUnloadSteelSaleOrderList(mapList);
+    }
+
+    @PostMapping("/updateTransPrice")
+    @ApiOperation(value = "修改内转汽运单价")
+    public Map<String, Object> updateTransPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.updateTransPrice(mapValue);
+    }
+    @PostMapping("/getwz")
+    @ApiOperation(value = "查询物资")
+    public Map<String, Object> getwz(@RequestBody(required = false) Map<String, Object> mapValue) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getwz(mapValue);
+    }
+    @PostMapping("/getcargonameId")
+    @ApiOperation(value = "查询联动公式数据")
+    public Map<String, Object> getcargonameId(@RequestBody(required = false) Map<String, Object> mapValue) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getcargonameId(mapValue);
+    }
+
+    @PostMapping("/reverseCloseOrder")
+    @ApiOperation("反关闭运单")
+    public Map<String,Object> reverseCloseOrder(@RequestBody(required = false) Map<String,Object> map){
+        return amsFeign.reverseCloseOrder(map);
+    }
+
+    @PostMapping("getSaleOrderStatus")
+    @ApiOperation("查询销售订单状态")
+    public Map<String,Object> getSaleOrderStatus(@RequestParam String saleNumber ) {
+        return amsFeign.getSaleOrderStatus(saleNumber);
+    }
+
+    @ApiOperation("关闭截止日期,停止推送订单")
+    @PostMapping("/closeDueDate")
+    public Map<String,Object> closeDueDate(@RequestParam BigDecimal requirementId) {
+        return amsFeign.closeDueDate(requirementId);
+    }
+
+    @ApiOperation("钢坯需求计划派单")
+    @PostMapping("/addBilletRequirement")
+    public Map<String,Object> addBilletRequirement(@RequestBody Map<String,Object> map) {
+        return amsFeign.addBilletRequirement(map);
+    }
+
+    @ApiOperation("钢坯炉号抽取")
+    @PostMapping("/checkBillet")
+    public Map<String,Object> checkBillet(@RequestBody Map<String,Object> map) {
+        return amsFeign.checkBillet(map);
+    }
+
+    @ApiOperation("获取制单日期并更新")
+    @PostMapping("/getMakeOrderDate")
+    public Map<String,Object> getMakeOrderDate(@RequestBody Map<String,Object> map) {
+        return amsFeign.getMakeOrderDate(map);
+    }
+
+    @ApiOperation("合并运单")
+    @PostMapping("/mergeOrder")
+    public Map<String,Object> mergeOrder(@RequestBody Map<String,Object> map) {
+        return amsFeign.mergeOrder(map);
+    }
+
+    @ApiOperation("拆分运单")
+    @PostMapping("/splitOrder")
+    public Map<String,Object> splitOrder(@RequestBody Map<String,Object> map) {
+        return amsFeign.splitOrder(map);
+    }
+
+    @ApiOperation(value="修改零星物资订单")
+    @PostMapping("/batchUpdateCapacity")
+    public Map<String,Object> batchUpdateCapacity(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.batchUpdateCapacity(mapValue);
+    }
+
+    @ApiOperation(value="继续装重置销售订单备注")
+    @PostMapping("/updateSaleOrderRemark")
+    public Map<String,Object> updateSaleOrderRemark(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.updateSaleOrderRemark(mapValue);
+    }
+
+}

src/main/java/com/steerinfo/dil/controller/BMSController.java

@@ -0,0 +1,940 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.config.ImageFileUtils;
+import com.steerinfo.dil.feign.BmsshipFeign;
+import com.steerinfo.dil.feign.BmstrainFeign;
+import com.steerinfo.dil.feign.BmstruckFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartRequest;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * @author hujianguo
+ * @create 2021-09-22 17:10
+ */
+@RestController
+@RequestMapping("${api.version}/bms")
+public class BMSController extends BaseRESTfulController {
+
+    @Autowired
+    BmsshipFeign bmsshipFeign;
+    @Autowired
+    BmstrainFeign bmstrainFeign;
+    @Autowired
+    BmstruckFeign bmstruckFeign;
+    @Autowired
+    private ImageFileUtils imageFileUtils;
+    /**
+     * 水运结算
+     *
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping("getDetailsOrderList")
+    @ApiOperation(value = "展示详单列表")
+    public RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getDetailsOrderList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @PostMapping("getBatch")
+    @ApiOperation(value = "展示批次信息")
+    public RESTfulResult getBatch(@RequestBody(required = false) Map<String, Object> mapValue,
+                                  Integer pageNum,
+                                  Integer pageSize,
+                                  Integer apiId,
+                                  String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getBatch(mapValue, pageNum, pageSize, apiId,con);
+    }
+
+    @PostMapping("getPortHandlingFeeList")
+    @ApiOperation(value = "展示批次信息")
+    public RESTfulResult getPortHandlingFeeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getPortHandlingFeeList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @PostMapping("addPortHandlingFee")
+    @ApiOperation(value = "生成港口装卸费")
+    RESTfulResult addPortHandlingFee(@RequestBody Map<String, Object> portHandlingFee) throws Exception {
+        return bmsshipFeign.addPortHandlingFee(portHandlingFee);
+    }
+
+    @PostMapping("updatePortHandlingFee")
+    @ApiOperation(value = "修改港口装卸费信息")
+    RESTfulResult updatePortHandlingFee(@RequestBody Map<String, Object> portHandlingFee) {
+        return bmsshipFeign.updatePortHandlingFee(portHandlingFee);
+    }
+
+    @PostMapping("getFeeToUpdate/{feeId}")
+    @ApiOperation(value = "查询修改港口装卸费数据渲染表单")
+    RESTfulResult getFeeToUpdate(@PathVariable("feeId") BigDecimal feeId) {
+        return bmsshipFeign.getFeeToUpdate(feeId);
+    }
+
+    @PostMapping("deletePortHandlingFee/{feeId}")
+    @ApiOperation(value = "逻辑删除港口装卸费")
+    RESTfulResult deletePortHandlingFee(@PathVariable("feeId") String feeId) {
+        return bmsshipFeign.deletePortHandlingFee(feeId);
+    }
+
+
+    @PostMapping("deletePortHandlingFeeSecond/{feeId}")
+    @ApiOperation(value = "逻辑删除二程港口装卸费")
+    Map<String,Object> deletePortHandlingFeeSecond(@PathVariable("feeId") BigDecimal feeId) {
+        return bmsshipFeign.deletePortHandlingFeeSecond(feeId);
+    }
+
+
+    @PostMapping("addwaterStatement")
+    @ApiOperation(value = "修改港口装卸费信息")
+    Map<String,Object> addwaterStatement(@RequestBody Map<String, Object> map) {
+        return bmsshipFeign.addwaterStatement(map);
+    }
+
+
+    @PostMapping("getUncomplateDetailsOrderList")
+    @ApiOperation(value = "展示未生成账单的详单信息")
+    public RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getUncomplateDetailsOrderList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @PostMapping("addDetailsOrder/{resultId}")
+    @ApiOperation(value = "生成水运计费详单")
+    RESTfulResult addDetailsOrder(@PathVariable("resultId") BigDecimal resultId) throws Exception {
+        return bmsshipFeign.addDetailsOrder(resultId);
+    }
+
+    @PostMapping("getStatementList")
+    @ApiOperation(value = "展示水运费和水分质检费账单信息")
+    public RESTfulResult getStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId,
+                                          String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getStatementList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @PostMapping("getLossStatementList")
+    @ApiOperation(value = "展示途损费账单信息")
+    public RESTfulResult getLossStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId,
+                                              String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getLossStatementList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @PostMapping("getWaterResult")
+    @ApiOperation(value = "展示水分质检实绩")
+    public RESTfulResult getWaterResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getWaterResult(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addStatement")
+    @ApiOperation(value = "生成水运费账单")
+    RESTfulResult addStatement(@RequestBody List<Map<String, Object>> mapList) throws Exception {
+        return bmsshipFeign.addStatement(mapList);
+    }
+
+    @PostMapping("addWaterStatement")
+    @ApiOperation(value = "生成水分质检账单")
+    RESTfulResult addWaterStatement(@RequestBody List<Map<String, Object>> mapList) throws Exception {
+        return bmsshipFeign.addWaterStatement(mapList);
+    }
+
+    @PostMapping("addLossStatement")
+    @ApiOperation(value = "生成途损账单")
+    RESTfulResult addLossStatement(@RequestBody Map<String, Object> map) throws Exception {
+        return bmsshipFeign.addLossStatement(map);
+    }
+
+    @PostMapping("getStatementDetailsOrderList")
+    @ApiOperation(value = "展示账单下的详单")
+    public RESTfulResult getStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer batchId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      Integer statementId,
+                                                      String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getStatementDetailsOrderList(new BigDecimal(batchId), mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId), con);
+    }
+
+    @PostMapping("getShipResult")
+    @ApiOperation(value = "展示详单下的船运实绩")
+    public RESTfulResult getShipResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       BigDecimal batchId,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getShipResult(batchId, mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getShipFeesFormula")
+    @ApiOperation(value = "查询水运费计算公式")
+    public RESTfulResult getShipFeesFormula() {
+        return bmsshipFeign.getShipFeesFormula();
+    }
+
+    @PostMapping("getLossFeesFormula")
+    @ApiOperation(value = "查询途损费计算公式")
+    public RESTfulResult getLossFeesFormula() {
+        return bmsshipFeign.getLossFeesFormula();
+    }
+
+    @PostMapping("getWaterFeesFormula")
+    @ApiOperation(value = "查询水分质检计算公式")
+    public RESTfulResult getWaterFeesFormula() {
+        return bmsshipFeign.getWaterFeesFormula();
+    }
+
+    @PostMapping("getTrainDetailsOrderList")
+    @ApiOperation(value = "展示火运详单")
+    public RESTfulResult getTrainDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getTrainDetailsOrderList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @PostMapping("getUncomplateTrainDetailsList")
+    @ApiOperation(value = "展示未转账单的火运详单")
+    public RESTfulResult getUncomplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getUncomplateTrainDetailsList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @PostMapping("getTrainResultList")
+    @ApiOperation(value = "展示火运实绩")
+    public RESTfulResult getTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getTrainResultList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addTrainDetails")
+    @ApiOperation(value = "生成火运详单")
+    RESTfulResult addTrainDetails(@RequestBody Map<String, Object> map) {
+        return bmstrainFeign.addTrainDetails(map);
+    }
+
+    @PostMapping("getTrainStatementList")
+    @ApiOperation(value = "展示火运账单列表")
+    public RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getTrainStatementList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @PostMapping("getStatementTrainResultList")
+    @ApiOperation(value = "展示未转账单的火运详单")
+    public RESTfulResult getStatementTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId,
+                                                     Integer detailsId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getStatementTrainResultList(mapValue, pageNum, pageSize, apiId, detailsId);
+    }
+
+    @PostMapping("getComplateTrainDetailsList")
+    @ApiOperation(value = "展示账单下的详单")
+    public RESTfulResult getComplateTrainDetailsList(Integer batchId,
+                                                     @RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId,
+                                                     Integer statementId,
+                                                     String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getComplateTrainDetailsList(new BigDecimal(batchId), mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId), con);
+    }
+
+    @PostMapping("addTrainStatement")
+    @ApiOperation(value = "生成火运费账单")
+    RESTfulResult addTrainStatement(@RequestBody List<Map<String, Object>> mapList) {
+        return bmstrainFeign.addTrainStatement(mapList);
+    }
+
+    @ApiModelProperty(value = "展示销售火运结算列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "180", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSettlementList")
+    public RESTfulResult getSettlementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId,
+                                           String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getSettlementList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @ApiModelProperty(value = "新增销售火运结算")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bmstrainSettlement", value = "销售火运结算实体", required = false, dataType = "BmstrainSettlement"),
+    })
+    @PostMapping("/addTrainSettlement")
+    public Map<String, Object> addTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
+        return bmstrainFeign.addTrainSettlement(bmstrainSettlement);
+    }
+
+    @ApiModelProperty(value = "修改销售火运结算")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bmstrainSettlement", value = "销售火运结算实体", required = false, dataType = "BmstrainSettlement"),
+    })
+    @PostMapping("/updateTrainSettlement")
+    public Map<String, Object> updateTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
+        return bmstrainFeign.updateTrainSettlement(bmstrainSettlement);
+    }
+
+    @ApiModelProperty(value = "逻辑删除销售火运结算")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "settlementId", value = "结算id", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/deleteTrainSettlement/{settlementId}")
+    public Map<String, Object> deleteTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId) {
+        return bmstrainFeign.deleteTrainSettlement(settlementId);
+    }
+
+    @ApiModelProperty(value = "得到修改渲染")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "settlementId", value = "结算id", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/selectTrainSettlement/{settlementId}")
+    public Map<String, Object> selectTrainSettlement(@PathVariable("settlementId") Integer settlementId) {
+        return bmstrainFeign.selectTrainSettlement(new BigDecimal(settlementId));
+    }
+
+    @PostMapping("getTruckDetailsOrderList")
+    @ApiOperation(value = "展示汽运详单信息")
+    public RESTfulResult getTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  Integer orderType,
+                                                  String carrierSsoId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType,carrierSsoId);
+    }
+
+    @PostMapping("getTruckResultList")
+    @ApiOperation(value = "展示汽运详单信息")
+    public RESTfulResult getTruckResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            Integer orderId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getTruckResultList(mapValue, pageNum, pageSize, apiId, new BigDecimal(orderId));
+    }
+
+    @PostMapping("getTruckStatementList")
+    @ApiOperation(value = "展示汽运账单信息")
+    public RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String userId,
+                                               String startTime,
+                                               String endTime,
+                                               String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId,userId,startTime,endTime,con);
+    }
+
+    @PostMapping("getInvoiceList")
+    @ApiOperation(value = "展示发票")
+    public RESTfulResult getInvoiceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer apiId,
+                                        String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getInvoiceList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @PostMapping("getSaleTruckStatementDetailsOrderList")
+    @ApiOperation(value = "展示账单下的详单")
+    public RESTfulResult getSaleTruckStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                               Integer pageNum,
+                                                               Integer pageSize,
+                                                               Integer apiId,
+                                                               Integer statementId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getSaleTruckStatementDetailsOrderList(mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId));
+    }
+
+    @PostMapping("getUnFinishedTruckDetailsOrderList")
+    @ApiOperation(value = "展示汽运未生成账单的详单信息")
+    public RESTfulResult getUnFinishedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                            Integer pageNum,
+                                                            Integer pageSize,
+                                                            Integer apiId,
+                                                            Integer orderType,
+                                                            String carrierSsoId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getUnFinishedTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType,carrierSsoId);
+    }
+
+    @PostMapping("addBmstruckInvoice")
+    @ApiOperation(value = "新增发票")
+    RESTfulResult addBmstruckInvoice(@RequestBody Map<String, Object> mapVal) {
+        return bmstruckFeign.addBmstruckInvoice(mapVal);
+    }
+
+    @PostMapping("updateBmstruckCheck")
+    @ApiOperation(value = "修改审核状态")
+    RESTfulResult updateBmstruckCheck(@RequestParam Integer statementId,
+                                      @RequestParam Integer status,
+                                      @RequestParam Integer person) {
+        return bmstruckFeign.updateBmstruckCheck(new BigDecimal(statementId), status, person);
+    }
+
+    @PostMapping("getSmallTruckFormula")
+    @ApiOperation(value = "查询销售汽运离100KM差距10KM内计费公式")
+    RESTfulResult getSmallTruckFormula() {
+        return bmstruckFeign.getSmallTruckFormula();
+    }
+
+    @PostMapping("getBigTruckFormula")
+    @ApiOperation(value = "查询销售汽运离100KM差距10KM外计费公式")
+    RESTfulResult getBigTruckFormula() {
+        return bmstruckFeign.getBigTruckFormula();
+    }
+
+    @PostMapping("addTruckStatement")
+    @ApiOperation(value = "新增汽运账单")
+    RESTfulResult addTruckStatement(@RequestParam("excludeTax") BigDecimal excludeTax,
+                                    @RequestParam("userId") String userId,
+                                    @RequestParam("statementTime") String statementTime,
+                                    @RequestParam("statementEndTime") String statementEndTime,
+                                    @RequestParam("orderList")BigDecimal[] orderList,
+                                    @RequestParam("selecteddetailsOrderAmount") BigDecimal selecteddetailsOrderAmount,
+                                    @RequestParam("detailsIdList")BigDecimal[] detailsIdList,
+                                    MultipartRequest request) {
+        String url="";
+        List<MultipartFile> files = new ArrayList<>();
+        //获取图片
+        for(int i=0;i<=10;i++){
+            MultipartFile temp = request.getFile("file"+i);
+            if(temp!=null){
+                files.add(temp);
+            }
+        }
+        if(files.size() < 1){
+            return failed("没有上传图片！");
+        }
+        //上传图片
+        try{
+            for(int i=0;i<files.size();i++){
+                url+=imageFileUtils.updateFile(files.get(i),i)+';';
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed("上传图片失败！");
+        }
+        Map<String,Object> map=new HashMap<>();
+        map.put("excludeTax",excludeTax);
+        map.put("orderList",orderList);
+        map.put("detailsIdList",detailsIdList);
+        map.put("selecteddetailsOrderAmount",selecteddetailsOrderAmount);
+        map.put("url",url);
+        map.put("userId",userId);
+        map.put("statementTime",statementTime);
+        map.put("statementEndTime",statementEndTime);
+        return bmstruckFeign.addTruckStatement(map);
+    }
+
+    @PostMapping("addTruckDetailsOrder/{orderId}")
+    @ApiOperation(value = "新增汽运详单")
+    RESTfulResult addTruckDetailsOrder(@PathVariable("orderId") BigDecimal orderId) {
+        return bmstruckFeign.addTruckDetailsOrder(orderId);
+    }
+
+    /**
+     * 展示汽运未生成账单的详单信息
+     *
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示内转汽运未生成账单的作业详单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "还没定", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "orderType", value = "1:计时,2:计数，3：计重，4：包月", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getUnFinishedConvertedTruckDetailsOrderList")
+    public RESTfulResult getUnFinishedConvertedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                                     Integer pageNum,
+                                                                     Integer pageSize,
+                                                                     Integer apiId,
+                                                                     Integer orderType) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmstruckFeign.getUnFinishedConvertedTruckDetailsOrderList(mapVal, pageNum, pageSize, apiId, new BigDecimal(orderType));
+    }
+
+    @PostMapping("/addConvertedDetailsOrder/{orderId}")
+    RESTfulResult addConvertedDetailsOrder(@PathVariable("orderId") BigDecimal orderId) {
+        return bmstruckFeign.addConvertedDetailsOrder(orderId);
+    }
+
+    /**
+     * 生成内转汽运账单
+     *
+     * @param mapList
+     * @return
+     */
+    @ApiModelProperty(value = "生成内转汽运账单")
+    @PostMapping("/addConvertedTruckStatement")
+    public RESTfulResult addConvertedTruckStatement(@RequestBody List<Map<String, Object>> mapList) {
+        return bmstruckFeign.addConvertedTruckStatement(mapList);
+    }
+
+    /**
+     * 删除汽运账单
+     */
+    @PostMapping("/deleteConvertedTruckStatement/{statementId}")
+    public RESTfulResult deleteConvertedTruckStatement(@PathVariable("statementId") BigDecimal statementId) {
+        return bmstruckFeign.delete(statementId);
+    }
+
+    /**
+     * 审批计费账单
+     */
+    @PostMapping("/updateConvertedTruckStatement/{statementId}")
+    public RESTfulResult updateConvertedTruckStatement(@PathVariable("statementId") BigDecimal statementId) {
+        return bmstruckFeign.update(statementId);
+    }
+
+
+    /**
+     * 审批计费账单
+     */
+    @PostMapping("/getBmsshipFee/{id}")
+    public Map<String,Object> updateConvertedTruckStatement(@PathVariable("id") Integer id) {
+        return bmsshipFeign.getBmsshipFee(id);
+    }
+
+
+
+
+
+    @PostMapping("/updateDetailsOrder")
+    @ApiOperation(value = "修改详单")
+    public RESTfulResult updateDetailsOrder(@RequestBody Map<String, Object> mapValue) {
+        return bmstruckFeign.updateDetailsOrder(mapValue);
+    }
+
+    @PostMapping("/addLossFeeOfCoke")
+    @ApiOperation(value = "增加焦炭途损费")
+    public RESTfulResult addLossFeeOfCoke(@RequestBody Map<String, Object> map) {
+        return bmstruckFeign.addLossFeeOfCoke(map);
+    }
+
+
+
+
+
+    @PostMapping("/addPortHandlingFeeSecond")
+    @ApiOperation(value = "新增二程船装卸费用")
+    public Map<String,Object> addPortHandlingFeeSecond(@RequestBody(required = false) Map<String, Object> map) {
+        return bmsshipFeign.addPortHandlingFeeSecond(map);
+    }
+
+
+    @PostMapping("/uploadBmsshipOrder")
+    @ApiOperation(value = "上传水运单图片")
+    public Map<String,Object> uploadBmsshipOrder(@RequestParam("file") MultipartFile multipartFile) throws Exception {
+        return bmsshipFeign.uploadBmsshipOrder(multipartFile);
+    }
+
+
+    //获取水运单图片
+    @ApiOperation(value = "获取水运单图片")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/downloadBmsshipOrder")
+    public Map<String, Object> downloadBmsshipOrder(@RequestParam Integer resultId) {
+        return bmsshipFeign.downloadBmsshipOrder(resultId);
+    }
+
+
+
+    /**
+     * 展示详单信息
+     *
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示内转汽运未生成账单的作业详单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "还没定", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "orderType", value = "1:计时,2:计数，3：计重，4：包月", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getInwardWeightDetailsOrder")
+    public Map<String, Object> getInwardWeightDetailsOrder(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           String carrierSsoId,
+                                                           Integer detailStatus,
+                                                           Integer orderType,
+                                                           String userId,
+                                                           String startTime,
+                                                           String endTime,
+                                                           String capacityNo,
+                                                           String shipperNames,
+                                                           String transRangeValues,
+                                                           String materialTypeNames,
+                                                           String isPage) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmstruckFeign.getInwardWeightDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId, startTime,
+                 endTime,capacityNo,shipperNames,transRangeValues,materialTypeNames,isPage);
+    }
+
+    @PostMapping("/getNoInwardDetails")
+    public Map<String,Object> getNoInwardDetails(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 String carrierSsoId,
+                                                 String userId,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String orgCode,
+                                                 String capacityNo,
+                                                 String transRangeValues,
+                                                 String materialTypeNames,
+                                                 String shipperNames,
+                                                 String isPage){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmstruckFeign.getNoInwardDetails(mapVal, pageNum, pageSize, apiId, carrierSsoId,userId, startTime,
+                endTime,orgCode,capacityNo,transRangeValues,materialTypeNames,shipperNames,isPage);
+    }
+
+    @PostMapping("/getInwardWeightTimeDetailsOrder")
+    public Map<String, Object> getInwardWeightTimeDetailsOrder(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           String carrierSsoId,
+                                                           Integer detailStatus,
+                                                           Integer orderType,
+                                                           String userId,
+                                                           String startTime,
+                                                           String endTime) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmstruckFeign.getInwardWeightTimeDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId, startTime,
+                endTime);
+    }
+
+    @PostMapping("/selectPortFeeSecondList")
+    public Map<String,Object> selectPortFeeSecondList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 String startTime,
+                                                 String endTime,
+                                                      Integer feeType,
+                                                      String con){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmsshipFeign.selectPortFeeSecondList(mapVal, pageNum, pageSize, apiId, startTime, feeType,endTime,con);
+    }
+
+    /**
+     * 根据批次查火运湿吨详情
+     * @param batchId
+     * @return
+     */
+    @PostMapping("/getTrainDetailsByBatch/{batchId}")
+    public Map<String,Object> getTrainDetailsByBatch(@PathVariable("batchId")BigDecimal batchId){
+        return bmsshipFeign.getTrainDetailsByBatch(batchId);
+    }
+
+    /**
+     * 根据批次查汽运湿吨详情
+     * @param batchId
+     * @return
+     */
+    @PostMapping("/getTruckDetailsByBatch/{batchId}")
+    public Map<String,Object> getTruckDetailsByBatch(@PathVariable("batchId")BigDecimal batchId){
+        return bmsshipFeign.getTruckDetailsByBatch(batchId);
+    }
+
+
+    /**
+     * 根据批次查询装船作业
+     * @param
+     * @return
+     */
+    @PostMapping("/findLoadByBatch")
+    public Map<String,Object> findLoadByBatch(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      BigDecimal batchId){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmsshipFeign.findLoadByBatch(mapVal, pageNum, pageSize, apiId,batchId);
+    }
+
+    @PostMapping("getSteelTruckDetailsOrder")
+    public Map<String,Object> getSteelTruckDetailsOrder(@RequestBody(required = false) Map<String,Object>map,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        Integer apiId,
+                                                        Integer orderType,
+                                                        String carrierSsoId,
+                                                        String startTime,
+                                                        String endTime,
+                                                        String con){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmstruckFeign.getSteelTruckDetailsOrder(map,pageNum,pageSize,apiId,orderType,carrierSsoId,startTime,endTime,con);
+    }
+
+    @PostMapping("/getShipFeeStatement")
+    public Map<String,Object> getShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmsshipFeign.getShipFeeStatement(map);
+    }
+
+    @PostMapping("/getShipFeeStatemented")
+    public Map<String,Object> getShipFeeStatemented(@RequestBody(required = false) Map<String,Object> map){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmsshipFeign.getShipFeeStatemented(map);
+    }
+
+    @PostMapping("/addShipFeeStatement")
+    public Map<String,Object> addShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmsshipFeign.addShipFeeStatement(map);
+    }
+
+    @PostMapping("/editShipFeeStatement")
+    public Map<String,Object> editShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmsshipFeign.editShipFeeStatement(map);
+    }
+
+    //手动生成详单
+    @PostMapping("/newInwardSettle")
+    public Map<String,Object> newInwardSettle(@RequestBody  Map<String,Object> map){
+        return bmstruckFeign.newInwardSettle(map);
+    }
+
+    @PostMapping("/getWetDryDetails")
+    public Map<String,Object> getWetDryDetails(@RequestBody  Map<String,Object> map){
+        return bmsshipFeign.getWetDryDetails(map);
+    }
+
+    @PostMapping("updateDetailsStatus")
+    public Map<String,Object> updateDetailsStatus(@RequestBody Map<String,Object> map) {
+        return bmstruckFeign.updateDetailsStatus(map);
+    }
+
+
+    @PostMapping("updateBatchDetailsOrder")
+    public Map<String,Object> updateBatchDetailsOrder(@RequestBody Map<String,Object> map) {
+        return bmstruckFeign.updateBatchDetailsOrder(map);
+    }
+
+    @PostMapping("findDetailsForStatement")
+    public Map<String,Object> findDetailsForStatement(@RequestBody Map<String,Object> map) {
+        return bmstruckFeign.findDetailsForStatement(map);
+    }
+
+    @PostMapping("updateTruckDetail")
+    @ApiOperation(value = "直接修改汽运详单")
+    RESTfulResult updateTruckDetail(@RequestParam("orderList")BigDecimal[] orderList,@RequestParam("detailRemark") String detailRemark,@RequestParam("detailAmount") BigDecimal detailAmount,@RequestParam("userId") BigDecimal userId, MultipartRequest request) {
+        String url="";
+        List<MultipartFile> files = new ArrayList<>();
+        //获取图片
+        for(int i=0;i<=10;i++){
+            MultipartFile temp = request.getFile("file"+i);
+            if(temp!=null){
+                files.add(temp);
+            }
+        }
+        //上传图片
+        try{
+            for(int i=0;i<files.size();i++){
+                url+=imageFileUtils.updateFile(files.get(i),i)+';';
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed("上传图片失败！");
+        }
+        Map<String,Object> map=new HashMap<>();
+        map.put("orderList",orderList);
+        map.put("detailAmount",detailAmount);
+        map.put("detailRemark",detailRemark);
+        map.put("url",url);
+        map.put("userId",userId);
+        return bmstruckFeign.updateTruckDetail(map);
+    }
+
+    @PostMapping("addTruckDetail")
+    @ApiOperation(value = "直接修改汽运详单")
+    RESTfulResult addTruckDetail(@RequestBody Map<String,Object> map) {
+        if(map==null){
+            return failed("参数为空!");
+        }
+        return bmstruckFeign.addTruckDetail(map);
+    }
+
+    @PostMapping("updateConsignee")
+    @ApiOperation(value = "修改详单收货客户")
+    RESTfulResult updateConsignee(@RequestBody Map<String,Object> map) {
+        if(map==null){
+            return failed("参数为空!");
+        }
+        return bmstruckFeign.updateConsignee(map);
+    }
+
+    @ApiOperation("查询发票图片")
+    @PostMapping("/getStatementPhoto")
+    public List<String> getStatementPhoto(@RequestParam BigDecimal statementId) throws Exception{
+        try{
+            String statementPhoto=bmstruckFeign.getStatementPhoto(statementId);
+            return getPhotoByUrl(statementPhoto);
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    //切割字符串，下载图片并返回
+    private List<String> getPhotoByUrl(String urls) throws Exception {
+        List<String> results=new ArrayList<>();
+        String files[]=urls.split(";");
+        for(int i=0;i<files.length && files[i].length()>5;i++){
+            results.add((String)imageFileUtils.downloadFile(files[i]));
+        }
+        return results;
+    }
+
+
+}

src/main/java/com/steerinfo/dil/controller/BackgroundProcessingController.java

@@ -0,0 +1,173 @@
+package com.steerinfo.dil.controller;
+
+
+import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
+import com.steerinfo.dil.mapper.OmstruckOrderMapper;
+import com.steerinfo.dil.mapper.UniversalMapper;
+import com.steerinfo.dil.service.impl.BackgroundProcessingServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/*
+ * 后台处理程序
+ */
+
+@RestController
+@RequestMapping("${api.version}/bp")
+public class BackgroundProcessingController extends BaseRESTfulController {
+
+    @Autowired
+    private BackgroundProcessingMapper backgroundProcessingMapper;
+
+    @Autowired
+    private BackgroundProcessingServiceImpl backgroundProcessingService;
+
+    @Autowired
+    private OmstruckOrderMapper omstruckOrderMapper;
+
+    @Autowired
+    private UniversalMapper universalMapper;
+
+
+    @ApiOperation(value = "关闭一车多趟方法")
+    @PostMapping("/closePurOrderMoreTrips")
+    public RESTfulResult closePurOrderMoreTrips(String purchaseOrderNo, String deleteNoReceiveOrder) {
+        int i = backgroundProcessingMapper.closePurOrderMoreTrips(purchaseOrderNo);
+        if("yes".equals(deleteNoReceiveOrder)){
+            //查询该采购订单下所有未接收的运输订单（5,6,7,8,17,18)
+            ArrayList<Integer> orderIdList = backgroundProcessingMapper.getAllPurOrder(purchaseOrderNo);
+            if(orderIdList != null && orderIdList.size() != 0){
+                backgroundProcessingMapper.deleteOrders(orderIdList); //物理删除
+                backgroundProcessingMapper.deleteOrderMaterials(orderIdList);//物理删除物资子表
+                backgroundProcessingMapper.batchByOrderIdForTotalDelete(orderIdList);//总实绩表
+            }
+        }
+        if(i != 1){
+            return failed("关闭失败！没有此采购订单");
+        }
+        return success("关闭成功");
+    }
+
+    @ApiOperation(value = "更改所属厂区方法")
+    @PostMapping("/updatePurOrgId")
+    public RESTfulResult updatePurOrgId(@RequestBody(required = false) Map<String, Object> map){
+        return success(backgroundProcessingService.updatePurOrgId(map));
+    }
+
+    @ApiOperation(value = "删除没用的表实绩 ")
+    @PostMapping("/deleteErrorResult")
+    public RESTfulResult deleteErrorResult(String orderNumber){
+        return success(backgroundProcessingService.deleteErrorResult(orderNumber));
+    }
+
+    @ApiOperation(value = "手动允许放行-OK字段")
+    @PostMapping("/allowEnfactory")
+    public RESTfulResult allowEnfactory(String orderNumber){
+        return success(backgroundProcessingMapper.allowEnfactory(orderNumber));
+    }
+
+    @ApiOperation(value = "获取cid和车牌号的关系")
+    @PostMapping("/bindCidCapacityNo")
+    public RESTfulResult bindCidCapacityNo(String cid,
+                                           String capacityNo){
+        if(cid == null || capacityNo == null || "null".equals(cid) || "null".equals(capacityNo)){
+            return success(0);
+        }
+        int i = backgroundProcessingService.bindCidCapacityNo(cid,capacityNo);
+        return success(i);
+    }
+
+    @ApiOperation(value = "更新运输订单canwork状态")
+    @PostMapping("updateOrderCanWork")
+    public RESTfulResult updateOrderCanWork(String orderNumber){
+        if(orderNumber != null){
+            int i = backgroundProcessingMapper.updateOrderCanWork(orderNumber);
+            return success(i);
+        }
+        return success(0);
+    }
+
+    @ApiOperation(value = "更新运输订单状态接口")
+    @PostMapping("updateOrderStatus")
+    @Transactional(rollbackFor = Exception.class)
+    public RESTfulResult updateOrderStatus(@RequestBody(required = false) Map<String,Object> map) throws Exception{
+        if (map.get("orderNumber") != null) {
+            if (DataChange.dataToBigDecimal(map.get("orderStatus")).intValue() != 2) {
+                int i = backgroundProcessingMapper.updateOrderStatus(map);
+                if(i > 1){
+                    throw new Exception("该订单号有多个运单，不允许修改，请去数据库手动修改订单状态！");
+                }
+                return success(i);
+            }
+        }
+        return failed(0);
+    }
+
+    @ApiOperation(value = "内转/采购新增上传金蝶表")
+    @PostMapping("insertToUploadEas")
+    public RESTfulResult insertToUploadEas(@RequestBody(required = false) Map<String,Object> map){
+        try {
+            Map<String,Object> purchaseOrder = (Map<String, Object>) map.get("purchaseOrder");
+            List<Map<String,Object>> list= (List<Map<String, Object>>) map.get("list");
+            for(Map<String,Object> item:list){
+                item.put("purchaseOrderNo",purchaseOrder.get("purchaseOrderNo"));
+                backgroundProcessingMapper.insertNotUpload(item);
+            }
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("缺乏参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed("未知异常！");
+        }
+        return success("修改成功，稍后会自动上传金蝶！");
+    }
+
+    @ApiOperation(value = "重置钢材打印数量")
+    @PostMapping("resetPrintNumber")
+    public RESTfulResult resetPrintNumber(@RequestBody(required = false) Map<String,Object> map){
+        return success(backgroundProcessingMapper.resetPrintNumber(map));
+    }
+
+    @ApiOperation(value = "删除进厂和排队")
+    @PostMapping("clearEnAndQue")
+    public RESTfulResult clearEnAndQue(@RequestBody(required = false) Map<String,Object> map){
+        try {
+            Map<String,Object> mesMap = backgroundProcessingMapper.getDetailsForEnAndQue(map);
+            if(mesMap == null){
+                return failed("没有符合条件的运单，请确认该运单是否已有净重！");
+            }
+            //清空进厂信息
+            backgroundProcessingMapper.clearEnDetails(mesMap);
+            //删除排队
+            int materialMesCount = omstruckOrderMapper.getMaterialNumByOrderId(mesMap);
+            if (materialMesCount == 1) {
+                //如果是单拼,则删除排队实绩
+                omstruckOrderMapper.deleteQueueList(DataChange.dataToBigDecimal(mesMap.get("capacityId")));
+                omstruckOrderMapper.deleteQueueResult(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+            }else{
+                omstruckOrderMapper.deleteQueueSpellList(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+                omstruckOrderMapper.deleteQueueResult(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+            }
+            //将总实绩里面的部分信息去掉,并改路段顺序号为null
+            omstruckOrderMapper.updateTotalResultNull(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+            universalMapper.updateLineSqe(mesMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed("未知异常!",e.getMessage());
+        }
+        return success("修改成功！");
+    }
+}

src/main/java/com/steerinfo/dil/controller/DilVersionController.java

@@ -0,0 +1,40 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.DilVersionServiceImpl;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/12/14 22:42
+ */
+@RestController
+@RequestMapping("${api.version}/appVersion")
+public class DilVersionController {
+
+    @Autowired
+    DilVersionServiceImpl dilVersionService;
+
+    @ApiOperation(value = "查询APP版本号")
+    @PostMapping("/checkVersion")
+    public String getAppVersion() {
+        return dilVersionService.getAppVersion();
+    }
+
+    @ApiOperation(value = "查询PDA版本号")
+    @PostMapping("/getPDAVersion")
+    public String getPDAVersion() {
+        return dilVersionService.getPDAVersion();
+    }
+
+    @ApiOperation(value = "新增APP版本号")
+    @PostMapping("/addAppVersion/{version}")
+    public String addAppVersion(@PathVariable("version") String version) {
+        return dilVersionService.addAppVersion(version);
+
+    }
+}

src/main/java/com/steerinfo/dil/controller/JoinController.java

@@ -0,0 +1,34 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.JoinFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2022/2/24 18:09
+ */
+
+@RestController
+@RequestMapping("${api.version}/join")
+public class JoinController {
+
+    @Autowired
+    JoinFeign joinFeign;
+
+    @PostMapping("/receiveTmsTruckWeightResult")
+    public Map<String, Object> receiveTmsTruckWeightResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
+        return joinFeign.receiveTmsTruckWeightResult(mapList);
+    }
+
+    @PostMapping("linkageDeleteTransportOrder")
+    public String linkageDeleteTransportOrder(@RequestBody(required = false) List<Map<String,Object>> mapList) {
+        return joinFeign.linkageDeleteTransportOrder(mapList);
+    }
+}

src/main/java/com/steerinfo/dil/controller/OMSController.java

@@ -0,0 +1,946 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.OmsFeign;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-09-17 14:10
+ */
+@RestController
+@RequestMapping("${api.version}/oms")
+public class OMSController {
+
+
+    @Autowired
+    OmsFeign omsFeign;
+    
+    //********************************************omsTruckOrderController*****************************
+
+    @ApiOperation(value = "查询所有运输订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(86)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllTruckOrder")
+    public Map<String, Object> getAllTruckOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer orderStatus,
+                                                Integer planId,
+                                                Integer orderType,
+                                                Integer fuelOrder,
+                                                String carrierSSOId,
+                                                String con,
+                                                String startTime,
+                                                String endTime) {
+        return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
+                orderStatus, planId, orderType, fuelOrder,carrierSSOId, con,startTime,endTime);
+    }
+
+    @ApiOperation(value = "不适用表头返回数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/getAllTruckOrderReturnListMap")
+    public Map<String, Object> getAllTruckOrderReturnListMap(Integer orderStatus, Integer planId, Integer orderType) {
+        return omsFeign.getAllTruckOrderReturnListMap(orderStatus, planId, orderType);
+    }
+
+    @ApiOperation(value = "查询所有空闲的运力信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(85)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllCapacity")
+    public Map<String, Object> getAllCapacity(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer carrierId
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return omsFeign.getAllCapacity(mapValue, apiId, pageNum, pageSize, carrierId);
+    }
+
+    @ApiOperation(value = "新增采购进口矿订单 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addInputOrder")
+    public Map<String,Object> addInputOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return omsFeign.addInputOrder(mapValue);
+    }
+
+    @ApiOperation(value = "分解运输计划后 新增订单  或者直接新增订单 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addPurOrder")
+    public Map<String, Object> addPurOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return omsFeign.addPurOrder(mapValue);
+    }
+
+    //采购内转派单
+    @ApiOperation(value = "采购内转派单")
+    @PostMapping("/addPurInwardOrder")
+    public Map<String,Object> addPurInwardOrder(@RequestBody(required = false) Map<String,Object>mapValue) {
+        return omsFeign.addPurInwardOrder(mapValue);
+    }
+
+    @ApiOperation(value = "修改分派计划")
+    @PostMapping("/updateOrder")
+    public Map<String, Object> updateOrder(@RequestBody Map<String, Object> map) {
+        return omsFeign.updateOrder(map);
+    }
+
+    @ApiOperation(value = "派单")
+    @PostMapping("/dispatchOrder")
+    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return omsFeign.dispatchOrder(mapValue);
+    }
+
+    @ApiOperation(value = "销售派单")
+    @PostMapping("/dispatchOrderForSale")
+    public Map<String, Object> dispatchorderForSale(@RequestBody(required = false) Map<String, Object> map) {
+        return omsFeign.dispatchOrderForSale(map);
+    }
+
+
+    @ApiOperation(value = "逻辑删除运单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/deleteOrder")
+    public Map<String, Object> deleteOrder(@RequestBody(required = false) Map<String, Object> map,
+                                     Integer planId) {
+        return omsFeign.deleteOrder(map, planId);
+    }
+
+    @ApiOperation(value = "司机接收、拒绝接单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/driverReceiveOrRefuse")
+    public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map) {
+        return omsFeign.driverReceiveOrRefuse(map);
+    }
+    @ApiOperation(value="撤销订单")
+    @PostMapping("/undoOrder")
+    public Map<String, Object> undoOrder(@RequestBody Map<String,Object> map) {
+        return omsFeign.undoOrder(map);
+    }
+
+    @ApiOperation(value = "撤销已拒绝")
+    @PostMapping("/refuseCtrlZ")
+    public Map<String,Object> refuseCtrlZ(@RequestBody Map<String,Object> map){
+        return omsFeign.refuseCtrlZ(map);
+    }
+
+
+
+    @ApiOperation(value="司机接单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getReceiveRefuseOrder/{orderReceiveStatus}")
+    public Map<String, Object> getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               @PathVariable Integer orderReceiveStatus,
+                                               Integer orderType,
+                                               Integer orderStatus, String con
+    ){
+        return omsFeign.getReceiveRefuseOrder(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum,
+                pageSize, orderReceiveStatus, orderType, orderStatus, con);
+    }
+
+
+    @ApiOperation(value="司机APP端调用接口查询数据 4 已下发 5 已接收")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "capacityNumber", value = "车牌号", required = false, dataType = "String"),
+    })
+    @PostMapping("/sendMesToDriver")
+    public Map<String, Object> sendMesToDriver(String capacityNumber, Integer orderStatus){
+        return omsFeign.sendMesToDriver(capacityNumber, orderStatus);
+    }
+
+    @ApiOperation(value="通过车牌获取所有已拒绝的订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "capacityNumber", value = "车牌号", required = false, dataType = "String"),
+    })
+    @PostMapping("/getRefuseOrderByCapacityNum")
+    public Map<String, Object> sendMesToDriver(String capacityNumber){
+        return omsFeign.sendMesToDriver(capacityNumber);
+    }
+
+    @ApiOperation(value="通过运输订单ID查询运单信息 包含各个作业路径")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "订单Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getOrderMesByOrderNum/{orderId}")
+    public Map<String, Object> getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId){
+        return omsFeign.getOrderMesByOrderNum(orderId);
+    }
+
+    @ApiOperation(value="通过运输订单ID查询实绩地点和时间")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectPlaceAndTime/{orderId}")
+    public Map<String, Object> selectPlaceAndTime(@PathVariable("orderId") Integer orderId){
+        return omsFeign.selectPlaceAndTime(orderId);
+    }
+
+    @ApiOperation(value="通过运输订单ID查询运单信息")
+    @PostMapping("/selectOrderByOrderId/{orderId}")
+    public Map<String, Object> selectOrderByOrderId(@PathVariable("orderId") Integer orderId){
+        return omsFeign.selectOrderByOrderId(orderId);
+    }
+
+    @ApiOperation(value="查看运输派单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getTransportDispatch")
+    public Map<String, Object> getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer orderType,
+                                              Integer orderStatus, Integer fuelOrder,String carrierSSOId,String con,
+                                                    String startTime,
+                                                    String endTime){
+        return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
+                 orderType, orderStatus, fuelOrder,carrierSSOId,con,startTime,endTime);
+    }
+
+    /**
+     * 展示承运商接收销售公司已接受的销售订单
+     *
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("/getSaleOrderForCarrierList/{carrierId}")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getSaleOrderForCarrierList(@RequestBody(required = false)Map<String,Object> map,
+                                                          @PathVariable("carrierId") Integer carrierId,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String con
+                                                          ) {
+        return omsFeign.getSaleOrderForCarrierList(map==null ? new HashMap<>():map,carrierId, apiId, pageNum, pageSize,con);
+
+    }
+
+    /**
+     * 展示承运商接收销售公司已接受的销售订单
+     *
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("/selectAllOrderForSale/{carrierId}")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> selectAllOrderForSale( @RequestBody(required = false) Map<String,Object> mapValue,
+                                                      @PathVariable Integer carrierId,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer orderType,
+                                                      Integer orderStatus,
+                                                      Integer saleOrderMaterialId,
+                                                      String  con
+                                                    ) {
+        return omsFeign.selectAllOrderForSale(mapValue==null?new HashMap<>():mapValue, carrierId, apiId, pageNum, pageSize, orderType, orderStatus, saleOrderMaterialId, con);
+    }
+    /**
+     * 展示承运商接收销售公司已接受的销售订单
+     *
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("/getTransportOrder")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getTransportOrder( @RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                   Integer orderId,
+                                                  Integer orderStatus
+    ) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return omsFeign.getTransportOrder(mapValue,apiId,pageNum,pageSize,orderId,orderStatus);
+    }
+
+
+
+
+
+
+
+
+    /**
+     * 销售物流：司机接单pc端
+     */
+
+    @ApiOperation(value="pc端展示司机信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(226)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getDriverInfoForSale")
+    public Map<String,Object> getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer orderType,
+                                                   Integer orderStatus,
+                                                   String con,
+                                                   String carrierSsoId,
+                                                   Integer shipperId
+    )
+    {
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,orderType,orderStatus, con,carrierSsoId,shipperId);
+    }
+    @PostMapping("/getDriverInfoForSale1")
+    public Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   Integer orderStatus,
+                                                   String con,
+                                                   String numberPlate,
+                                                   @RequestParam Integer saleOrderId
+    )
+    {
+        return omsFeign.getDriverInfoForSale1(mapValue==null?new HashMap<>():mapValue,orderStatus, con,numberPlate,saleOrderId);
+    }
+
+
+
+    /**
+     * 查询所有已经接收的焦炭发运日计划
+     *
+     * @param carrierId
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping("/getCokeDayPlanAndRecivedList/{carrierId}")
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "169", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getCokeDayPlanAndRecivedList(
+                                                            @RequestBody(required = false)Map<String,Object> map,
+                                                            @PathVariable("carrierId") Integer carrierId,
+                                                            @RequestParam Integer apiId,
+                                                            @RequestParam Integer pageNum,
+                                                            @RequestParam Integer pageSize) {
+        return omsFeign.getCokeDayPlanAndRecivedList(map==null?new HashMap<>():map,carrierId, apiId, pageNum, pageSize);
+    }
+
+    /**
+     * 查询所有已经接收的水渣发运日计划
+     *
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("/getWaterSlagDayPlanAndRecivedList/{carrierId}")
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "170", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWaterSlagDayPlanAndRecivedList(
+                                                                 @RequestBody(required = false)Map<String,Object> map,
+                                                                 @PathVariable("carrierId") Integer carrierId,
+                                                                 @RequestParam Integer apiId,
+                                                                 @RequestParam Integer pageNum,
+                                                                 @RequestParam Integer pageSize) {
+        return omsFeign.getWaterSlagDayPlanAndRecivedList(map==null?new HashMap<>():map, carrierId, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="通过物资ID和发货单位ID查找采购订单号")
+    @PostMapping("/selectNewOrderId")
+    public Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map){
+        return omsFeign.selectNewOrderId(map);
+    }
+    @ApiOperation(value="查询所有空闲的司机排班信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(186)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getCapacityForLeisure/{carrierId}")
+    public Map<String, Object> getCapacityForLeisure(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     @PathVariable Integer carrierId) {
+        return omsFeign.getCapacityForLeisure(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize,carrierId);
+    }
+     //获取已经形成订单的焦炭计划
+    @PostMapping(value = "/getCokeRailDayPlanForGenOrder/{carrierId}")
+    public Map<String,Object>  getCokeRailDayPlanForGenOrder(@RequestBody(required = false)Map<String,Object> map,
+                                                           @PathVariable("carrierId") Integer carrierId,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           Integer dayPlanId,
+                                                           Integer orderStatus,
+                                                           Integer orderType,
+                                                           String con
+    ){
+        return  omsFeign.getCokeRailDayPlanForGenOrder(map==null?new HashMap<>():map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus, orderType, con);
+    }
+
+
+   //获取已经形成订单的水渣计划
+   @PostMapping(value = "/getWaterslagDayPlanForGenOrder/{carrierId}")
+   public Map<String, Object>     getWaterslagDayPlanForGenOrder(@RequestBody(required = false)Map<String,Object> map,
+                                                                 @PathVariable("carrierId") Integer carrierId,
+                                                                 Integer pageNum,
+                                                                 Integer pageSize,
+                                                                 Integer apiId,
+                                                                 Integer dayPlanId,
+                                                                 Integer orderStatus,
+                                                                 Integer orderType,
+                                                                 String con
+
+
+   ){
+        return omsFeign.getWaterslagDayPlanForGenOrder(map==null?new HashMap<>():map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus,orderType, con);
+
+   }
+
+    @ApiOperation(value="车牌号下拉")
+    @GetMapping("/getDriverCapacity")
+    public Map<String, Object> getDriverCapacity() {
+        Map<String,Object> map = omsFeign.getDriverCapacity();
+        return map;
+    }
+
+    @ApiOperation(value="派单信息")
+    @PostMapping("/getTruckNoDispatchMap")
+    public Map<String, Object> getTruckNoDispatchMap(Integer dispatchId) {
+        Map<String,Object> map = omsFeign.getTruckNoDispatchMap(dispatchId);
+        return map;
+    }
+
+    @ApiOperation(value="承运商分派运输订单给司机")
+    @PostMapping("/addAppTruckOrder")
+    public Map<String, Object> addAppTruckOrder(@RequestParam Integer dispatchId,
+                                                @RequestParam Integer orderType,
+                                                @RequestParam String capacityNumber,
+                                                @RequestParam Integer carrierId) {
+        Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType,capacityNumber, carrierId);
+        return map;
+    }
+    //展示销售订单信息
+    @ApiOperation(value="展示销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectSteelSaleForCarrier/{carrierId}")
+    public Map<String, Object> selectSteelSaleForCarrier(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                         Integer apiId,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         @PathVariable Integer carrierId
+
+    )
+
+    {
+        return omsFeign.selectSteelSaleForCarrier(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierId);
+    }
+
+
+
+    @ApiOperation(value=" 通过销售订单id查找信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(235)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectInfoBySaleOrderId/{saleOrderId}")
+    public Map<String, Object> selectInfoBySaleOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       @PathVariable Integer saleOrderId
+
+
+    ){
+        return  omsFeign.selectInfoBySaleOrderId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,saleOrderId);
+    }
+
+    //展示发运计划信息
+    @ApiOperation(value="展示发运计划信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectCokeRailPlan/{carrierId}")
+    public Map<String, Object> selectCokeRailPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  @PathVariable Integer carrierId,
+                                                  Integer orderType
+
+    ){
+        return  omsFeign.selectCokeRailPlan(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierId, orderType);
+    }
+
+    @ApiOperation(value=" 通过发运id查找信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectInfoByDayPlanId/{dayPlanId}")
+    public Map<String, Object> selectInfoByDayPlanId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     @PathVariable  Integer dayPlanId,
+                                                     Integer orderType
+
+
+    ){
+        return omsFeign.selectInfoByDayPlanId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, dayPlanId, orderType);
+    }
+
+    @ApiOperation(value="根据运单id关闭订单")
+    @PostMapping("/closeOmstruckOrder")
+    public Map<String, Object> closeOmstruckOrder(@RequestBody Map<String,Object> mapVal) {
+        Map<String, Object> map = omsFeign.closeOmstruckOrder(mapVal);
+        return map;
+    }
+
+    @ApiOperation(value="根据运单id修改运力")
+    @PostMapping("/updateCapacityId")
+    public Map<String, Object> updateCapacityId(@RequestBody Map<String,Object> map) {
+       return omsFeign.updateCapacityId(map);
+
+    }
+
+    @ApiOperation(value="siji")
+    @PostMapping("/getCapacityAndDriverList")
+    public Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                        Integer apiId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        String con,
+                                                        String carrierId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con,carrierId);
+        return map;
+    }
+
+    //查询所有的收货单位
+    @GetMapping("/getReceivingUnit")
+    public Map<String, Object> getReceivingUnit(){
+        return omsFeign.getReceivingUnit();
+    }
+
+
+    //查询所有的发货单位（供应商）
+    @GetMapping("/getSupplier")
+    public Map<String, Object> getSupplier(){
+        return omsFeign.getSupplier();
+    }
+
+    @ApiOperation(value = "关闭订单")
+    @PostMapping("/CloseOrder")
+    public  Map<String,Object> CloseOrder(@RequestBody(required = false)Map<String,Object> map){
+        return  omsFeign.CloseOrder(map);
+    }
+
+    @ApiOperation(value = "分解内转计划（新增运输订单）")
+    @PostMapping("/addInwardOrder")
+    public Map<String,Object> addInwardOrder(@RequestBody Map<String,Object> mapValue) {
+        return omsFeign.addInwardOrder(mapValue);
+    }
+
+    @ApiOperation(value = "分派计划")
+    @PostMapping("/apportionInwardOrder")
+    public Map<String,Object> apportionInwardOrder(@RequestBody List<Map<String,Object>> mapList) {
+        return omsFeign.apportionInwardOrder(mapList);
+    }
+
+    @ApiOperation(value="分解计划查询")
+    @PostMapping("/getInwardOrderList")
+    public Map<String, Object> getInwardOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer orderStatus,
+                                                  String carrierId,
+                                                  String con,
+                                                  String startTime,
+                                                  String endTime) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,startTime,endTime);
+        return map;
+    }
+
+    @ApiOperation(value="采购内转运单")
+    @PostMapping("/getPurInwardOrderList")
+    public Map<String, Object> getPurInwardOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer orderStatus,
+                                                  String carrierId,
+                                                  String con,
+                                                     Integer planEnableStatus,
+                                                     String userId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getPurInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,planEnableStatus,userId);
+        return map;
+    }
+
+    @ApiOperation(value = "司机APP端查询下发给自己运输订单")
+    @PostMapping("/sendOrderToApp")
+    public List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber) {
+        return omsFeign.sendOrderToApp(capacityNumber);
+    }
+
+    @ApiOperation(value = "根据运输订单号查询订单物资")
+    @PostMapping("/getUnloadOrderMaterial")
+    public Map<String,Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String,Object>map){
+        return omsFeign.getUnloadOrderMaterial(map);
+    }
+    @ApiOperation(value = "根据运输订单号查询卸货点")
+    @PostMapping("/getUnloadOrderWarehouseName")
+    public Map<String,Object> getUnloadOrderWarehouseName(@RequestBody(required = false)Map<String,Object>map){
+        return omsFeign.getUnloadOrderWarehouseName(map);
+    }
+
+    @ApiOperation(value = "分解异地库计划")
+    @PostMapping("/apportionInwardOffsetOrder")
+    public Map<String,Object> apportionInwardOffsetOrder(@RequestBody Map<String,Object> mapvalue) {
+        return omsFeign.apportionInwardOffsetOrder(mapvalue);
+    }
+
+    @ApiOperation(value = "查询司机的所有运输订单信息")
+    @PostMapping("/getAllOrderMessage")
+    public List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber) {
+        return omsFeign.getAllOrderMessage(capacityNumber);
+    }
+
+    @ApiOperation(value = "司机确认订单")
+    @PostMapping("/driverConfirmation")
+    public Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue) {
+        return omsFeign.driverConfirmation(mapvalue);
+    }
+    @ApiOperation(value = "通过运输订单号查询订单信息给司机")
+    @PostMapping("/getMessageToApp")
+    public Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) {
+        return omsFeign.getMessageToApp(mapvalue);
+    }
+
+    @ApiOperation(value = "通过车牌号查询所有已下发未接收的订单信息")
+    @PostMapping("/getAllOrderMessagesByCapacityNum")
+    public List<Map<String, Object>> getAllOrderMessagesByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue){
+        return  omsFeign.getAllOrderMessagesByCapacityNum(mapvalue);
+    }
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("/getReceiveOrderIdListByCapacityNum")
+    public List<Integer> getReceiveOrderIdListByCapacityNum(@RequestBody(required = false) Map<String, Object> mapvalue) {
+        return omsFeign.getReceiveOrderIdListByCapacityNum(mapvalue);
+    }
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("/getAllRefuseOrderNumberByCapacity")
+    public List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue){
+        return omsFeign.getAllRefuseOrderNumberByCapacity(mapvalue);
+    }
+
+    @ApiOperation(value = "添加退货实绩关闭当前订单")
+    @PostMapping("/returnOrderCloseOrder")
+    public Map<String,Object> returnOrderCloseOrder(@RequestBody(required = false) Map<String, Object> map){
+        return omsFeign.returnOrderCloseOrder(map);
+    }
+
+    @ApiOperation(value = "根据运单id查询实绩位置")
+    @PostMapping("/getOrderResult")
+    public List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map){
+        return omsFeign.getOrderResult(map);
+    }
+
+    @ApiOperation(value = "装机查询所以已装车的订单信息")
+    @PostMapping("/getLoadForLoadCarResult")
+    public  Map<String, Object> getLoadForLoadCarResult(@RequestBody(required = false) Map<String, Object> map){
+        return omsFeign.getLoadForLoadCarResult(map);
+    }
+
+
+    @ApiOperation(value = "查询未下发的零星物资订单")
+    @PostMapping("/getOthersOrderMesToSend")
+    public Map<String, Object> getOthersOrderMesToSend(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer type,
+                                                 Integer orderStatus,
+                                                 String carrierId,
+                                                 String  con,
+                                                 String userId,
+                                                 String usersId,
+                                                       Integer type1,
+                                                       String startTime,
+                                                       String endTime) {
+        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con,userId,usersId,type1,startTime,endTime);
+    }
+
+    @ApiOperation(value = "修改运输订单方法：根据运输订单id修改运力id")
+    @PostMapping("/updateOmstruckOrder")
+    public Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map){
+        Integer orderId = Integer.parseInt(map.get("orderId").toString()) ;
+        map.remove("orderId");
+        map.put("orderId",orderId);
+        return omsFeign.updateOmstruckOrder(map);
+    }
+
+    @ApiOperation(value="承运商销售分派运输订单给司机")
+    @PostMapping("/addSaleTruckOrder")
+    public Map<String, Object> addSaleTruckOrder(@RequestBody Map<String,Object> mapValue) {
+        Map<String, Object> map = omsFeign.addSaleTruckOrder(mapValue);
+        return map;
+    }
+
+    @ApiOperation(value = "通过运单下的物资信息")
+    @PostMapping("/getOrderMaterialList")
+    public Map<String, Object> getOrderMaterialList(@RequestParam Integer orderId) {
+        return omsFeign.getOrderMaterialList(orderId);
+    }
+
+    @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
+    @PostMapping("/getCapacityAllOrder")
+    public Map<String, Object> getCapacityAllOrder(String capacityNumber, String date){
+        return omsFeign.getCapacityAllOrder(capacityNumber,date);
+    }
+
+    @ApiOperation(value = "该车牌号下的所有物资的综合")
+    @PostMapping("/getMatrialWeight")
+    public Map<String, Object> getMatrialWeight(String capacityNumber, String date){
+        return omsFeign.getMatrialWeight(capacityNumber,date);
+    }
+
+    @ApiOperation(value = "根据运单id关闭运输订单")
+    @PostMapping("/closeOrder")
+    public Map<String, Object> closeOrder(@RequestParam Integer orderId) {
+        return omsFeign.closeOrder(orderId);
+    }
+
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("/getDriverConfirmation")
+    public Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map) {
+        return omsFeign.getDriverConfirmation(map);
+    }
+
+    @ApiOperation(value = "一键删除多个订单")
+    @PostMapping("/deleteOrders")
+    public Map<String, Object>  deleteOrders(@RequestBody(required = false) Map<String, Object> map){
+        return omsFeign.deleteOrders(map);
+    }
+
+    @ApiOperation(value = "装卸工查询自己所有装了货的订单信息")
+    @PostMapping("/getAllLoadUnloadResult")
+    public Map<String, Object> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> mapValue){
+        return omsFeign.getAllLoadUnloadResult(mapValue);
+    }
+
+    @ApiOperation(value = "计时作业查看订单详情")
+    @PostMapping("/getTimeTaskEnd")
+    public Map<String, Object> getTimeTaskEnd(@RequestBody(required = false) Map<String, Object> mapValue){
+        return omsFeign.getTimeTaskEnd(mapValue);
+    }
+
+    @ApiOperation(value = "计时作业查看订单详情")
+    @PostMapping("/getTimeTaskEndDetail")
+    public Map<String, Object> getTimeTaskEndDetail(@RequestBody(required = false) Map<String, Object> mapValue){
+        return omsFeign.getTimeTaskEndDetail(mapValue);
+    }
+
+
+    @ApiOperation(value = "计时作业查看订单详情")
+    @PostMapping("/getPauseTimeTaskDetail")
+    public Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId){
+        return omsFeign.getPauseTimeTaskDetail(orderId);
+    }
+
+    @ApiOperation(value="批量关闭运输订单")
+    @PostMapping("/batchCloseOrder")
+    public Map<String, Object> batchCloseOrder(@RequestBody List<Map<String,Object>> mapList) {
+        return omsFeign.batchCloseOrder(mapList);
+    }
+
+    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
+    @PostMapping("/getOrderMaterial/{orderId}")
+    public Map<String,Object> getOrderMaterial(@PathVariable("orderId")Integer orderId){
+        return omsFeign.getOrderMaterial(orderId);
+    }
+
+
+    @ApiOperation(value = "正常关闭运输订单")
+    @PostMapping("/closeInwardOrder")
+    public Map<String, Object> closeInwardOrder(Integer orderId){
+        return omsFeign.closeInwardOrder(orderId);
+    }
+
+    @ApiOperation(value = "计时查询进程")
+    @PostMapping("/getTimeOrderResult")
+    public Map<String, Object> getTimeOrderResult(@RequestBody(required = false) Map<String, Object> map){
+        return omsFeign.getTimeOrderResult(map);
+    }
+
+    @ApiOperation(value = "装机查询所以已装车的订单信息")
+    @PostMapping("/getCapacityTypeByUserId")
+    public Map<String, Object> getCapacityTypeByUserId(@RequestBody (required = false) Map<String, Object> map) {
+        return omsFeign.getCapacityTypeByUserId(map);
+    }
+
+    @ApiOperation(value = "查询钢材订单号")
+    @GetMapping("getSteelOrderNum")
+    public Map<String, Object> getSteelOrderNum(String capacityId){
+        return omsFeign.getSteelOrderNum(capacityId);
+    }
+
+    @ApiOperation(value = "查询钢材订单信息")
+    @GetMapping("getMesToSteelDepartment")
+    public Map<String, Object> getMesToSteelDepartment(Integer orderId){
+        return omsFeign.getMesToSteelDepartment(orderId);
+    }
+
+    @ApiOperation(value = "查询钢材订单信息")
+    @PostMapping("updateMaterialMes")
+    public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map) {
+        return omsFeign.updateMaterialMes(map);
+    }
+
+    @ApiOperation(value = "修改正在装的状态")
+    @PostMapping("/updateContinueStaus")
+    public Map<String, Object> updateContinueStaus(@RequestBody(required = false) Map<String, Object> map) {
+        return omsFeign.updateContinueStaus(map);
+    }
+
+    @ApiOperation(value = "展示销售订单下的运输订单")
+    @PostMapping("getDriverInfoForSale2")
+    public Map<String, Object> getDriverInfoForSale2(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer saleOrderId,
+                                                     String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return omsFeign.getDriverInfoForSale2(mapValue,apiId,pageNum,pageSize,new BigDecimal(saleOrderId),con);
+    }
+
+    @ApiOperation(value = "通过运单id或者运单号查询车辆是否放行")
+    @PostMapping("canCapacityEnfactory")
+    public Map<String, Object> canCapacityEnfactory(@RequestBody Map<String, Object> mapValue) {
+        return omsFeign.canCapacityEnfactory(mapValue);
+    }
+
+    @ApiOperation(value = "出库信息")
+    @PostMapping("getWarehouseMes")
+    public Map<String, Object> getWarehouseMes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam(required = false) String startTime,
+                                               @RequestParam(required = false) String endTime,
+                                               @RequestParam(required = false) String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return omsFeign.getWarehouseMes(mapValue,startTime,endTime, con);
+    }
+
+    @ApiOperation(value = "通过运单下的物资信息")
+    @PostMapping("/closeInwardOrderByPlan")
+    public  Map<String, Object> closeInwardOrderByPlan(@RequestParam Integer planId) {
+        return omsFeign.closeInwardOrderByPlan(planId);
+    }
+
+
+    @ApiOperation(value = "查询内转钢材异地库物资详情")
+    @GetMapping("/getOrderTrainMes")
+    public Map<String,Object> getOrderTrainMes(@RequestParam Integer orderId){
+        return omsFeign.getOrderTrainMes(orderId);
+    }
+
+    @ApiOperation(value = "查询内转钢材火车发运明细")
+    @PostMapping("getWagonShippingDetails")
+    public Map<String,Object> getWagonShippingDetails(@RequestBody(required = false)  Map<String,Object> map,
+                                                      @RequestParam(required = false) String startTime,
+                                                      @RequestParam(required = false) String endTime,
+                                                      @RequestParam(required = false) String sendStation,
+                                                      @RequestParam(required = false) String toTheStation,
+                                                      @RequestParam(required = false) String consigneeName,
+                                                      @RequestParam(required = false) String wagonNo){
+        if (map == null) {
+            map = new HashMap<>();
+        }
+        return omsFeign.getWagonShippingDetails(map,startTime,endTime,sendStation,toTheStation,consigneeName,wagonNo);
+    }
+}

src/main/java/com/steerinfo/dil/controller/OTMSController.java

@@ -0,0 +1,380 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.config.ImageFileUtils;
+import com.steerinfo.dil.feign.OtmsFeign;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartRequest;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("${api.version}/otms")
+public class OTMSController {
+
+    @Autowired
+    private OtmsFeign otmsFeign;
+    @Autowired
+    private ImageFileUtils imageFileUtils;
+    @ApiOperation(value="全路径展示接口")
+    @PostMapping("/fullPath")
+    public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception {
+        return otmsFeign.fullPath(orderNumber);
+    }
+
+    @ApiOperation(value = "在途订单列表")
+    @PostMapping("/getInTransitTransportation")
+    public RESTfulResult getInTransitTransportation(@RequestBody(required=false)   Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
+    )
+    {
+        return otmsFeign.getInTransitTransportation(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value = "有异常订单列表")
+    @PostMapping("/getHaveAbnormalTruckOrderInfo")
+    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody(required=false)   Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
+    )
+    {
+        return otmsFeign.getHaveAbnormalTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation("已完成订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getFinishTruckOrderInfo")
+    public RESTfulResult getFinishTruckOrderInfo(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                 @RequestParam(required = false,defaultValue = "468",name = "apiId")Integer apiId,
+                                                 @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
+                                                 @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
+    ){
+        return otmsFeign.getFinishTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value = "新增抵达")
+    @PostMapping(value = "/addtmstruckArrivalResult")
+    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, Long arrivalTime,  MultipartRequest request) throws Exception {
+        //添加到files数组
+        List<MultipartFile> files = new ArrayList<>();
+        int index=-1;
+        for(int i=0;i<21;i++){
+            MultipartFile file = request.getFile("file"+i);
+            if(file!=null){
+                files.add(file);
+                if(index<0){
+                    index=i;
+                }
+            }
+        }
+        //没有上传，当做重复上传
+        if(files.size() == 0){
+            return  new RESTfulResult("201","请勿重复上传！","请勿重复上传！");
+        }
+        //上传图片,拼接在一个url里
+        Map<String,Object> mapValue=new HashMap<>();
+        String url="";
+        try{
+            //如果存在预览图片，查询，把那个位置的图片截取下来
+            if(index > 0){
+                String[] arrivalPhoto=otmsFeign.getArrivalPhoto(orderNumber).split(";");
+                for(int i=0;i<index;i++){
+                    url=url+arrivalPhoto[i]+";";
+                }
+            }
+        }catch (Exception e){
+
+        }
+        //上传图片
+        for (int i=0;i<files.size();i++){
+            MultipartFile file=files.get(i);
+            url += imageFileUtils.updateFile(file,i)+';';
+        }
+        mapValue.put("url",url);
+        mapValue.put("arrivalTime",arrivalTime);
+        return otmsFeign.addtmstruckArrivalResult(mapValue,orderNumber,resultArrivalAddress,url);
+    }
+
+    @ApiOperation(value = "新增签收")
+    @PostMapping(value = "/addTmstruckReceiptResult")
+    public synchronized RESTfulResult addTmstruckReceiptResult(MultipartRequest request, Integer num, String orderNumber, String resultArrivalAddress, Integer imgcount3, Integer imgcount4) throws Exception {
+        //添加到files数组
+        List<MultipartFile> files = new ArrayList<>();
+        for(int i=0;i<21;i++){
+            MultipartFile file = request.getFile("file"+i);
+            if(file!=null){
+                files.add(file);
+            }else{
+                break;
+            }
+        }
+        if(files.size()<2){
+            return  new RESTfulResult("201","至少上传两张图片！","至少上传两张图片！");
+        }
+        //上传图片,拼接在一个url里
+        Map<String,Object> mapValue=new HashMap<>();
+        String url="";
+        for (int i=0;i<files.size();i++){
+            MultipartFile file=files.get(i);
+            url += imageFileUtils.updateFile(file,i)+';';
+        }
+        mapValue.put("url",url);
+        return otmsFeign.addTmstruckReceiptResult(mapValue,orderNumber,resultArrivalAddress);
+    }
+
+    @ApiOperation(value = "新增签收网页端")
+    @PostMapping(value = "/addTmstruckReceiptResultForWeb")
+    public synchronized RESTfulResult addTmstruckReceiptResultForWeb(MultipartRequest request,Long receiptTime, String orderNumber, String resultArrivalAddress) throws Exception {
+        //添加到files数组
+        List<MultipartFile> files = new ArrayList<>();
+        int index=-1;
+        for(int i=0;i<21;i++){
+            MultipartFile file = request.getFile("file"+i);
+            if(file!=null){
+                files.add(file);
+                if(index<0){
+                    index=i;
+                }
+            }
+        }
+        //没有上传，当做重复上传
+        if(files.size() == 0){
+            return  new RESTfulResult("201","若要重复上传，必须两张都是新图片！","请勿重复上传！");
+        }
+        //上传图片,拼接在一个url里
+        Map<String,Object> mapValue=new HashMap<>();
+        String url="";
+        try{
+            //如果存在预览图片，查询，把那个位置的图片截取下来
+            if(index > 0){
+                String[] receivePhoto=otmsFeign.getReceivingPhotoByUrl(orderNumber).split(";");
+                for(int i=0;i<index;i++){
+                    url=url+receivePhoto[i]+";";
+                }
+            }
+        }catch (Exception e){
+
+        }
+        //上传图片
+        for (int i=0;i<files.size();i++){
+            MultipartFile file=files.get(i);
+            url += imageFileUtils.updateFile(file,i)+';';
+        }
+        mapValue.put("url",url);
+        mapValue.put("receiptTime",receiptTime);
+        return otmsFeign.addTmstruckReceiptResult(mapValue,orderNumber,resultArrivalAddress);
+    }
+
+    @ApiOperation(value="查询当前报警类型")
+    @PostMapping(value = "/selectWarnSwitch")
+    public RESTfulResult selectWarnSwitch(){
+        return otmsFeign.selectWarnSwitch();
+    }
+
+
+    @ApiOperation(value="是否开启运输报警状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "warnSwitch", value = "运输报警状态", required = false, dataType = "String")
+    })
+    @PostMapping(value = "/inTransitWarn")
+    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio){
+        return otmsFeign.inTransitWarn(warnSwitch,radio);
+    }
+
+    @ApiOperation(value="获得异常信息")
+    @PostMapping("/getTransportAbnormalInfo")
+    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
+                                                  @RequestParam(name = "pageNum") Integer pageNum,
+                                                  @RequestParam(name = "orderNumbers") String orderNumbers,
+                                                  @RequestParam(name = "pageSize") Integer pageSize){
+        mapValue=mapValue!=null?mapValue:new HashMap<>();
+        mapValue.put("orderNumbers",orderNumbers);
+        return otmsFeign.getTransportAbnormalInfo(mapValue,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="车牌号和时间查询路径")
+    @PostMapping("/fullPathVisualizationByCarNumber")
+    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue) throws Exception{
+        return otmsFeign.fullPathVisualizationByCarNumber(mapValue);
+    }
+
+    @ApiOperation("厂外抵达作业")
+    @PostMapping("/getArrivalResult")
+    public Map<String,Object> getArrivalResult(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con,
+                                               String startTime,
+                                               String endTime){
+        return otmsFeign.getArrivalResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("查询抵达图片")
+    @PostMapping("/getArrivalPhoto")
+    public List<String> getArrivalPhoto(@RequestParam String orderNumber) throws Exception{
+        try{
+            String arrivalPhoto=otmsFeign.getArrivalPhoto(orderNumber);
+            return getPhotoByUrl(arrivalPhoto);
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    @ApiOperation("厂外抵达作业")
+    @PostMapping("/getReceiptResult")
+    public Map<String,Object> getReceiptResult(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con,
+                                               String startTime,
+                                               String endTime){
+        return otmsFeign.getReceiptResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("查询签收图片")
+    @PostMapping("/getReceivingPhotoByUrl")
+    public List<String> getReceivingPhotoByUrl(@RequestParam String orderNumber) throws Exception {
+        try{
+            String receivePhoto=otmsFeign.getReceivingPhotoByUrl(orderNumber);
+            return getPhotoByUrl(receivePhoto);
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    //切割字符串，下载图片并返回
+    private List<String> getPhotoByUrl(String urls) throws Exception {
+        List<String> results=new ArrayList<>();
+        String files[]=urls.split(";");
+        for(int i=0;i<files.length && files[i].length()>5;i++){
+            results.add((String)imageFileUtils.downloadFile(files[i]));
+        }
+        return results;
+    }
+
+    @GetMapping("/getCurrentLocation")
+    public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception{
+        return otmsFeign.getCurrentLocation(capcityNumber);
+    }
+    //获取地图顶点
+    @GetMapping(value = "/mapvertexs/findAllAvailableVertex")
+    public RESTfulResult findAllAvailableVertex(){
+        return  otmsFeign.findAllAvailableVertex();
+    }
+
+    //获取最佳路径
+    @GetMapping(value = "/mapvertexs/getObtainTheOptimalPath")
+    public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) throws Exception{
+        return otmsFeign.getObtainTheOptimalPath(startPoint,endPoint);
+    }
+
+    @ApiOperation(value="获取当前订单导航路径")
+    @GetMapping(value = "/mapvertexs/getPathByOrderID")
+    public RESTfulResult getPathByOrderID(@RequestParam("orderId") String orderId,@RequestParam("startStep")  String startStep,@RequestParam("endStep")  String endStep) throws  Exception {
+       return otmsFeign.getPathByOrderID(orderId,startStep,endStep);
+    }
+
+    @ApiOperation(value="查询所有可选地点")
+    @GetMapping(value = "/mapvertexs/findSelections")
+    public RESTfulResult findSelections(){
+        return otmsFeign.findSelections();
+    }
+
+    @ApiOperation(value="查询点")
+    @PostMapping(value = "/getMapVertex")
+    public RESTfulResult getMapVertex(@RequestBody Map<String,Object> map,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return otmsFeign.getMapVertex(map,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="查询边")
+    @PostMapping(value = "/getMapEdge")
+    public RESTfulResult getMapEdge(@RequestBody Map<String,Object> map,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return otmsFeign.getMapEdge(map,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="新增点")
+    @PostMapping(value = "/addMapVertex")
+    public RESTfulResult addMapVertex(@RequestBody Map<String,Object> map){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return otmsFeign.addMapVertex(map);
+    }
+
+    @ApiOperation(value="新增边")
+    @PostMapping(value = "/addMapEdge")
+    public RESTfulResult addMapEdge(@RequestBody Map<String,Object> map){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return otmsFeign.addMapEdge(map);
+    }
+
+    @ApiOperation(value="删除点")
+    @PostMapping(value = "/delMapVertex")
+    public RESTfulResult delMapVertex(@RequestBody Map<String,Object> map){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return otmsFeign.delMapVertex(map);
+    }
+
+    @ApiOperation(value="删除边")
+    @PostMapping(value = "/delMapEdge")
+    public RESTfulResult delMapEdge(@RequestBody Map<String,Object> map){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return otmsFeign.delMapEdge(map);
+    }
+
+    //在途订单列表
+    @PostMapping("/transportationPerformance")
+    public RESTfulResult transportationPerformance(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                   @RequestParam(required = true,defaultValue = "479",name = "apiId")Integer apiId,
+                                                   @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                   @RequestParam(required = false,name = "pageSize")Integer pageSize){
+        return otmsFeign.transportationPerformance(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+    }
+
+    @GetMapping("/getLocationForAddress")
+    public RESTfulResult getLocationForAddress(@RequestParam("address") String address){
+        return otmsFeign.getLocationForAddress(address);
+    }
+
+    @PostMapping("/getAddress")
+    public RESTfulResult getAddress(@RequestBody Map<String,Object> map){
+        return otmsFeign.getAddress(map);
+    }
+}

src/main/java/com/steerinfo/dil/controller/QMSController.java

@@ -0,0 +1,472 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.QmsFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-09-17 14:09
+ */
+@RestController
+@RequestMapping("${api.version}/qms")
+public class QMSController extends BaseRESTfulController {
+
+    @Autowired
+    private QmsFeign qmsFeign;
+
+    @ApiOperation(value="触发电子围栏-->新增排队实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addQueueResult")
+    public Map<String, Object> addQueueResult(String vno){
+        return qmsFeign.addQueueResult(vno);
+    }
+
+    @ApiOperation(value="指令接收-->新增排队链表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/addQueueList")
+    public Map<String, Object> addQueueList(String resultId){
+        return qmsFeign.addQueueList(resultId);
+    }
+
+    @ApiOperation(value="指令接收")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(130)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/orderReceive")
+    public Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer queueType,
+                                            String con
+    ){
+        return qmsFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, queueType,con);
+    }
+
+
+    @ApiOperation(value="查询排队申请")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(125)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getQueueApply")
+    public Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con
+    ){
+        return qmsFeign.getQueueApply(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+
+
+    @ApiOperation(value="查询排队开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(128)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getQueueListByQueueUp")
+    public Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer locationId,
+                                                     String capacityNumber,
+                                                     Integer isSpelling
+    ){
+        return qmsFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, locationId,capacityNumber, isSpelling);
+    }
+
+    @ApiOperation(value="查询排队转移")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(124)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getChangeQueue")
+    public Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
+    ){
+        return qmsFeign.getChangeQueue(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @ApiOperation(value="查询排队取消")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(131)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getQueueCancel")
+    public Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
+    ){
+        return qmsFeign.getQueueCancel(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @ApiOperation(value="修改排队取消实绩：时间、原因")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/updateQueueCancel")
+    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.updateQueueCancel(mapValue);
+    }
+
+    @ApiOperation(value="排队取消-->修改排队链表deleted为1")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/queueCancel")
+    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.queueCancel(mapValue);
+    }
+
+
+    @ApiOperation(value="排队插队-->修改排队链表顺序号为最小")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/queueCutInLine")
+    public Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.queueCutInLine(mapValue);
+    }
+
+
+    @ApiOperation(value="查询排队插队")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(132)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getQueueInsert")
+    public Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
+    ){
+        return qmsFeign.getQueueInsert(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @ApiOperation(value="查询排队结束")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(133)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getQueueEndResult")
+    public Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 String con
+    ){
+        return qmsFeign.getQueueEndResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @ApiOperation(value="链表监控")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(134)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/listMonitor")
+    public Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer isSpelling
+    ){return qmsFeign.listMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,isSpelling);
+    }
+
+    @ApiOperation(value="通过车牌号查询司机接单")
+    @PostMapping("/getOrderReceive/{capacityNumber}")
+    public Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber){
+        return qmsFeign.getOrderReceive(capacityNumber);
+    }
+
+    @ApiOperation(value="通过车牌号取消排队")
+    @PostMapping("/cancelQueue")
+    public Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue){
+        return qmsFeign.cancelQueue(mapValue);
+    }
+
+    @ApiOperation(value="钢材科允许进厂")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
+    })
+    @PostMapping("/allowEnFactory")
+    public Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.allowEnFactory(mapValue);
+    }
+
+    @PostMapping("/modifyLoadWarehouse")
+    public Map<String, Object> modifyLoadWarehouse(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.modifyLoadWarehouse(mapValue);
+    }
+
+    @ApiOperation(value="APP端司机查看排队信息")
+    @GetMapping("getQueueResultByTotalId")
+    public Map<String, Object> getQueueResultByTotalId(String resultTotalId){
+        return  qmsFeign.getQueueResultByTotalId(resultTotalId);
+    }
+
+
+    @ApiOperation(value="单拼链表查看详情")
+    @PostMapping("/getListMonitorMes")
+    public Map<String, Object> getListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.getListMonitorMes(mapValue);
+    }
+
+    @ApiOperation(value="多拼链表查看详情")
+    @PostMapping("/getSpellingListMonitorMes")
+    public Map<String, Object> getSpellingListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.getSpellingListMonitorMes(mapValue);
+    }
+
+
+    @ApiOperation(value="排队结束-->修改deleted = 1")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/queueEndByPDA")
+    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.queueEnd(mapValue);
+    }
+
+    @ApiOperation(value = "判断车辆有没有在圆心里面")
+    @PostMapping("/isInCircle")
+    public Map<String,Object> isInCircle(String longitude,
+                                         String latitude,
+                                         String capacityNo){
+        return qmsFeign.isInCircle(longitude,latitude,capacityNo);
+    }
+
+    @ApiOperation(value = "撤销进厂确认")
+    @PostMapping("/ctrlZQueueAllow")
+    public Map<String,Object> ctrlZQueueAllow(@RequestBody(required = false) Map<String,Object> map){
+        return qmsFeign.ctrlZQueueAllow(map);
+    }
+
+    @PostMapping("/getStoreQueueList")
+    public Map<String, Object> getStoreQueueList(){
+        return qmsFeign.getStoreQueueList();
+    }
+
+
+
+//    @ApiOperation(value="查询进厂排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(184)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getAllQueueMes")
+//    public Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                              Integer apiId,
+//                                              Integer pageNum,
+//                                              Integer pageSize,
+//                                              Integer gatepostId,
+//                                              String con
+//    ){
+//        return qmsFeign.getAllQueueMes(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, gatepostId,con);
+//    }
+
+//    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗名称、转移原因")
+//    @PostMapping("/changeQueue")
+//    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
+//        return qmsFeign.changeQueue(mapValue);
+//    }
+
+
+
+
+//    @ApiOperation(value="通过Id查询排队取消实绩")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+//    })
+//    @PostMapping("/getQueueCancelByResultId/{resultId}")
+//    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
+//        return qmsFeign.getQueueCancelByResultId(resultId);
+//    }
+
+
+
+//    @ApiOperation(value="汽车监控")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(135)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/capacityMonitor")
+//    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                               Integer apiId,
+//                                               Integer pageNum,
+//                                               Integer pageSize,
+//                                               Integer gridType,
+//                                               String con
+//    ){
+//        return qmsFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize, gridType,con);
+//    }
+
+
+
+
+//    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
+//    @PostMapping("/getQueueStatusList")
+//    public Map<String, Object> getQueueStatusList(){
+//        return qmsFeign.getQueueStatusList();
+//    }
+
+
+
+//    @ApiOperation(value="查询执行中订单")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(156)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getAllExecutionOrder")
+//    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                    Integer apiId,
+//                                                    Integer pageNum,
+//                                                    Integer pageSize,
+//                                                    Integer orderType,
+//                                                    Integer status,
+//                                                    String con
+//    ){
+//        return qmsFeign.getAllExecutionOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, status,con);
+//    }
+
+//    @ApiOperation(value="查询某一个门岗的排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
+//    })
+//    @PostMapping("/getListQueueMes")
+//    public RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue){
+//        return qmsFeign.getListQueueMes(mapValue);
+//    }
+
+
+//    @ApiOperation(value="查询仓库排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(187)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueApply")
+//    public Map<String, Object> getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                      Integer apiId,
+//                                                      Integer pageNum,
+//                                                      Integer pageSize,
+//                                                      Integer platformId,
+//                                                      String con
+//    ){return qmsFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+//    }
+//    @ApiOperation(value="查询仓库排队转移")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(193)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueChange")
+//    public Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                       Integer apiId,
+//                                                       Integer pageNum,
+//                                                       Integer pageSize,
+//
+//                                                       String con
+//    ){return qmsFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+//    }
+
+
+//    @ApiOperation(value="查询仓库排队结束")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(194)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueEndMes")
+//    public Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                       Integer apiId,
+//                                                       Integer pageNum,
+//                                                       Integer pageSize,
+//                                                       String con
+//    ){return qmsFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+//    }
+    @ApiOperation(value="查看所有物资")
+    @GetMapping("/getAllModel")
+    public Map<String, Object>  getAllModel(String index){
+        return qmsFeign.getAllModel(index);
+    }
+
+    @ApiOperation(value="查看所有未轧物资")
+    @GetMapping("/getAllModelUnrolled")
+    public Map<String, Object>  getAllModelUnrolled(String index){
+        return qmsFeign.getAllModelUnrolled(index);
+    }
+
+    @ApiOperation(value="添加未轧物资")
+    @PostMapping("/addModel")
+    public Map<String, Object> addModel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.addModel(mapValue);
+    }
+
+    @ApiOperation(value="修改未轧物资")
+    @PostMapping("/updateModel")
+    public Map<String, Object> updateModel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.updateModel(mapValue);
+    }
+
+    @ApiOperation(value="删除未轧物资")
+    @PostMapping("/deleteModel")
+    public Map<String, Object> deleteModel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.deleteModel(mapValue);
+    }
+}

src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -0,0 +1,1342 @@
+package com.steerinfo.dil.controller;
+import com.steerinfo.dil.feign.RmsFeign;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+@RestController
+@RequestMapping("${api.version}/rms")
+public class RMScontroller {
+    @Autowired
+    RmsFeign rmsFeign;
+
+    /**
+     * @author huk
+     * @return
+     */
+    //查询所有作业环节
+    @ApiOperation(value="查询所有作业环节")
+    @PostMapping("/getLink")
+    public Map<String, Object> getlink(){
+        return  rmsFeign.getlink();
+    }
+
+    /**
+     * @author huk
+     * @return
+     */
+    //新增运输路线
+    @ApiOperation(value="新增运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
+    })
+    @PostMapping("/insertSelective")
+    public Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal){
+        return rmsFeign.insertSelective(mapVal);
+    }
+
+
+    @ApiOperation(value="查询运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "249", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getAllLineDesk")
+    public Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer apiId,
+                                        Integer lineType,
+                                        String con){
+        return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, lineType, con);
+    }
+
+    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
+    @PostMapping("/deleteMaterialForInward")
+    public Map<String, Object> deleteMaterialForInward(@RequestBody(required = false) Map<String,Object> mapValue){
+        return rmsFeign.deleteMaterialForInward(mapValue);
+    }
+
+    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
+    @PostMapping("/updateMaterialForInward")
+    public Map<String, Object> updateMaterialForInward(@RequestBody(required = false) Map<String,Object> mapValue){
+        return rmsFeign.updateMaterialForInward(mapValue);
+    }
+
+    @ApiOperation(value="删除数据为了内转")
+    @PostMapping("/getGateCalculateMes")
+    public Map<String, Object> getGateCalculateMes(@RequestParam Integer lineId){
+        return rmsFeign.getGateCalculateMes(lineId);
+    }
+
+    @ApiOperation(value = "根据主键查询出数据以供修改")
+    @PostMapping("/getLinkToUpdate")
+    public Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId) {
+        return rmsFeign.getLinkToUpdate(lineId);
+    }
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据")
+    @PostMapping("/updateByPrimaryKeySelective")
+    public Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal) {
+        return rmsFeign.updateByPrimaryKeySelective(mapVal);
+    }
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
+    @PostMapping("/updateRmsLine")
+    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal){
+        return  rmsFeign.updateRmsLine(mapVal);
+    }
+
+    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
+    @PostMapping("/getCountNumber")
+    public Map<String, Object> getCountNumber(@RequestParam Integer lineId) {
+        return rmsFeign.getCountNumber(lineId);
+    }
+
+    //查询所有作业环节
+    @ApiOperation(value="新增作业环节")
+    @PostMapping("/LinkInsertSelective")
+    public Map<String,Object> LinkInsertSelective(@RequestBody(required = false) Map<String,Object> mapValue){
+        return rmsFeign.LinkInsertSelective(mapValue);
+    }
+
+    //********************************************************************************************************
+
+    @ApiOperation(value="创建", notes="根据RmsCarDriver对象创建")
+    @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
+    @PostMapping(value = "/insertCarDriver")
+    public Map<String, Object> insertCarDriver(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertCarDriver(map);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
+    })
+    @PostMapping(value = "/updateCarDriver", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateCarDriver(@RequestBody Map<String, Object> map){
+        return rmsFeign.updateCarDriver(map);
+    }
+
+    @ApiOperation(value="删除司机信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息删除司机信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
+    })
+    @PostMapping(value = "/deleteCarDriver/{id}")
+    Map<String, Object> deleteCarDriver(@PathVariable("id") BigDecimal id) {
+        return rmsFeign.deleteCarDriver(id);
+    }
+
+    @ApiOperation(value="获取司机详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getCarDriverById/{id}")
+    public Map<String, Object> getCarDriverById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getCarDriverById(id);
+    }
+    @PostMapping("/getCarDriverList")
+    @ApiOperation(value = "模糊查询司机")
+    public Map<String, Object> getCarDriverList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String con) {
+
+        return rmsFeign.getCarDriverList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
+    //获取承运商列表
+    @ApiOperation(value="获取承运商列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+    @PostMapping("/getCarrierList")
+    public Map<String, Object> getCarrierList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
+    ){
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return   rmsFeign.getCarrierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+    @ApiOperation(value="新建承运商", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
+    @PostMapping(value = "/insertCarrier")
+    public Map<String, Object> insertCarrier(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertCarrier(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
+    @PostMapping(value = "/deleteCarrier/{id}")
+    public Map<String, Object> deleteCarrier(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteCarrier(id);
+    }
+
+    @ApiOperation(value="更新承运商", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
+    @PostMapping(value = "/updateCarrier")
+    public Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateCarrier(map);
+    }
+    @ApiOperation(value="根据id查询详细承运商信息", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
+    @PostMapping(value = "/getCarrierById/{id}")
+    public Map<String, Object> getCarrierById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getCarrierById(id);
+    }
+//    获取中标区域
+    @ApiOperation(value="展示中标区域信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "406", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "id", value = "中标id", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getCarrierBidAreaList")
+    public Map<String, Object> getCarrierBidAreaList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
+    ){
+        return   rmsFeign.getCarrierBidAreaList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+    //    处理承运商照片
+    @PostMapping(value = "/uploadCarrier1")
+    public String uploadCarrier1(@RequestParam ("file") MultipartFile multipartFile){
+        return rmsFeign.uploadCarrier1(multipartFile);
+    }
+
+
+
+
+    //    处理承运商照片
+    @PostMapping("/uploadCarrier2")
+    public int uploadCarrier2(@RequestParam("file") MultipartFile multipartFile){
+        return rmsFeign.uploadCarrier2(multipartFile);
+    }
+    //    处理承运商照片
+    @PostMapping("/uploadCarrier3")
+    public int uploadCarrier3(@RequestParam("file") MultipartFile multipartFile){
+        return rmsFeign.uploadCarrier3(multipartFile);
+    }
+    //获取物资列表
+    @ApiOperation(value="获取物资列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getMaterialList")
+    public Map<String, Object> getMaterialList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
+    ){
+        return   rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+
+
+
+    @ApiOperation(value="新增物资", notes="根据rmsMaterial对象创建")
+    @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
+    @PostMapping(value = "/insertMaterial")
+    public Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertMaterial(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
+    @PostMapping(value = "/deleteMaterial/{id}")
+    public Map<String, Object> deleteMaterial(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteMaterial(id);
+    }
+
+    @ApiOperation(value="更新物资", notes="根据rmsMaterial对象创建")
+    @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
+    @PostMapping(value = "/updateMaterial")
+    public Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateMaterial(map);
+    }
+    @ApiOperation(value="根据id查询原料信息", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
+    @PostMapping(value = "/getMaterialById/{id}")
+    public Map<String, Object> getMaterialById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getMaterialById(id);
+    }
+
+    @ApiOperation(value="获取人员信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+    @PostMapping("/getPersonnelList")
+    public Map<String, Object> getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                String con
+    ){
+
+        return   rmsFeign.getPersonnelList(mapVal==null?new HashMap<>():mapVal, apiId, pageNum, pageSize,con);
+    }
+    @ApiOperation(value="新增人员信息", notes="根据rmsMaterial对象创建")
+    @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
+    @PostMapping(value = "/insertPersonnel")
+    public Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertPersonnel(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsPersonnel对象创建")
+    @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
+    @PostMapping(value = "/deletePersonnel/{id}")
+    public Map<String, Object> deletePersonnel(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deletePersonnel(id);
+    }
+
+    @ApiOperation(value="更新人员信息", notes="根据rmsMaterial对象创建")
+    @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
+    @PostMapping(value = "/updatePersonnel")
+    public Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updatePersonnel(map);
+    }
+    @ApiOperation(value="根据id更新详细人员信息", notes="根据rmsPersonnel对象创建")
+    @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
+    @PostMapping(value = "/getPersonnelById/{personnelId}")
+    public Map<String, Object> getPersonnelById(@PathVariable("personnelId")BigDecimal personnelId){
+        return rmsFeign.getPersonnelById(personnelId);
+    }
+
+    @ApiOperation(value="获取托运人列表")
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+    @PostMapping("/getShipperList")
+    public Map<String, Object> getShipperList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
+    ){
+        return   rmsFeign.getShipperList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @ApiOperation(value="新增托运人信息", notes="根据rmsShipper对象创建")
+    @ApiImplicitParam(name = "rmsShipper", value = "详细实体rmsShipper", required = true, dataType = "rmsShipper")
+    @PostMapping(value = "/insertShipper")
+    public Map<String, Object> insertShipper(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertShipper(map);
+    }
+
+
+    @ApiImplicitParam(name = "托运人id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteShipper/{id}")
+    public Map<String, Object> deleteShipper(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteShipper(id);
+    }
+
+    @ApiOperation(value="更新托运人信息", notes="根据rmsShipper对象创建")
+    @ApiImplicitParam(name = "rmsShipper", value = "详细实体rmsShipper", required = true, dataType = "rmsShipper")
+    @PostMapping(value = "/updateShipper")
+    public Map<String, Object> updateShipper(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateShipper(map);
+    }
+    @ApiOperation(value="根据id查询详细托运人信息", notes="根据rmsShipper对象创建")
+    @ApiImplicitParam(name = "托运人id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/getShipperById/{id}")
+    public Map<String, Object> getShipperById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getShipperById(id);
+    }
+//    获取供应商列表
+
+    @ApiOperation(value="展示供应商信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+    @PostMapping("/getSupplierList")
+    public Map<String, Object> getSupplierList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
+    ){
+        return   rmsFeign.getSupplierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+    @ApiOperation(value="新增供应商信息", notes="根据rmsSupplier对象创建")
+    @ApiImplicitParam(name = "rmsSupplier", value = "详细实体rmsSupplier", required = true, dataType = "rmsSupplier")
+    @PostMapping(value = "/insertSupplier")
+    public Map<String, Object> insertSupplier(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertSupplier(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsSupplier对象创建")
+    @ApiImplicitParam(name = "承运商id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteSupplier/{id}")
+    public Map<String, Object> deleteSupplier(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteSupplier(id);
+    }
+
+    @ApiOperation(value="更新供应商信息", notes="根据rmsSupplier对象创建")
+    @ApiImplicitParam(name = "rmsSupplier", value = "详细实体rmsSupplier", required = true, dataType = "rmsSupplier")
+    @PostMapping(value = "/updateSupplier")
+    public Map<String, Object> updateSupplier(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateSupplier(map);
+    }
+    @ApiOperation(value="根据id查询供应商信息", notes="根据rmsSupplier对象创建")
+    @ApiImplicitParam(name = "承运商id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/getSupplierById/{id}")
+    public Map<String, Object> getSupplierById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getSupplierById(id);
+    }
+//    展示运力信息
+
+    @ApiOperation(value="新增运力信息", notes="根据rmsCapacity对象创建")
+    @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "rmsCapacity")
+    @PostMapping(value = "/insertCapacity")
+    public Map<String, Object> insertCapacity(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertCapacity(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "运力id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteCapacity/{id}")
+    public Map<String, Object> deleteCapacity(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteCapacity(id);
+    }
+
+    @ApiOperation(value="获取运力详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getCapacityById/{id}")
+    public Map<String,Object> getCapacityById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getCapacityById(id);
+    }
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCapacity信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short"),
+            @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "RmsCapacity")
+    })
+    @PostMapping(value = "/updateCapacity", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateCapacity( @RequestBody Map<String, Object> map){
+
+        return rmsFeign.updateCapacity(map);
+    }
+    @PostMapping("/getCapacityList")
+    @ApiOperation(value = "模糊查询运力")
+    public Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String con,
+                                               String carrierSSOId) {
+
+        return rmsFeign.getCapacityList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,carrierSSOId);
+    }
+
+    @ApiOperation(value="新增汽车衡信息", notes="根据rmsCapacity对象创建")
+    @ApiImplicitParam(name = "rmsTruckCalculate", value = "详细实体rmsTruckCalculate", required = true, dataType = "rmsTruckCalculate")
+    @PostMapping(value = "/insertTruckCalculate")
+    public Map<String, Object> insertTruckCalculate(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertTruckCalculate(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "汽车衡id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteTruckCalculate/{id}")
+    public Map<String, Object> deleteTruckCalculate(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteTruckCalculate(id);
+    }
+    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "汽车衡物资中间表id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteTruckCalculateMaterial/{id}")
+    public Map<String, Object> deleteTruckCalculateMaterial(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteTruckCalculateMaterial(id);
+    }
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "rmsTruckCalculate", value = "详细实体rmsTruckCalculate", required = true, dataType = "RmsTruckCalculate")
+    })
+    @PostMapping(value = "/updateTruckCalculate", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateTruckCalculate(@RequestBody Map<String, Object> map){
+        return rmsFeign.updateTruckCalculate(map);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getTruckCalculateById/{id}")
+    public Map<String,Object> getTruckCalculateById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getTruckCalculateById(id);
+    }
+    @PostMapping("/getCalculateOfMaterialList")
+    @ApiOperation(value="根据id查询汽车横下的物资表")
+    public Map<String,Object> getCalculateOfMaterialList(@RequestBody(required = false)Map<String, Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         BigDecimal truckCalculateId){
+        return rmsFeign.getCalculateOfMaterialList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,truckCalculateId);
+    }
+
+    @PostMapping("/getTruckCalculateList")
+    @ApiOperation(value = "模糊查询汽车衡")
+    public Map<String, Object> getTruckCalculateList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId,
+                                                     String con) {
+
+        return rmsFeign.getTruckCalculateList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+    @ApiOperation(value="新增汽车衡下的物资", notes="根据rmsWarehouse对象创建")
+    @ApiImplicitParam(name = "rmsTruckCalculateMaterial", value = "详细实体rmsTruckCalculateMaterial", required = true, dataType = "rmsTruckCalculateMaterial")
+    @PostMapping(value = "/insertTruckCalculateOfMaterial")
+    public Map<String, Object> insertTruckCalculateOfMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertTruckCalculateOfMaterial(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "仓库id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteWarehouse/{id}")
+    public Map<String, Object> deleteWarehouse(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteWarehouse(id);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "RmsWarehouse")
+    })
+    @PostMapping(value = "/updateWarehouse", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateWarehouse( @RequestBody Map<String, Object> map){
+        return rmsFeign.updateWarehouse(map);
+    }
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getWarehouseById/{id}")
+    public Map<String, Object> getWarehouseById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getWarehouseById(id);
+    }
+
+    @PostMapping("/getWarehouseList")
+    @ApiOperation(value = "模糊查询原料仓库")
+    public Map<String, Object> getWarehouseList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String con) {
+
+        return rmsFeign.getWarehouseList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+    @ApiOperation(value="展示司机排班信息", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getDriverCapacityList")
+    public Map<String, Object> getDriverCapacityList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId){
+        return rmsFeign.getDriverCapacityList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="创建", notes="根据RmsDriverCapacity对象创建")
+    @ApiImplicitParam(name = "rmsDriverCapacity", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
+    @PostMapping(value = "/insertDriverCapacity")
+    public Map<String, Object> insertDriverCapacity(@RequestBody(required = false) Map<String, Object> map ){
+        return rmsFeign.insertDriverCapacity(map);
+    }
+
+
+    @ApiOperation(value="展示门岗信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+    @PostMapping("/getGatepostList")
+    public Map<String, Object> getGatepostList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
+    ){
+        return   rmsFeign.getGatepostList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+    @ApiOperation(value="新增门岗信息", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParam(name = "rmsGatepost", value = "详细实体rmsGatepost", required = true, dataType = "rmsGatepost")
+    @PostMapping(value = "/insertGatepost")
+    public Map<String, Object> insertGatepost(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertGatepost(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParam(name = "门岗id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteGatepost/{id}")
+    public Map<String, Object> deleteGatepost(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteGatepost(id);
+    }
+
+    @ApiOperation(value="更新门岗信息", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParam(name = "rmsGatepost", value = "详细实体rmsGatepost", required = true, dataType = "rmsGatepost")
+    @PostMapping(value = "/updateGatepost")
+    public Map<String, Object> updateGatepost(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateGatepost(map);
+    }
+    @ApiOperation(value="根据id查询门岗信息", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParam(name = "门岗id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/getGatepostById/{id}")
+    public Map<String, Object> getGatepostById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getGatepostById(id);
+    }
+    @ApiOperation(value="根据id查询门岗规则信息", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "门岗id", value = "id", required = true, dataType = "int")
+    })
+    @PostMapping(value = "/getGatepostRulesById/{id}")
+    public Map<String, Object> getGatepostRulesById(@PathVariable("id")BigDecimal id,
+                                                    Integer apiId){
+        return rmsFeign.getGatepostRulesById(id,apiId);
+    }
+    @ApiOperation(value="展示门岗规则信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+    @PostMapping("/getGatepostRulesList")
+    public Map<String, Object> getGatepostRulesList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String con
+    ){
+        return   rmsFeign.getGatepostRulesList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @ApiOperation(value="删除", notes="根据rulesId删除")
+    @ApiImplicitParam(name = "门岗规则id", value = "rulesId", required = true, dataType = "int")
+    @PostMapping(value = "/deleteGatepostRules/{rulesId}")
+    public Map<String, Object> deleteGatepostRules(@PathVariable("rulesId") BigDecimal rulesId) {
+        return rmsFeign.deleteGatepostRules(rulesId);
+    }
+    @ApiOperation(value="新增门岗规则")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "门岗规则", required = false, dataType = "Map"),
+    })
+    @PostMapping("/insertGatepostRule")
+    public Map<String, Object> insertGatepostRule(@RequestBody(required = false) Map<String,Object> mapValue){
+        return rmsFeign.insertGatepostRule(mapValue);
+    }
+    @ApiOperation(value="获取门岗名")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "门岗id", value = "gatepostId", required = true, dataType = "int")
+    })
+    @PostMapping("/getGatepostName/{gatepostId}")
+    public Map<String, Object> getGatepostName(@PathVariable("gatepostId") BigDecimal gatepostId){
+        return rmsFeign.getGatepostName(gatepostId);
+    }
+
+    @PostMapping("/getMaterialTypeList")
+    @ApiOperation(value = "框计算物资种类")
+    public Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId,
+                                                   String con) {
+
+        return rmsFeign.getMaterialTypeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+    //*******************************下拉框************************
+    @GetMapping("getCapacityTypeId")
+    @ApiOperation(value = "得到下拉运力id")
+    public Map<String, Object> getCapacityTypeId() {
+        return rmsFeign.getCapacityTypeId();
+    }
+
+    @GetMapping(value = "getWarehouseTypeId")
+    @ApiOperation(value = "获取原料仓库类型下拉id")
+    public Map<String, Object> getWarehouseTypeId(){
+        return rmsFeign.getWarehouseTypeId();
+    }
+
+    @GetMapping(value = "getPortId")
+    @ApiOperation(value = "获取港存库所属港口下拉id")
+    public Map<String, Object> getPortId(){
+        return rmsFeign.getPortId();
+    }
+
+    @GetMapping(value="getCarrierId")
+    @ApiOperation(value = "获取承运商下拉id")
+    public Map<String,Object> getCarrierId(){
+        return rmsFeign.getCarrierId();
+    }
+
+    @GetMapping("getMaterialTypeId")
+    @ApiOperation(value = "得到下拉物资类型id")
+    public Map<String, Object> getMaterialTypeId() {
+        return rmsFeign.getMaterialTypeId();
+    }
+
+    @GetMapping("getUnitOfMeasureId")
+    @ApiOperation(value = "得到下拉计量id")
+    public Map<String, Object> getUnitOfMeasureId() {
+        return rmsFeign.getUnitOfMeasureId();
+    }
+
+    @GetMapping("getShipperId")
+    @ApiOperation(value = "得到下拉托运人id")
+    public Map<String, Object> getShipperId() {
+        return rmsFeign.getShipperId();
+    }
+
+    @GetMapping("getGatepostRulesId")
+    @ApiOperation(value = "得到下拉门岗规则id")
+    public Map<String, Object> getGatepostRulesId() {
+        return rmsFeign.getGatepostRulesId();
+    }
+
+    @GetMapping("getTransportTypeId")
+    @ApiOperation(value = "运输类型下拉")
+    public Map<String,Object> getTransportTypeId(){
+        return rmsFeign.getTransportTypeId();
+    }
+
+    @GetMapping("/getVehicleTypeId")
+    @ApiOperation(value = "得到下拉车辆类型id")
+    public Map<String, Object> getVehicleTypeId() {
+        return rmsFeign.getVehicleTypeId();
+    }
+    //通知
+    @ApiOperation(value = "获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getNoticeList")
+    public Map<String, Object> getNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return rmsFeign.getNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="新增公告信息", notes="根据DilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
+    @PostMapping(value = "/insertNotice")
+    public Map<String, Object> insertNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertNotice(map);
+    }
+
+    @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
+    @PostMapping(value = "/updateNotice", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.updateNotice(map);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/deleteNotice/{id}")//BigDecimal
+    public Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id) {
+        return rmsFeign.deleteNotice(id);
+    }
+
+
+    //港口
+    @ApiOperation(value = "获取港口", notes = "分页查询")
+    @PostMapping(value = "/getPort")
+    public Map<String, Object> getPortList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPortList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
+    //码头
+    @ApiOperation(value = "获取码头", notes = "分页查询")
+    @PostMapping(value = "/getPier")
+    public Map<String, Object> getPierList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPierList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value = "获取港存堆场", notes = "分页查询")
+    @PostMapping(value = "/getYardList")
+    public Map<String, Object> getPortYardList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPortYardList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getNoticeById/{id}")
+    public Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getNoticeById(id);
+    }
+
+    //油价
+    @ApiOperation(value = "获取油价信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+
+    @PostMapping(value = "/getOilPriceResultList")
+    public Map<String, Object> getOilPriceResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return rmsFeign.getOilPriceResultList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="新增油价信息", notes="根据DilNotice对象创建")
+    @ApiImplicitParam(name = "addOilPrice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
+    @PostMapping(value = "/insertOilPrice")
+    public Map<String, Object> insertOilPrice(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertOilPrice(map);
+    }
+
+    @ApiOperation(value = "更新油价信息", notes = "根据油价ID来更新油价")
+    @PostMapping(value = "/updateOilPrice")
+    public Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.updateOilPrice(mapValue);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/deleteOilPrice/{id}")//BigDecimal
+    public Map<String, Object> deleteOilPrice(@PathVariable("id") BigDecimal id) {
+        return rmsFeign.deleteOilPrice(id);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getOilPriceById/{id}")
+    public Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getOilPriceById(id);
+    }
+
+
+
+
+
+//*******************************下拉框************************
+
+    @GetMapping("getNoticeTypeId")
+    @ApiOperation(value = "得到公告类型Id")
+    public Map<String,Object> getNoticeTypeId(){
+        return rmsFeign.getNoticeTypeId();
+    }
+
+
+
+    @GetMapping("getPortType")
+    @ApiOperation(value = "得到港口类型Id")
+    public Map<String,Object> getPortType(){
+        return rmsFeign.getPortType();
+    }
+
+    @ApiOperation(value="新增原料仓库信息", notes="根据rmsWarehouse对象创建")
+    @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
+    @PostMapping(value = "/insertWarehouse")
+    public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertWarehouse(map);
+    }
+
+
+
+    //展示收货客户信息
+    @ApiOperation(value = "获取收货客户信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getConsigneeList")
+    public Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String con
+    ) {
+
+        return rmsFeign.getConsigneeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="新增收货客户信息", notes="根据rmsConsignee对象创建")
+    @ApiImplicitParam(name = "rmsConsignee", value = "详细实体rmsConsignee", required = true, dataType = "rmsConsignee")
+    @PostMapping(value = "/insertConsignee")
+    public Map<String, Object> insertConsignee(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertConsignee(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsConsignee对象创建")
+    @ApiImplicitParam(name = "收货客户信息id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteConsignee/{id}")
+    public Map<String, Object> deleteConsignee(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteConsignee(id);
+    }
+
+    @ApiOperation(value="获取运力信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getConsigneeById/{id}")
+    public Map<String,Object> getConsigneeById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getConsigneeById(id);
+    }
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCapacity信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short"),
+            @ApiImplicitParam(name = "rmsConsignee", value = "详细实体rmsConsignee", required = true, dataType = "RmsConsignee")
+    })
+    @PostMapping(value = "/updateConsignee", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateConsignee( @RequestBody Map<String, Object> map){
+
+        return rmsFeign.updateConsignee(map);
+    }
+
+    /*
+     *边写边搜索承运商
+     * */
+    @ApiOperation(value="根据用户输入输出承运商", notes="模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "con",value = "用户输入的承运商名", required = false, dataType = "String")
+    })
+    @PostMapping("/getCarrierName")
+    public Map<String,Object> getCarrierName(@RequestParam(value ="state") String state){
+        return  rmsFeign.getCarrierName(state);
+
+    }
+
+
+
+    //港口
+    @PostMapping("/insertPort")
+    public Map<String, Object> insertPort(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPort(map);
+    }
+
+    //
+    @PostMapping("/insertPier")
+    public Map<String, Object> insertPier(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPier(map);
+    }
+
+    //港口
+    @PostMapping("/insertPortYard")
+    public Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPortYard(map);
+    }
+
+    @PostMapping(value = "/deletePort/{portId}")//BigDecimal
+    public Map<String, Object> deletePort(@PathVariable("portId") BigDecimal portId) {
+        return rmsFeign.deletePort(portId);
+    }
+
+    @PostMapping(value = "/deletePier/{pierId}")//BigDecimal
+    public Map<String, Object> deletePier(@PathVariable("pierId") BigDecimal pierId) {
+        return rmsFeign.deletePier(pierId);
+    }
+
+    @PostMapping(value = "/deletePortYard/{warehouseId}")//BigDecimal
+    public Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId) {
+        return rmsFeign.deletePortYard(warehouseId);
+    }
+
+
+    /**
+     * 得到二级部门的下拉
+     * @return
+     */
+    @GetMapping("/getSecondShipper")
+    public Map<String,Object> getSecondShipper() {
+        return  rmsFeign.getSecondShipper();
+    }
+
+    /**
+     * 得到三级部门的下拉
+     * @return
+     */
+    @GetMapping("/getThirdShipper")
+    public Map<String,Object> getThirdShipper(@RequestParam Integer shipperId) {
+        return  rmsFeign.getThirdShipper(shipperId);
+    }
+
+    /**
+     * 新增人员权限
+     * @return
+     */
+    @PostMapping("/addPersonnel")
+    public Map<String,Object> addPersonnel(@RequestBody Map<String,Object> map) {
+        return  rmsFeign.addPersonnel(map);
+    }
+
+    /**
+     * 查询SSO主键和机构编码
+     * @return
+     */
+    @PostMapping("/getShipperMap")
+    public Map<String,Object> getShipperMap(@RequestParam Integer shipperId) {
+        return  rmsFeign.getShipperMap(shipperId);
+    }
+    //根据运力id查询承运商
+    @PostMapping(value = "getCarrierNameById/{id}")
+    public Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getCarrierNameById(id);
+    }
+   //根据司机id查询承运商
+   @PostMapping(value = "getCarrierNameByDriverId/{id}")
+   public Map<String,Object> getCarrierNameByDriverId(@PathVariable("id") BigDecimal id){
+       return rmsFeign.getCarrierNameByDriverId(id);
+   }
+
+
+
+    /*
+        txf
+     */
+    @ApiOperation(value="新增组织结构实绩")
+    @PostMapping(value = "/addShipperResult")
+    public Map<String,Object>  addShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.addShipperResult(map);
+    }
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "/updateShipperResult")
+    public Map<String,Object>  updateShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateShipperResult(map);
+    }
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "/deleteShipperResult")
+    public Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.deleteShipperResult(map);
+    }
+
+    @PostMapping(value = "/getCarrierNameBySSOId")
+    public Map<String,Object> getCarrierNameBySSOId(@RequestParam("carrierSSOId") String carrierSSOId){
+        return rmsFeign.getCarrierNameBySSOId(carrierSSOId);
+    }
+    //边输边查收货客户父节点
+    @PostMapping(value = "getConsigneeFarId")
+    public Map<String,Object> getConsigneeFarId(@RequestParam(value ="state") String state){
+        return rmsFeign.getConsigneeFarId(state);
+    }
+
+    @PostMapping("/isInHere")
+    public Integer isInHere(@RequestParam String personnelJobNumber) {
+        return rmsFeign.isInHere(personnelJobNumber);
+    }
+
+
+    @ApiOperation(value="创建", notes="添加油品名称")
+    @ApiImplicitParam(name = "oilTypeName", value = "油品名称", required = true, dataType = "String")
+    @PostMapping(value = "/addOilType")
+    public Map<String, Object> addOilType(String oilTypeName){
+        return rmsFeign.addOilType(oilTypeName);
+    }
+
+    @ApiOperation(value="创建", notes="查询油品名称")
+    @PostMapping(value = "/oilNameSelect")
+    public Map<String, Object> oilNameSelect(){
+        return rmsFeign.oilNameSelect();
+    }
+
+    @ApiOperation("解除承运商和车辆的绑定关系")
+    @PostMapping("/deleteCapacityCarrier")
+    public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.deleteCapacityCarrier(map!=null?map:new HashMap<>());
+    }
+
+    @ApiOperation("罗棒的")
+    @PostMapping("/getInwardContractMaterial")
+    public RESTfulResult getInwardContractMaterial(@RequestBody(required = false) Map<String,Object> map,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   String con){
+        return rmsFeign.getInwardContractMaterial(map!=null?map:new HashMap<>(),apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation("罗棒的")
+    @PostMapping("/insertMaterialType")
+    public RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String,Object> map) {
+        return rmsFeign.insertMaterialType(map);
+    }
+
+    @ApiOperation("渲染运力修改数据")
+    @PostMapping("/getCapacityInfoById/{id}")
+    public Map<String, Object> getCapacityInfoById(@PathVariable("id") Integer id){
+        return rmsFeign.getCapacityInfoById(id);
+    }
+
+   //获取货权转移送达单位列表
+    @PostMapping(value = "/getCargoDep")
+    public Map<String,Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     Integer apiId,
+                                     Integer pageNum,
+                                     Integer pageSize,
+                                     String con){
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return rmsFeign.getCargoDep(mapValue,apiId,pageNum,pageSize,con);
+    }
+    //删除货权转移送达单位
+    @PostMapping(value = "/deleteCargoDep")
+    public Map<String, Object> deleteCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.deleteCargoDep(map);
+    }
+    @PostMapping(value = "/getCargoDepById/{id}")
+    public Map<String,Object> getCargoDepById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getCargoDepById(id);
+    }
+
+    //更新货权转移送达单位
+    @PostMapping(value = "/updateCargoDep")
+    public Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.updateCargoDep(map);
+    }
+
+    //新增货权转移送达单位
+    @PostMapping(value = "/insertCargoDep")
+    public Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.insertCargoDep(map);
+    }
+
+
+    //收货客户注册
+    @PostMapping(value = "/signConsignee")
+    public Map<String, Object> signConsignee(@RequestBody Map<String,Object> mapVal){
+        return rmsFeign.signConsignee(mapVal);
+    }
+
+    //边输边查港口名称
+    @PostMapping(value = "/getPortName")
+    public Map<String, Object> getPortName(String index){
+        return rmsFeign.getPortName(index);
+    }
+
+    //边输边查码头名称
+    @PostMapping(value = "/getPierName")
+    public Map<String, Object> getPierName(String index){
+        return rmsFeign.getPierName(index);
+    }
+
+
+    @ApiOperation(value="获取船运合同管理列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+    @PostMapping("/selectbmsshipContractPriceList")
+    public Map<String, Object> selectbmsshipContractPriceList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                              Integer apiId,
+                                                              Integer pageNum,
+                                                              Integer pageSize,
+                                                              String con,
+                                                              String startTime,
+                                                              String endTime
+    ){
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return   rmsFeign.selectbmsshipContractPriceList(mapValue, apiId, pageNum, pageSize, con, startTime, endTime);
+    }
+
+
+    //新增船运合同管理
+    @PostMapping(value = "/insertBmsshipContractPrice")
+    public Map<String, Object> insertBmsshipContractPrice(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.insertBmsshipContractPrice(map);
+    }
+
+    //修改船运合同管理
+    @PostMapping(value = "/updateBmsshipContractPrice")
+    public Map<String, Object> updateBmsshipContractPrice(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.updateBmsshipContractPrice(map);
+    }
+
+    //修改船运合同管理
+    @PostMapping(value = "/deleteBmsshipContractPrice")
+    public Map<String, Object> deleteBmsshipContractPrice(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.deleteBmsshipContractPrice(map);
+    }
+
+    //修改船运合同管理
+    @PostMapping(value = "/selectBmsshipPriceList/{id}")
+    public Map<String, Object> selectBmsshipPriceList(@PathVariable("id") BigDecimal id){
+        return rmsFeign.selectBmsshipPriceList(id);
+    }
+
+    @ApiOperation(value = "查询运力类型")
+    @PostMapping("/getCapacityType")
+    public Map<String, Object> getCapacityType(@RequestBody(required = false) Map<String,Object> map,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            String con) {
+        if(map==null){
+           map=new HashMap<>();
+        }
+        return rmsFeign.getCapacityType(map,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation(value="新增运力类型")
+    @PostMapping(value = "/insertCapacityType")
+    public Map<String, Object> insertCapacityType(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertCapacityType(map);
+    }
+
+    @ApiOperation(value="删除运力类型")
+    @PostMapping(value = "/deleteCapacityType/{id}")
+    public Map<String, Object> deleteCapacityType(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteCapacityType(id);
+    }
+
+    @ApiOperation(value = "查询运输范围")
+    @PostMapping("/getTransRange")
+    public Map<String, Object> getTransRange(@RequestBody(required = false) Map<String,Object> map,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con) {
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return rmsFeign.getTransRange(map,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation(value="新增运输范围")
+    @PostMapping(value = "/insertTransRange")
+    public Map<String, Object> insertTransRange(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertTransRange(map);
+    }
+
+    @ApiOperation(value = "查询APP备注")
+    @PostMapping("/getMaterialCoke")
+    public Map<String, Object> getMaterialCoke(@RequestBody(required = false) Map<String,Object> map,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con) {
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return rmsFeign.getMaterialCoke(map,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation(value="新增APP备注")
+    @PostMapping(value = "/insertMaterialCoke")
+    public Map<String, Object> insertMaterialCoke(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertMaterialCoke(map);
+    }
+
+    @ApiOperation(value="删除APP备注")
+    @PostMapping(value = "/deleteMaterialCoke/{id}")
+    public Map<String, Object> deleteMaterialCoke(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteMaterialCoke(id);
+    }
+
+
+    @ApiOperation(value = "查询收款客户")
+    @PostMapping("/getReceiveCompany")
+    public Map<String, Object> getReceiveCompany(@RequestBody(required = false) Map<String,Object> map,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con) {
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return rmsFeign.getReceiveCompany(map,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation(value="新增收款客户")
+    @PostMapping(value = "/insertReceiveCompany")
+    public Map<String, Object> insertReceiveCompany(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertReceiveCompany(map);
+    }
+
+    @ApiOperation(value="删除收款客户")
+    @PostMapping(value = "/deleteReceiveCompany/{id}")
+    public Map<String, Object> deleteReceiveCompany(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteReceiveCompany(id);
+    }
+}

src/main/java/com/steerinfo/dil/controller/RmsReceivingCompanyController.java

@@ -0,0 +1,34 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.RmsReceivingCompanyService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author xiaosh
+ */
+@RestController
+@RequestMapping("${api.version}/rmsReceivingCompany")
+public class RmsReceivingCompanyController {
+
+    @Resource(name = "rmsReceivingCompanyService1")
+    private RmsReceivingCompanyService rmsReceivingCompanyService;
+
+    @ApiOperation(value = "查询收款客户")
+    @PostMapping("/name")
+    public List<String> queryRmsReceivingCompanyName(){
+        return rmsReceivingCompanyService.queryRmsReceivingCompanyName();
+    }
+
+    @ApiOperation(value = "查询收款客户")
+    @PostMapping("/map")
+    public List<Map<String, Object>> queryRmsReceivingCompanyMap(){
+        return rmsReceivingCompanyService.queryRmsReceivingCompanyMap();
+    }
+    }

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -0,0 +1,2856 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.config.ImageFileUtils;
+import com.steerinfo.dil.feign.TmsshipFeign;
+import com.steerinfo.dil.feign.TmsTrainFeign;
+import com.steerinfo.dil.feign.TmsTruckFeign;
+import com.steerinfo.dil.mapper.UniversalMapper;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+/**
+ * @author luobang
+ * @create 2021-09-17 14:11
+ */
+
+@RestController
+@RequestMapping("${api.version}/tms")
+public class TMSController extends BaseRESTfulController {
+    @Autowired
+    private TmsTruckFeign tmsTruckFeign;
+    @Autowired
+    private TmsTrainFeign tmsTrainFeign;
+    @Autowired
+    TmsshipFeign tmsshipFeign;
+    @Autowired
+    UniversalMapper universalMapper;
+    @Autowired
+    private ImageFileUtils imageFileUtils;
+    /*======================================船运==========================================*/
+
+    /**
+     * 驳船
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getBargeOperationList")
+    @ApiOperation(value = "展示驳船")
+    public Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getBargeOperationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("selectBargeOperation/{bargeOperationId}")
+    @ApiOperation(value = "通过id查询驳船")
+    Map<String, Object> selectBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId) {
+        return tmsshipFeign.selectBargeOperation(bargeOperationId);
+    }
+
+    @PostMapping("getBargeOperation/{bargeOperationId}")
+    @ApiOperation(value = "查询驳船")
+    Map<String, Object> getBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId) {
+        return tmsshipFeign.getBargeOperation(bargeOperationId);
+    }
+
+    @PostMapping("deleteBargeOperation/{bargeOperationId}")
+    @ApiOperation(value = "逻辑删除驳船")
+    Map<String, Object> deleteBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId) {
+        return tmsshipFeign.deleteBargeOperation(bargeOperationId);
+    }
+
+    @PostMapping("updateBargeOperation")
+    @ApiOperation(value = "修改驳船")
+    Map<String, Object> updateBargeOperation(@RequestBody Map<String, Object> tmsshipBargeOperation) {
+        return tmsshipFeign.updateBargeOperation(tmsshipBargeOperation);
+    }
+
+    @PostMapping("addBargeOperation")
+    @ApiOperation(value = "新增驳船")
+    Map<String, Object> addBargeOperation(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.addBargeOperation(map);
+    }
+
+    @PostMapping("addTmsShipEntryWharyResult")
+    @ApiOperation(value = "新增抵港")
+    Map<String, Object> addTmsShipEntryWharyResult(@RequestBody Map<String, Object> mapVal) {
+        return tmsshipFeign.addTmsShipEntryWharyResult(mapVal);
+    }
+
+    @PostMapping("addTmsShipOutWharyResult")
+    @ApiOperation(value = "新增离港")
+    Map<String, Object> addTmsShipOutWharyResult(@RequestBody Map<String, Object> mapVal) {
+        return tmsshipFeign.addTmsShipOutWharyResult(mapVal);
+    }
+
+    /**
+     * 装船
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getLoadShipList")
+    @ApiOperation(value = "展示装船")
+    public Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               Integer status,
+                                               @RequestParam(required = false) String con,
+                                               String startTime,
+                                               String endTime) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con,startTime,endTime);
+    }
+
+    @PostMapping("getLoadShip/{resultId}")
+    @ApiOperation(value = "查询装船")
+    Map<String, Object> getLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.getLoadShip(resultId);
+    }
+
+    @PostMapping("selectLoadShip/{resultId}")
+    @ApiOperation(value = "通过id查询装船")
+    Map<String, Object> selectLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.selectLoadShip(resultId);
+    }
+
+    @PostMapping("deleteLoadShip/{resultId}")
+    @ApiOperation(value = "逻辑删除装船")
+    Map<String, Object> deleteLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.deleteLoadShip(resultId);
+    }
+
+    @PostMapping("updateLoadShip")
+    @ApiOperation(value = "修改装船")
+    Map<String, Object> updateLoadShip(@RequestBody Map<String, Object> tmsshipLoadShipResult) {
+        return tmsshipFeign.updateLoadShip(tmsshipLoadShipResult);
+    }
+
+    @PostMapping("addLoadShip")
+    @ApiOperation(value = "新增装船")
+    Map<String, Object> addLoadShip(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.addLoadShip(map);
+    }
+
+    /**
+     * 位置作业
+     *
+     * @param mapValue
+     * @return
+     */
+    @PostMapping("getShipLocationList")
+    @ApiOperation(value = "展示位置作业")
+    public Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   String con
+                                                   ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getShipLocationList(mapValue==null?new HashMap<>():mapValue,con);
+    }
+
+    @PostMapping("getShipLocation/{locationId}")
+    @ApiOperation(value = "查询位置作业")
+    Map<String, Object> getShipLocation(@PathVariable("locationId") BigDecimal locationId) {
+        return tmsshipFeign.getShipLocation(locationId);
+    }
+
+    @PostMapping("/getWareHouseOutresult/{resultId}")
+    @ApiOperation(value = "查询港口出库")
+    Map<String, Object> getWareHouseOutresult(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsTrainFeign.getWareHouseOutresult(resultId);
+    }
+
+    @PostMapping("selectShipLocation/{locationId}")
+    @ApiOperation(value = "通过id查询位置作业")
+    Map<String, Object> selectShipLocation(@PathVariable("locationId") BigDecimal locationId) {
+        return tmsshipFeign.selectShipLocation(locationId);
+    }
+
+    @PostMapping("deleteShipLocation/{locationId}")
+    @ApiOperation(value = "逻辑删除位置作业")
+    Map<String, Object> deleteShipLocation(@PathVariable("locationId") BigDecimal locationId) {
+        return tmsshipFeign.deleteShipLocation(locationId);
+    }
+
+    @PostMapping("updateShipLocation")
+    @ApiOperation(value = "修改位置作业")
+    Map<String, Object> updateShipLocation(@RequestBody Map<String, Object> tmsshipShipLocation) {
+        return tmsshipFeign.updateShipLocation(tmsshipShipLocation);
+    }
+
+    @PostMapping("addShipLocation")
+    @ApiOperation(value = "新增位置作业")
+    Map<String, Object> addShipLocation(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.addShipLocation(map);
+    }
+
+    /**
+     * 水路货物运单
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("listAllOrders")
+    @ApiOperation(value = "展示水路货物运单")
+    public Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
+
+    @PostMapping("/getBatchList")
+    public Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId){
+        return  tmsshipFeign.getBatchList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+    }
+
+
+    //为提货委托查询批次
+    @PostMapping("/getBatchListForAttorney")
+    public Map<String, Object> getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId,
+                                          String con){
+        return  tmsshipFeign.getBatchListForAttorney(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    //为装船指令查询批次
+    @PostMapping("/getBatchListForInstruction")
+    public Map<String, Object> getBatchListForInstruction(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String con){
+        return  tmsshipFeign.getBatchListForInstruction(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+
+    //框计算计算货权转移中出现的批次
+    @PostMapping("/getBatchIdByForeign")
+    public Map<String, Object> getBatchIdByForeign(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String con){
+        return  tmsshipFeign.getBatchIdByForeign(mapValue==null?new HashMap<String, Object>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+
+
+    /**
+     * 展示船只信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getCapacityList")
+    @ApiOperation(value = "展示船只信息")
+    public Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String con) {
+        return tmsshipFeign.getCapacityList(mapValue==null?new HashMap<String, Object>():mapValue,pageNum, pageSize, apiId,con);
+    }
+
+
+    @PostMapping(value = "/uploadCargoPic")
+    public String uploadCargoPic(@RequestParam ("file") MultipartFile multipartFile){
+        return tmsshipFeign.uploadCargoPic(multipartFile);
+    }
+
+    /**
+     * 卸船作业
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getUnLoadShipList")
+    @ApiOperation(value = "展示卸船作业信息列表")
+    public Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 String con) {
+
+        return tmsshipFeign.getUnLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
+    @PostMapping("getUnloadShip/{resultId}")
+    @ApiOperation(value = "查询卸船作业")
+    Map<String, Object> getUnloadShip(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.getUnloadShip(resultId);
+    }
+
+    @PostMapping("selectUnLoadShip/{resultId}")
+    @ApiOperation(value = "通过id查询卸船作业")
+    Map<String, Object> selectUnLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.selectUnLoadShip(resultId);
+    }
+
+    @PostMapping("deleteUnLoadShip/{resultId}")
+    @ApiOperation(value = "逻辑删除卸船作业")
+    Map<String, Object> deleteUnLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.deleteUnLoadShip(resultId);
+    }
+
+    @PostMapping("updateUnLoadShip")
+    @ApiOperation(value = "修改卸船作业")
+    Map<String, Object> updateUnLoadShip(@RequestBody Map<String, Object> tmsshipUnloadShipResult) {
+        return tmsshipFeign.updateUnLoadShip(tmsshipUnloadShipResult);
+    }
+
+    @PostMapping("addUnLoadShip")
+    @ApiOperation(value = "新增卸船作业")
+    Map<String, Object> addUnLoadShip(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.addUnLoadShip(map);
+    }
+
+    /**
+     * 水分质检
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getWaterQualityResultList")
+    @ApiOperation(value = "展示水分质检信息列表")
+    public Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         @RequestParam(required = false) String con) {
+
+        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @PostMapping("getWaterQuality/{resultId}")
+    @ApiOperation(value = "查询水分质检")
+    Map<String, Object> getWaterQuality(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.getWaterQuality(resultId);
+    }
+
+    @PostMapping("selectWaterQualityResult/{resultId}")
+    @ApiOperation(value = "通过id查询水分质检")
+    Map<String, Object> selectWaterQualityResult(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.selectWaterQualityResult(resultId);
+    }
+
+    @PostMapping("deleteWaterQualityResult/{resultId}")
+    @ApiOperation(value = "逻辑删除水分质检")
+    Map<String, Object> deleteWaterQualityResult(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.deleteWaterQualityResult(resultId);
+    }
+
+    @PostMapping("updateWaterQualityResult")
+    @ApiOperation(value = "修改水分质检")
+    Map<String, Object> updateWaterQualityResult(@RequestBody Map<String, Object> tmsshipWaterQualityResult) {
+        return tmsshipFeign.updateWaterQualityResult(tmsshipWaterQualityResult);
+    }
+
+    @PostMapping("addWaterQualityResult")
+    @ApiOperation(value = "新增水分质检")
+    Map<String, Object> addWaterQualityResult(@RequestBody Map<String, Object> map) {
+        Map<String, Object> stringObjectMap = tmsshipFeign.addWaterQualityResult(map);
+        return stringObjectMap;
+    }
+
+    /**
+     * 船只信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getCapacities")
+    @ApiOperation(value = "展示船只信息列表")
+    public Map<String, Object> getCapacities(BigDecimal instructionsId,
+                                             @RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getCapacities(instructionsId, mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getInstructionsCapacity/{instructionsCapacityId}")
+    @ApiOperation(value = "查询船只信息")
+    Map<String, Object> getInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId) {
+        return tmsshipFeign.getInstructionsCapacity(instructionsCapacityId);
+    }
+
+    @PostMapping("deleteInstructionsCapacity/{instructionsCapacityId}")
+    @ApiOperation(value = "逻辑删除船只信息")
+    Map<String, Object> deleteInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId) {
+        return tmsshipFeign.deleteInstructionsCapacity(instructionsCapacityId);
+    }
+
+    @PostMapping("updateInstructionsCapacity")
+    @ApiOperation(value = "修改船只信息")
+    Map<String, Object> updateInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity) {
+        return tmsshipFeign.updateInstructionsCapacity(omsshipInstructionsCapacity);
+    }
+
+    @PostMapping("addInstructionsCapacity")
+    @ApiOperation(value = "新增船只信息")
+    Map<String, Object> addInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity) {
+        return tmsshipFeign.addInstructionsCapacity(omsshipInstructionsCapacity);
+    }
+
+    /**
+     * 装船指令
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getShipMentInstructionsList")
+    @ApiOperation(value = "展示装船指令列表")
+    public Map<String, Object> getShipMentInstructionsList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           String status,
+                                                           String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
+    }
+
+    @PostMapping("getShipmentInstructions/{instructionsId}")
+    @ApiOperation(value = "下发装船指令")
+    Map<String, Object> getShipmentInstructions(@PathVariable("instructionsId") BigDecimal instructionsId) {
+        return tmsshipFeign.getShipmentInstructions(instructionsId);
+    }
+
+    @PostMapping("deleteByPrimaryKey/{instructionsId}")
+    @ApiOperation(value = "逻辑删除装船指令")
+    Map<String, Object> deleteByPrimaryKey(@PathVariable("instructionsId") BigDecimal instructionsId) {
+        return tmsshipFeign.deleteByPrimaryKey(instructionsId);
+    }
+
+    @PostMapping("sendShipmentInstructionsStatus/{shipmentInstructionsId}")
+    @ApiOperation(value = "修改状态")
+    Map<String, Object> sendShipmentInstructionsStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId) {
+        return tmsshipFeign.sendShipmentInstructionsStatus(shipmentInstructionsId);
+    }
+
+    @PostMapping("updateShipmentInstructions")
+    @ApiOperation(value = "修改装船指令")
+    Map<String, Object> updateShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions) {
+        return tmsshipFeign.updateShipmentInstructions(omsshipShipmentInstructions);
+    }
+
+    @PostMapping("addShipmentInstructions")
+    @ApiOperation(value = "新增装船指令")
+    Map<String, Object> addShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions) {
+        return tmsshipFeign.addShipmentInstructions(omsshipShipmentInstructions);
+    }
+
+    /**
+     * 货权转移
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getAmsshipCargoTranferResultList")
+    @ApiOperation(value = "展示货权转移")
+    public Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                                Integer pageNum,
+                                                                Integer pageSize,
+                                                                Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+    }
+    @PostMapping("getGroupList")
+    @ApiOperation(value = "展示收货人列表")
+    @ApiImplicitParams(
+            @ApiImplicitParam(name="apiId",value="217")
+    )
+    public Map<String, Object> getGroupList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                                Integer pageNum,
+                                                                Integer pageSize,
+                                                                Integer apiId,
+                                                                String con) {
+
+        return tmsshipFeign.getGroupList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+    @PostMapping("getMaterialList")
+    @ApiOperation(value = "展示物资列表")
+    @ApiImplicitParams(
+            @ApiImplicitParam(name="apiId",value="216")
+    )
+    public Map<String, Object> getMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getMaterialList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+    @PostMapping("selectShippeByName")
+    @ApiOperation(value = "展示货权转移送达单位列表")
+    @ApiImplicitParams(
+            @ApiImplicitParam(name = "apiId",value = "215")
+    )
+    public Map<String, Object> selectShippeByName(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.selectShippeByName(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+    @PostMapping("insertamsshipCargoTransferResult")
+    @ApiOperation(value = "新增货权转移")
+    Map<String, Object> insertamsshipCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult) {
+        return tmsshipFeign.insertamsshipCargoTransferResult(amsshipCargoTransferResult);
+    }
+
+    @PostMapping("deleteByCargoId/{cargoTransferResultId}")
+    @ApiOperation(value = "逻辑删除货权转移")
+    Map<String, Object> deleteByCargoId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId) {
+        return tmsshipFeign.deleteByCargoId(cargoTransferResultId);
+    }
+
+    @PostMapping("editCargoTransferResult")
+    @ApiOperation(value = "修改货权转移")
+    Map<String, Object> editCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult) {
+        return tmsshipFeign.editCargoTransferResult(amsshipCargoTransferResult);
+    }
+
+    @PostMapping("selectByCargoTranferResultId/{cargoTransferResultId}")
+    @ApiOperation(value = "通过id查询货权转移")
+    Map<String, Object> selectByCargoTranferResultId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId) {
+        return tmsshipFeign.selectByCargoTranferResultId(cargoTransferResultId);
+    }
+
+    /**
+     * 提货委托
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getAmsshipDeliveryAttroneyList")
+    @ApiOperation(value = "展示提货委托")
+    public Map<String, Object> getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                              Integer pageNum,
+                                                              Integer pageSize,
+                                                              Integer apiId,
+                                                              Integer status,
+                                                              String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
+    }
+
+    @PostMapping("insertshipDeliveryAttorney")
+    @ApiOperation(value = "新增提货委托")
+    Map<String, Object> insertshipDeliveryAttorney(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.insertshipDeliveryAttorney(map);
+    }
+
+    @PostMapping("deleteByAttorneyId/{attorneyId}")
+    @ApiOperation(value = "逻辑删除提货委托")
+    Map<String, Object> deleteByAttorneyId(@PathVariable("attorneyId") Integer attorneyId) {
+        return tmsshipFeign.deleteByAttorneyId(attorneyId);
+    }
+
+    @PostMapping("editDeliveryAttroney")
+    @ApiOperation(value = "修改提货委托")
+    Map<String, Object> editDeliveryAttroney(@RequestBody Map<String, Object> amsshipDeliveryAttorney) {
+        return tmsshipFeign.editDeliveryAttroney(amsshipDeliveryAttorney);
+    }
+
+    @PostMapping("getDeliveryAttorneyId/{attorneyId}")
+    @ApiOperation(value = "通过id查询提货委托")
+    Map<String, Object> getDeliveryAttorneyId(@PathVariable("attorneyId") Integer attorneyId) {
+        return tmsshipFeign.getDeliveryAttorneyId(attorneyId);
+    }
+
+    @PostMapping("sendDeliveryAttorneyStatus/{attorneyId}")
+    @ApiOperation(value = "下发提货委托")
+    Map<String, Object> sendDeliveryAttorneyStatus(@PathVariable("attorneyId") Integer attorneyId) {
+        return tmsshipFeign.sendDeliveryAttorneyStatus(attorneyId);
+    }
+
+    /**
+     * 放货通知
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getshipDeliveryNoticeList")
+    @ApiOperation(value = "展示放货通知")
+    public Map<String, Object> getshipDeliveryNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         Integer status,
+                                                         @RequestParam(required = false) String con,
+                                                         @RequestParam(required = false) String startTime,
+                                                         @RequestParam(required = false) String endTime) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con,startTime,endTime);
+    }
+
+    @PostMapping("insertDeliveryNotice")
+    @ApiOperation(value = "新增放货通知")
+    Map<String, Object> insertDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice) {
+        return tmsshipFeign.insertDeliveryNotice(amsshipDeliveryNotice);
+    }
+
+    @PostMapping("deleteByNoticeId/{noticeId}")
+    @ApiOperation(value = "逻辑删除放货通知")
+    Map<String, Object> deleteByNoticeId(@PathVariable("noticeId") Integer noticeId) {
+        return tmsshipFeign.deleteByNoticeId(noticeId);
+    }
+
+    @PostMapping("editDeliveryNotice")
+    @ApiOperation(value = "修改放货通知")
+    Map<String, Object> editDeliveryNotice(@RequestBody Map<String, Object> editDeliveryNotice) {
+        return tmsshipFeign.editDeliveryNotice(editDeliveryNotice);
+    }
+
+    @PostMapping("selectByNoticeId/{noticeId}")
+    @ApiOperation(value = "通过id查询放货通知")
+    Map<String, Object> selectByNoticeId(@PathVariable("noticeId") Integer noticeId) {
+        return tmsshipFeign.selectByNoticeId(noticeId);
+    }
+
+    @PostMapping("sendDeliveryNotice/{noticeId}")
+    @ApiOperation(value = "下发放货通知")
+    Map<String, Object> sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId) {
+        return tmsshipFeign.sendDeliveryNotice(noticeId);
+    }
+    //船舶动态表
+    @PostMapping("/selectAllShipDynamaics")
+    Map<String, Object> selectAllShipDynamaics(@RequestBody(required = false) Map<String,Object> map,
+                                               String con){
+        if (map==null){
+            map=new HashMap<>();
+        }
+        return tmsshipFeign.selectAllShipDynamaics(map,con);
+    }
+
+    //万州港装车数据
+    @PostMapping("/getLoadData")
+    Map<String, Object> getLoadData(@RequestBody(required = false) Map<String,Object> map){
+        if (map==null){
+            map=new HashMap<>();
+        }
+        return tmsshipFeign.getLoadData(map);
+    }
+
+    //万州港卸船数据
+    @PostMapping("/getUnloadData")
+    Map<String, Object> getUnloadData(@RequestBody(required = false) Map<String,Object> map){
+        if (map==null){
+            map=new HashMap<>();
+        }
+        return tmsshipFeign.getUnloadData(map);
+    }
+
+    //下游港口船舶动态表
+    @PostMapping("/getDownShipDynamaics")
+    Map<String, Object> getDownShipDynamaics(@RequestBody(required = false) Map<String,Object> map){
+        if (map==null){
+            map=new HashMap<>();
+        }
+        return tmsshipFeign.getDownShipDynamaics(map);
+    }
+
+    @PostMapping("getControlLines")
+    @ApiOperation(value = "查询控制线等闸")
+    Map<String, Object> getControlLines(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.getControlLines(map);
+    }
+
+    @PostMapping("updateControlLine")
+    @ApiOperation(value = "修改控制线等闸")
+    Map<String, Object> updateControlLine(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.updateControlLine(map);
+    }
+
+    @PostMapping("getControlLinesTable")
+    @ApiOperation(value = "控制线等闸表格")
+    Map<String, Object> getControlLinesTable(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.getControlLinesTable(map);
+    }
+
+    /**
+     * 下拉框
+     *
+     * @return
+     */
+    @GetMapping("getGroupId")
+    @ApiOperation(value = "得到下拉")
+    public Map<String, Object> getGroupId() {
+        return tmsshipFeign.getGroupId();
+    }
+
+    @GetMapping("getMaterialId")
+    @ApiOperation(value = "得到物资ID下拉")
+    public Map<String, Object> getMaterialId(){
+        return tmsshipFeign.getMaterialId();
+    }
+
+    @GetMapping("getCargoId")
+    @ApiOperation(value = "得到货物下拉")
+    public Map<String, Object> getCargoId() {
+        return tmsshipFeign.getCargoId();
+    }
+
+    @GetMapping("insertBetchId")
+    @ApiOperation(value = "得到批次下拉")
+    public Map<String, Object> insertBetchId() {
+        return tmsshipFeign.insertBetchId();
+    }
+
+    @GetMapping("getAttorneyId")
+    @ApiOperation(value = "得到提货下拉")
+    public Map<String, Object> getAttorneyId() {
+        return tmsshipFeign.getAttorneyId();
+    }
+
+    @GetMapping("getNoticeId")
+    @ApiOperation(value = "得到放货下拉")
+    public Map<String, Object> getNoticeId() {
+        return tmsshipFeign.getNoticeId();
+    }
+
+    @GetMapping("getPortName")
+    @ApiOperation(value = "得到货权转移单位")
+    public Map<String, Object> getPortName() {
+        return tmsshipFeign.getPortName();
+    }
+
+    @GetMapping("getPortId")
+    @ApiOperation(value = "得到港口下拉")
+    public Map<String, Object> getPortId() {
+        return tmsshipFeign.getPortId();
+    }
+
+    @GetMapping("getRmRawId")
+    @ApiOperation(value = "得到仓库下拉")
+    public Map<String, Object> getRmRawId() {
+        return tmsshipFeign.getRmRawId();
+    }
+
+    @GetMapping("getPierId")
+    @ApiOperation(value = "得到码头下拉")
+    public Map<String, Object> getPierId() {
+        return tmsshipFeign.getPierId();
+    }
+
+    @ApiOperation(value = "查询特定所有的物资")
+    @GetMapping("/getFuMaterial/{type}")
+    public Map<String, Object> getFuMaterial(@PathVariable("type") Integer type) {
+        return tmsTruckFeign.getFuMaterial(type);
+    }
+
+    @GetMapping("getResultNumber")
+    @ApiOperation(value = "得到实绩编号下拉")
+    public Map<String, Object> getResultNumber() {
+        return tmsshipFeign.getResultNumber();
+    }
+
+    @GetMapping("getCarrier")
+    @ApiOperation(value = "得到承运商下拉")
+    public Map<String, Object> getCarrier() {
+        return tmsshipFeign.getCarrier();
+    }
+
+    @GetMapping("getShipperId")
+    @ApiOperation(value = "得到托运方下拉")
+    public Map<String, Object> getShipperId() {
+        return tmsshipFeign.getShipper();
+    }
+
+    @GetMapping("getOrderId")
+    @ApiOperation(value = "得到装船指令下拉")
+    public Map<String, Object> getTask() {
+        return tmsshipFeign.getTask();
+    }
+
+    @GetMapping("getCapacityId")
+    @ApiOperation(value = "得到船下拉")
+    public Map<String, Object> getCapacityId() {
+        return tmsshipFeign.getCapacityId();
+    }
+
+
+    /*======================================火运==========================================*/
+
+
+    //************************************TmstrainLoadingResultController********************
+    @ApiOperation(value = "查询装车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(58)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/getTmstrainWagonLoad")
+    public Map<String, Object> getTmstrainWagonLoad(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer resultType,
+                                                    Integer materialId,
+                                                    Integer supplierId,
+                                                    String con,
+                                                    String startTime,
+                                                    String endTime) {
+        return tmsTrainFeign.getTmstrainWagonLoad(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,materialId,supplierId, con,startTime,endTime);
+    }
+
+
+    @ApiOperation(value = "修改港口出库")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainLoadingResult", value = "车皮装车对象", required = false, dataType = "TmstrainLoadingResult")
+    })
+    @PostMapping(value = "/updateWarehouseResult")
+    public Map<String, Object> updateWarehouseResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.updateWarehouseResult(map);
+    }
+
+
+    @ApiOperation(value = "新增车皮装车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainLoadingResult", value = "车皮装车对象", required = false, dataType = "TmstrainLoadingResult")
+    })
+    @PostMapping(value = "/insertTmstrainLoadingResult")
+    public Map<String, Object> insertTmstrainLoadingResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.insertTmstrainLoadingResult(map);
+    }
+
+
+    @ApiOperation(value = "通过主键查询车皮装车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "车皮装车主键", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/getTmstrainLoadingResultByResultId/{resultId}")
+    public Map<String, Object> getTmstrainLoadingResultByResultId(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsTrainFeign.getTmstrainLoadingResultByResultId(resultId);
+    }
+
+    @ApiOperation(value = "通过主键修改车皮装车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainLoadingResult", value = "修改车皮装车map", required = false, dataType = "TmstrainWagonLoadResult")
+    })
+    @PostMapping(value = "/upadteTmstrainLoadingResultByResultId")
+    public Map<String, Object> upadteTmstrainLoadingResultByResultId(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.upadteTmstrainLoadingResultByResultId(map);
+    }
+
+    @ApiOperation(value = "通过主键删除车皮装车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "主键ID", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/deleteTmstrainLoadingResultByResultId")
+    public Map<String, Object> deleteTmstrainLoadingResultByResultId(@RequestParam BigDecimal resultId) {
+        return tmsTrainFeign.deleteTmstrainLoadingResultByResultId(resultId);
+    }
+
+    @ApiOperation(value = "通过主键删除车皮出库作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "主键ID", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/deleteOutBoundWagonById")
+    public Map<String, Object> deleteOutBoundWagonById(@RequestParam BigDecimal resultId){
+        return tmsTrainFeign.deleteOutBoundWagonById(resultId);
+    }
+
+    //********************下拉框**********************
+
+    @ApiOperation(value = "获取发站地点名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/getSendStationName")
+    public Map<String, Object> getSendStationName() {
+        return tmsTrainFeign.getSendStationName();
+    }
+
+    @ApiOperation(value = "获取到站地点名称")
+    @GetMapping(value = "/getArrivalStationName")
+    public Map<String, Object> getArrivalStationName() {
+        return tmsTrainFeign.getArrivalStationName();
+    }
+
+    @ApiOperation(value = "装车新增港存库出库")
+    @PostMapping(value = "/addWarehouseOutResult")
+    public Map<String, Object> addWarehouseOutResult(@RequestBody(required = false) Map<String,Object> map) {
+        return tmsTrainFeign.addWarehouseOutResult(map);
+    }
+
+
+    @ApiOperation(value = "获取批次ID")
+    @GetMapping(value = "/getBatchId")
+    public Map<String, Object> getBatchId() {
+        return tmsTrainFeign.getBatchId();
+    }
+
+
+    @ApiOperation(value = "获取已装车还未卸车车皮")
+    @PostMapping(value = "/getWagonNo/{resultType}")
+    public Map<String, Object> getWagonNo(@PathVariable("resultType") Integer resultType,
+                                          @RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String wagon,
+                                          String purchaseOrderNum,
+                                          String materialName){
+        return tmsTrainFeign.getWagonNo(resultType, mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,wagon,purchaseOrderNum,materialName);
+    }
+
+    @ApiOperation(value = "查询所有发运计划")
+    @GetMapping(value = "/getRailPlan")
+    public Map<String, Object> getRailPlan() {
+        return tmsTrainFeign.getRailPlan();
+    }
+
+    @GetMapping(value = "/getDilBatch")
+    public Map<String, Object> getDilBatch() {
+        return tmsTruckFeign.getDilBatch();
+    }
+
+    @GetMapping(value = "/getCarrierId")
+    public Map<String, Object> getCarrierId() {
+        return tmsTruckFeign.getCarrier();
+    }
+
+    @GetMapping(value = "/getLine")
+    public Map<String, Object> getLine() {
+        return tmsTruckFeign.getLine();
+    }
+
+    @GetMapping(value = "/getWarehouse")
+    public Map<String, Object> getWarehouse() {
+        return tmsTruckFeign.getWarehouse();
+    }
+
+    @GetMapping(value = "/getGatepost")
+    public Map<String, Object> getGatepost() {
+        return tmsTruckFeign.getGatepost();
+    }
+
+    @GetMapping(value = "/getAPO")
+    public Map<String, Object> getAPO() {
+        return tmsTruckFeign.getAPO();
+    }
+
+    @GetMapping(value = "/getFuCapacityId")
+    public Map<String, Object> getFuCapacityId() {
+        return tmsTruckFeign.getFuCapacityId();
+    }
+
+    @GetMapping(value = "/getPort")
+    public Map<String, Object> getPort() {
+        return tmsTruckFeign.getPort();
+    }
+
+    @ApiOperation(value = "查询卸货点")
+    @GetMapping("/getUnloadPoint/{type}")
+    public Map<String, Object> getUnloadPoint(@PathVariable("type") Integer type) {
+        return tmsTruckFeign.getUnloadPoint(type);
+    }
+
+    @ApiOperation(value = "查询卸车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(60)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/getTmstrainWagonUnLoad")
+    public Map<String, Object> getTmstrainWagonUnLoad(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer resultType,
+                                                      String con) {
+        return tmsTrainFeign.getTmstrainWagonUnLoad(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,con);
+    }
+
+    @ApiOperation(value = "通过主键删除车皮卸车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "unloadingId", value = "主键ID", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/deleteTmstrainWagonUnLoadResultByUnLoadingId")
+    public Map<String, Object> deleteTmstrainWagonUnLoadResultByUnLoadingId(@RequestParam BigDecimal unloadingId) {
+        return tmsTrainFeign.deleteTmstrainWagonUnLoadResultByUnLoadingId(unloadingId);
+    }
+
+    @ApiOperation(value = "新增车皮卸车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainWagonUnloadResult", value = "车皮卸车对象", required = false, dataType = "TmstrainWagonUnloadResult")
+    })
+    @PostMapping(value = "/insertTmstrainWagonUnLoadResult")
+    public Map<String, Object> insertTmstrainWagonUnLoadResult(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult) {
+        return tmsTrainFeign.insertTmstrainWagonUnLoadResult(tmstrainWagonUnloadResult);
+    }
+
+    @ApiOperation(value = "通过主键修改车皮卸车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainWagonUnloadResult", value = "车皮卸车对象", required = false, dataType = "TmstrainWagonUnloadResult")
+    })
+    @PostMapping(value = "/upadteTmstrainWagonUnLoadResultByUnLoadingId")
+    public Map<String, Object> upadteTmstrainWagonUnLoadResultByUnLoadingId(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult) {
+        return tmsTrainFeign.upadteTmstrainWagonUnLoadResultByUnLoadingId(tmstrainWagonUnloadResult);
+    }
+
+    @ApiOperation(value = "查看火运实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(65)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/getTmstrainresult")
+    public Map<String, Object> getTmstrainresult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 String con) {
+        return tmsTrainFeign.getTmstrainresult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @ApiOperation(value = "通过主键查询车皮卸车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "unloadingId", value = "车皮卸车主键", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/getTmstrainWagonUnLoadResultByUnLoadingId/{unloadingId}")
+    public Map<String, Object> getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId) {
+        return tmsTrainFeign.getTmstrainWagonUnLoadResultByUnLoadingId(unloadingId);
+    }
+
+    //下拉框
+    @ApiOperation(value = "获取卸车地点名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/getUnloadingPointName")
+    public Map<String, Object> getUnloadingPointName() {
+        return tmsTrainFeign.getUnloadingPointName();
+    }
+
+
+    //下拉框
+    @ApiOperation(value = "获取货权转移图片")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/downLoadDeilveryNotice")
+    public Map<String, Object> downLoadDeilveryNotice(@RequestParam Integer noticeId) {
+        return tmsshipFeign.downLoadDeilveryNotice(noticeId);
+    }
+
+    @ApiOperation(value = "获取卸车路径名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/getUnloadingRouteName")
+    public Map<String, Object> getUnloadingRouteName() {
+        return tmsTrainFeign.getUnloadingRouteName();
+    }
+
+
+    @ApiOperation(value = "查询请车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(57)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllWagonPlease")
+    public Map<String, Object> getAllWagonPlease(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer status,
+                                                 Integer resultType,
+                                                 Integer resultId,
+                                                 String con) {
+
+        return tmsTrainFeign.getAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, resultType,resultId,con);
+    }
+
+    @ApiOperation(value = "通过Id查询请车作业")
+    @PostMapping("/getWagonPleaseById/{resultId}")
+    public Map<String, Object> getWagonPleaseById(@PathVariable("resultId") Integer resultId) {
+        return tmsTrainFeign.getWagonPleaseById(resultId);
+    }
+
+    @ApiOperation(value = "新增请车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amstrainWagonPlease", value = "请车作业对象", required = false, dataType = "AmstrainWagonPlease"),
+    })
+    @PostMapping("/addWagonPlease")
+    public Map<String, Object> addWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult) {
+        return tmsTrainFeign.addWagonPlease(tmstrainPleaseApproveResult);
+    }
+
+    @ApiOperation(value = "修改请车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
+    })
+    @PostMapping("/updateWagonPlease")
+    public Map<String, Object> updateWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult) {
+        return tmsTrainFeign.updateWagonPlease(tmstrainPleaseApproveResult);
+    }
+
+    @ApiOperation(value = "逻辑删除请车作业 设置状态码为 3")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
+    })
+    @PostMapping("/deleteWagonPlease/{resultId}")
+    public Map<String, Object> deleteWagonPlease(@PathVariable("resultId") Integer resultId) {
+        return tmsTrainFeign.deleteWagonPlease(resultId);
+    }
+
+    @ApiOperation(value = "下发请车作业 设置状态码为 1")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "请车作业实绩对象", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/sendWagonPlease/{resultId}")
+    public Map<String, Object> sendWagonPlease(@PathVariable("resultId") Integer resultId) {
+        return tmsTrainFeign.sendWagonPlease(resultId);
+    }
+
+    //下拉框
+
+    @ApiOperation(value = "查询所有发货单位")
+    @GetMapping("/getShipper")
+    public Map<String, Object> getShipper() {
+        return tmsTrainFeign.getShipper();
+    }
+
+    @ApiOperation(value = "查询批车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(70)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getApproveAllWagonPlease")
+    public Map<String, Object> getApproveAllWagonPlease(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                        Integer apiId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        Integer resultType,
+                                                        Integer status,
+                                                        String con) {
+        return tmsTrainFeign.getApproveAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,status,con);
+    }
+
+    @ApiOperation(value = "通过Id查询批车作业")
+    @PostMapping("/getApproveWagonPleaseById/{resultId}")
+    public Map<String, Object> getApproveWagonPleaseById(@PathVariable("resultId") Integer resultId) {
+        return tmsTrainFeign.getApproveWagonPleaseById(resultId);
+    }
+
+    @ApiOperation(value = "新增批车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
+    })
+    @PostMapping("/addApproveWagonPlease")
+    public Map<String, Object> addApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult) {
+        return tmsTrainFeign.addApproveWagonPlease(tmstrainPleaseApproveResult);
+    }
+
+    @ApiOperation(value = "修改批车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
+    })
+    @PostMapping("/updateApproveWagonPlease")
+    public Map<String, Object> updateApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult) {
+        return tmsTrainFeign.updateApproveWagonPlease(tmstrainPleaseApproveResult);
+    }
+
+    @ApiOperation(value = "逻辑删除批车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "请车作业实绩对象", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/deleteApproveWagonPlease/{resultId}")
+    public Map<String, Object> deleteApproveWagonPlease(@PathVariable("resultId") Integer resultId) {
+        return tmsTrainFeign.deleteApproveWagonPlease(resultId);
+    }
+
+
+    /*======================================汽运==========================================*/
+
+
+    //******************************************TmstruckLoadResultController***********************************
+
+    @ApiOperation(value="查询所有正在排队的销售订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(227)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getSaleOrderOnQueue")
+    public Map<String, Object> getSaleOrderOnQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con){
+        return tmsTruckFeign.getSaleOrderOnQueue(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="查询订单下的物资")
+    @GetMapping("getOrderMaterial/{orderId}")
+    public Map<String, Object> getOrderMaterial(@PathVariable("orderId") Integer orderId){
+        return tmsTruckFeign.getOrderMaterial(orderId);
+    }
+
+    @ApiOperation(value="查询仓库下所有月台")
+    @GetMapping("getPlatformIdByWarehouse/{warehouseId}")
+    public Map<String, Object> getPlatformIdByWarehouse(@PathVariable("warehouseId") Integer warehouseId){
+        return tmsTruckFeign.getPlatformIdByWarehouse(warehouseId);
+    }
+
+    @ApiOperation(value="修改装车点和装车顺序：销售钢材专用 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/updateLoadingIdAndLoadSq")
+    public Map<String, Object> updateLoadingIdAndLoadSq(@RequestBody(required=false) Map<String, Object> map){
+        return tmsTruckFeign.updateLoadingIdAndLoadSq(map);
+    }
+
+    @ApiOperation(value="根据运输订单号查询装/卸点、卸货物资、装机备注信息：后台管理 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/selectLoadingIdRemark")
+    public Map<String, Object> selectLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map){
+        return tmsTruckFeign.selectLoadingIdRemark(map);
+    }
+
+    @ApiOperation(value="根据运输订单号修改装/卸点、卸货物资、装机备注等：后台管理 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/updateLoadingIdRemark")
+    public Map<String, Object> updateLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map){
+        return tmsTruckFeign.updateLoadingIdRemark(map);
+    }
+
+    @ApiOperation(value = "查询所有装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(91)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllLoadResult")
+    public Map<String, Object> getAllLoadResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer status,
+                                          Integer orderType,
+                                          String con,
+                                          String userId,
+                                          String userIds,
+                                                String startTime,String endTime){
+        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType, con,userId,userIds,startTime,endTime);
+    }
+
+    @ApiOperation(value = "新增采购汽车装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addCGLoadResult")
+    public Map<String, Object> addCGLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTruckFeign.addCGLoadResult(mapValue);
+    }
+
+    @ApiOperation(value="销售新增钢材装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("addSaleLoadResult")
+    public Map<String, Object> addSaleLoadResult(@RequestBody(required=false) Map<String, Object> map){
+        return tmsTruckFeign.addSaleLoadResult(map);
+    }
+
+    @ApiOperation(value="销售新增钢渣、水渣、危化品装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addSale2LoadResult")
+    public Map<String, Object> addSale2LoadResult(@RequestBody(required=false) Map<String, Object> map){
+        return tmsTruckFeign.addSale2LoadResult(map);
+    }
+
+    @ApiOperation(value = "修改汽车装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstruckLoadResult", value = "装车作业实绩对象", required = false, dataType = "TmstruckLoadResult"),
+    })
+    @PostMapping("/updateLoadResult")
+    public Map<String, Object> updateLoadResult(@RequestBody Map<String, Object> map) {
+        return tmsTruckFeign.updateLoadResult(map);
+    }
+
+    @ApiOperation(value = "通过ID查询装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getLoadResultById/{resultId}")
+    public Map<String, Object> getLoadResultById(@PathVariable("resultId") Integer resultId) {
+        return tmsTruckFeign.getLoadResultById(resultId);
+    }
+
+    @ApiOperation(value = "逻辑删除车装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstruckLoadResult", value = "装车作业实绩对象", required = false, dataType = "TmstruckLoadResult"),
+    })
+    @PostMapping("/deleteLoadResult/{resultId}")
+    public Map<String, Object> deleteLoadResult(@PathVariable("resultId") Integer resultId) {
+        return tmsTruckFeign.deleteLoadResult(resultId);
+    }
+
+    //***************************************TmstruckEnfactoryResultController***************************
+
+    @ApiOperation(value = "查询所有的进厂实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(220)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllEnFactoryResult")
+    public Map<String, Object> getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               String startTime,
+                                               String endTime,
+                                               String userId,
+                                               String userIds
+    ){
+        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, startTime,endTime,userId,userIds);
+    }
+
+    @ApiOperation(value="通过运输订单id查询物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "运输订单id", required = false, dataType = "Integer"),
+    })
+    @GetMapping("/getMaterial")
+    public Map<String, Object> getMaterial(Integer orderId){
+        return tmsTruckFeign.getMaterial(orderId);
+    }
+
+    @ApiOperation(value="通过采集系统传来的数据新增进厂作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addEnFactoryResult")
+    public Map<String, Object> addEnFactoryResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTruckFeign.addEnFactoryResult(mapValue);
+    }
+
+    @ApiOperation(value = "PDA扫描更新进厂作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/enFactoryResultByPDA")
+    public Callable<Map<String, Object>> enFactoryResultByPDA(@RequestBody(required = false) Map<String, Object> mapValue) {
+        //PDA扫码会多个反斜杠所以需要截取
+        return ()->{
+                String orderNumber = (String) mapValue.get("orderNumber");
+                orderNumber = orderNumber.substring(0, orderNumber.length()-1);
+                mapValue.put("orderNumber", orderNumber);
+                return tmsTruckFeign.enFactoryResultByPDA(mapValue);
+        };
+
+    }
+
+    //***************************************TmstruckWeightResultController***************************
+    @ApiOperation(value = "查询计毛实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(102)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllJiMaoResult")
+    public Map<String, Object> getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer orderType,
+                                                 String con,
+                                                 String userId,
+                                                 String userIds,
+                                                 String startTime,
+                                                 String endTime){
+        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
+    }
+
+    @ApiOperation(value = "查询计皮实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(104)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllJiPiResult")
+    public Map<String, Object> getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer orderType,
+                                                String con,
+                                                String userId,
+                                                String userIds,
+                                                String startTime,
+                                                String endTime) {
+        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
+    }
+
+
+    @ApiOperation(value = "采集新增计毛实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "采集的数据", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addJiMaoResult")
+    public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue) {
+        return tmsTruckFeign.addJiMaoResult(mapValue);
+    }
+
+    @ApiOperation(value = "采集新增计皮实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "采集的数据", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addJiPiResult")
+    public Map<String, Object> addJiPiResult(@RequestBody Map<String, Object> mapValue) {
+        return tmsTruckFeign.addJiPiResult(mapValue);
+    }
+
+    //****************************************TmstruckUnloadResultController*******************************
+
+    @ApiOperation(value = "查询卸货实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(103)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getUnloadResult")
+    public Map<String, Object> getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               String con,
+                                               String userId,
+                                               String userIds,
+                                               String startTime,
+                                               String endTime
+    ){
+        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
+    }
+
+    @ApiOperation(value = "添加卸货实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/addUnloadResult")
+    public Map<String, Object> addUnloadResult(@RequestBody Map<String, Object> mapValue) {
+        return tmsTruckFeign.addUnloadResult(mapValue);
+    }
+
+    @ApiOperation(value = "更新卸货实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/updateUnloadResult")
+    public Map<String, Object> updateUnloadResult(@RequestBody Map<String, Object> mapValue) {
+        return tmsTruckFeign.updateUnloadResult(mapValue);
+    }
+    //****************************************TmstruckReceiptResultController*******************************
+
+
+    @ApiOperation(value = "查询收货实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(107)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getReceiveResult")
+    public Map<String, Object> getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                                Integer orderType,String con,
+                                                String startTime,
+                                                String endTime
+    ){
+        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,startTime,endTime);
+    }
+
+
+    //****************************************TmstruckLeaveFactoryResultController*******************************
+
+
+    @ApiOperation(value="查询出厂实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(110)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getLeaveFactoryResult")
+    public Map<String, Object> getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer orderType,
+                                                     String con,
+                                                     String carrierSsoId,
+                                                     String userId,
+                                                     String userIds,
+                                                     String startTime,
+                                                     String endTime
+    ){
+        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con, carrierSsoId,userId,userIds,startTime,endTime);
+    }
+
+
+    @ApiOperation(value="PAD扫描汽车出厂实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addLeaveFactoryResult")
+    public Map<String, Object> addLeaveFactoryResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTruckFeign.addLeaveFactoryResult(mapValue);
+    }
+
+    //****************************************TmstruckMeasureCommissionController*******************************
+
+    @ApiOperation(value = "查询计量委托,apiId=521")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllMeasureCommission")
+    public Map<String, Object> getAllMeasureCommission(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       String con) {
+        if(mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getAllMeasureCommission(mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    //****************************************TmstruckQualityResultController*******************************
+
+    @ApiOperation(value = "查询所有的质检作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(111)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getQualityResult")
+    public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer orderType,
+                                                String con,
+                                                String startTime,
+                                                String endTime
+    ){
+        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,orderType, con,startTime,endTime);
+    }
+
+    @ApiOperation(value = "通过ID获取质检实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "质检作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getQualityResultById/{resultId}")
+    public Map<String, Object> getQualityResultById(@PathVariable("resultId") Integer resultId) {
+        return tmsTruckFeign.getQualityResultById(resultId);
+    }
+
+    @ApiOperation(value = "修改质检实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "质检作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/updateQualityResult")
+    public Map<String, Object> updateQualityResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTruckFeign.updateQualityResult(mapValue);
+    }
+
+    //*********************************内转物流tms-train*********************************************************************
+    @PostMapping("/addTrainLoadResultForConverted")
+    @ApiOperation(value = "内转物流新增装车")
+    public Map<String, Object> addTrainLoadResultForConverted(@RequestBody(required = false) Map<String, Object> tmstrainLoadingResult) {
+        return tmsTrainFeign.addTrainLoadResultForConverted(tmstrainLoadingResult);
+    }
+
+    @ApiOperation(value = "内转新增卸车实绩")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/addTmsTrainUnloadResultForNZ")
+    public Map<String, Object> addTmsTrainUnloadResultForNZ(@RequestBody(required = false)Map<String, Object> map) {
+        return tmsTrainFeign.addTmsTrainUnloadResultForNZ(map);
+    }
+
+    @ApiOperation(value = "查询车皮物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(213)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/getMaterialAndCarByLoadingId")
+    public Map<String, Object> getMaterialAndCarByLoadingId(
+            @RequestBody(required = false) Map<String, Object> mapValue,
+            Integer apiId,
+            Integer pageNum,
+            Integer pageSize,
+            Integer loadingId,
+            Integer unloadingId) {
+        return tmsTrainFeign.getMaterialAndCarByLoadingId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, loadingId, unloadingId);
+    }
+
+    @PostMapping("/selectLoadByResultId/{resultId}")
+    @ApiOperation(value = "内转物流通过主键查询车皮装车作业信息")
+    public Map<String, Object> selectLoadByResultId(@PathVariable("resultId") BigDecimal resultId) {
+        Map<String, Object> mes = tmsTrainFeign.selectLoadByResultId(resultId);
+        return mes;
+    }
+
+    @ApiOperation(value = "内转查询装车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(203)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getTmstrainWagonLoadForConverted")
+    public Map<String, Object> getTmstrainWagonLoadForConverted(@RequestBody(required = false)
+                                                                        Integer apiId,
+                                                                Integer pageNum,
+                                                                Integer pageSize,
+                                                                String con
+    ) {
+        return tmsTrainFeign.getTmstrainWagonLoadForConverted(apiId, pageNum, pageSize,con);
+    }
+
+
+
+
+    @ApiOperation(value = "查询进口矿未绑定装车实绩的车皮")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(203)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getResultType")
+    public Map<String, Object> getResultType(@RequestBody(required = false)Map<String,Object> map,
+                                                                        Integer apiId,
+
+                                                                String con
+    ) {
+        return tmsTrainFeign.getResultType(map == null ? new HashMap<>() : map,apiId,con);
+    }
+
+    @PostMapping("/addShipLoadResult")
+    @ApiOperation(value = "江港-达州新增装车")
+    public Map<String, Object> addShipLoadResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.addShipLoadResult(map);
+    }
+
+
+    @PostMapping("/addWagonPleaseForNZ")
+    @ApiOperation(value = "内转物流新增请车")
+    public Map<String, Object> addPleaseForNZ(@RequestBody(required = false) Map<String, Object> tmstrainLoadingResult) {
+        return tmsTrainFeign.addPleaseForNZ(tmstrainLoadingResult);
+    }
+
+    @ApiOperation(value="内转新增达州站-厂内装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+        @PostMapping("/addDaZhouToDaGangLoadResult")
+    public Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map){
+        return tmsTruckFeign.addDaZhouToDaGangLoadResult(map);
+    }
+
+    @ApiOperation(value = "内转查询请车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(199)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllWagonPleaseForConverted")
+    public Map<String, Object> getAllWagonPleaseForConverted(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                             Integer apiId,
+                                                             Integer pageNum,
+                                                             Integer pageSize,
+                                                             Integer status,
+                                                             String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("status", status);
+        return tmsTrainFeign.getTmstrainWagonLoadForConverted(apiId, pageNum, pageSize,con);
+    }
+
+    @PostMapping("/getPleasePlanByResultId/{resultId}")
+    @ApiOperation(value = "内转物流通过主键查请车计划")
+    public Map<String, Object> getPleasePlanByResultId(@PathVariable("resultId") BigDecimal resultId) {
+        Map<String, Object> mes = tmsTrainFeign.getPleasePlanByResultId(resultId);
+        return mes;
+    }
+
+    @PostMapping("/getApproveByResultId/{resultId}")
+    @ApiOperation(value = "内转物流通过主键查询车皮请车作业信息")
+    public Map<String, Object> getApproveByResultId(@PathVariable("resultId") BigDecimal resultId) {
+        Map<String, Object> mes = tmsTrainFeign.getApproveByResultId(resultId);
+        return mes;
+    }
+
+    @ApiOperation(value = "查询卸车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(201)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+
+    })
+    @PostMapping("/selectWagonUnLoadResultForConverted")
+    public Map<String, Object> selectWagonUnLoadResultForConverted(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                                   Integer apiId,
+                                                                   Integer pageNum,
+                                                                   Integer pageSize,
+                                                                   String con
+    ) {
+        return tmsTrainFeign.selectWagonUnLoadResultForConverted(apiId, pageNum, pageSize,con);
+    }
+
+    @ApiOperation(value = "内转查询火车卸货信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(202)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+
+    })
+    @PostMapping("/selectTrainUnLoadResultForConverted")
+    public Map<String, Object> selectTrainUnLoadResultForConverted(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                                   Integer apiId,
+                                                                   Integer pageNum,
+                                                                   Integer pageSize,
+                                                                   String con
+    ) {
+        return tmsTrainFeign.selectTrainUnLoadResultForConverted(apiId, pageNum, pageSize,con);
+    }
+
+    /**
+     * 新增汽车装货实绩
+     */
+    @ApiOperation(value = "新增汽车装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addLoadResultForConverted")
+    public Map<String, Object> addLoadResultForConverted(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = tmsTruckFeign.addLoadResultForConverted(map);
+        return resTfulResult;
+    }
+
+    @ApiOperation(value = "查询所有装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(91)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectLoadResultForConverted")
+    public Map<String, Object> selectLoadResultForConverted(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                            Integer apiId,
+                                                            Integer pageNum,
+                                                            Integer pageSize
+    ) {
+        return tmsTruckFeign.selectLoadResultForConverted(mapValue, apiId, pageNum, pageSize);
+    }
+
+    //根据实绩id渲染数据
+    @ApiOperation(value = "通过ID查询装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getLoadResultByResultId/{resultId}")
+    public Map<String, Object> getLoadResultByResultId(@PathVariable("resultId") Integer resultId) {
+        Map<String, Object> resTfulResult = tmsTruckFeign.getLoadResultByResultId(resultId);
+        return resTfulResult;
+    }
+
+    @ApiOperation(value = "内转物流查询质检作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(204)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectQualityResultForConverted")
+    public Map<String, Object> selectQualityResultForConverted(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                               Integer apiId,
+                                                               Integer pageNum,
+                                                               Integer pageSize
+    ) {
+        return tmsTruckFeign.selectQualityResultForConverted(mapValue, apiId, pageNum, pageSize);
+    }
+
+    /**
+     * 展示计数实绩列表
+     */
+
+    @ApiOperation(value = "查询计数实绩列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(364)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectCountList")
+    public Map<String, Object> selectCountList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize
+    ) {
+        return tmsTruckFeign.selectCountList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+    }
+
+    //采购内转待装车实绩
+    @ApiOperation(value = "查询待装车运单列表")
+    @PostMapping("/cgNzLoadingResult")
+    public Map<String, Object> cgNzLoadingResult(@RequestBody(required = false) Map<String, Object> mapVal,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               Integer orderStatus
+    ) {
+        return tmsTruckFeign.cgNzLoadingResult(mapVal==null?new HashMap<>():mapVal, apiId, pageNum, pageSize,orderType,orderStatus);
+    }
+
+
+
+    /**
+     * 内转物流卸货装车实绩
+     *
+     * @param map
+     * @return
+     */
+    @ApiOperation(value = "内转物流新增卸货实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/addUnLoadResultForconverted")
+    public Map<String, Object> addUnLoadResultForconverted(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = tmsTruckFeign.addUnLoadResultForconverted(map);
+        return resTfulResult;
+    }
+
+    @ApiOperation(value = "查询所有的包月作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(还没有)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getTmstruckMonthResult")
+    public Map<String, Object> getTmstruckMonthResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize
+    ) {
+        return tmsTruckFeign.getTmstruckMonthResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+    }
+
+    /**
+     * 通过运输订单判断下一步是否需要计量,更新汽车衡到计量实绩中
+     */
+    @PostMapping("/updateTruckCalculate/{orderId}")
+    public Map<String, Object> updateTruckCalculate(@PathVariable("orderId") Integer orderId) {
+        return tmsTruckFeign.isNextNeedJl(orderId);
+    }
+
+    @ApiOperation(value="查询所有的短信实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(175)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getSmsResult")
+    public Map<String, Object> getSmsResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            String con
+    ){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsTruckFeign.getSmsResult(mapValue,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation(value="APP查询进厂实绩")
+    @PostMapping("/getEnfactoryResultList")
+    public Map<String ,Object> getEnfactoryResultList() {
+        return tmsTruckFeign.getEnfactoryResultList();
+    }
+
+    @ApiOperation(value="APP通过运输订单id查询进厂实绩")
+    @PostMapping("/getEnfactoryMessageByOrderId")
+    public Map<String ,Object> getEnfactoryMessageByOrderId(String orderNumber) {
+        return tmsTruckFeign.getEnfactoryMessageByOrderId(orderNumber);
+    }
+
+    @ApiOperation(value="查询计皮实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(363)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllTimeTaskResult")
+    public RESTfulResult getAllTimeTaskResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con,
+                                              String  userId,
+                                              String startTime,
+                                              String endTime,
+                                              Integer orderType
+    ){
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime,orderType);
+    }
+
+    @ApiOperation(value="查询倒库实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(516)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllReverseResult")
+    public RESTfulResult getAllReverseResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con,
+                                              String  userId,
+                                              String startTime,
+                                              String endTime){
+        return tmsTruckFeign.getAllReverseResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime);
+    }
+
+    @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
+    @PostMapping("/addSteelNzReceiptResult")
+    public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTruckFeign.addSteelNzReceiptResult(map);
+    }
+
+
+    @ApiOperation(value="更新计量实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "计量数据", required = false, dataType = "List<Map>"),
+    })
+    @PostMapping("/updateTruckWeight")
+    public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList){
+        return tmsTruckFeign.updateTruckWeight(mapList);
+    }
+
+    @ApiOperation(value="查询所有的退货实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllReturnResult")
+    public Map<String, Object> getAllReturnResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer orderType,
+                                            String con
+    ){
+        return tmsTruckFeign.getAllReturnResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, con);
+    }
+    @ApiOperation(value="提货单 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/getBillOrder")
+    public Map<String, Object> getBillOrder(@RequestParam String orderNumber){
+        return tmsTruckFeign.getBillOrder(orderNumber);
+    }
+
+    @ApiOperation(value="发货通知单 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/getDeliveryOrder")
+    public Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber){
+        return tmsTruckFeign.getDeliveryOrder(orderNumber);
+    }
+    @ApiOperation(value="模糊查询江船名 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "state", value = "用户输入的江船名", required = false, dataType = "String"),
+    })
+    @PostMapping("getShipNameList")
+    public Map<String, Object> getShipNameList(@RequestParam(value = "state") String state){
+        return tmsshipFeign.getShipNameList(state);
+    }
+
+    @ApiOperation(value = "国产矿导入")
+    @PostMapping(value = "/importDomesticLoadResult")
+    public Map<String, Object> importDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTrainFeign.importDomesticLoadResult(mapValue);
+    }
+
+    @ApiOperation(value = "进口矿导入")
+    @PostMapping(value = "/importImportedLoadResult")
+    public Map<String, Object> importImportedLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTrainFeign.importImportedLoadResult(mapValue);
+    }
+
+
+    @ApiOperation(value = "国产矿新增/海港-老区轨道衡新增装车")
+    @PostMapping(value = "/addDomesticLoadResult")
+    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTrainFeign.addDomesticLoadResult(mapValue);
+    }
+
+    @ApiOperation(value = "国产矿物流补录装车信息")
+    @PostMapping(value = "/updateDomesticLoadResult")
+    public Map<String, Object> updateDomesticLoadResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.updateDomesticLoadResult(map);
+    }
+
+    @ApiOperation(value = "添加火车计量委托")
+    @PostMapping(value = "/addTrainMeasureCommission")
+    public Map<String, Object> addTrainMeasureCommission(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.addTrainMeasureCommission(map);
+    }
+
+    @ApiOperation(value = "查询需要发送计量委托的车皮信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(209)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/getLoadResultToSendMC")
+    public Map<String, Object> getLoadResultToSendMC( @RequestBody(required = false) Map<String, Object> mapValue,
+            Integer apiId,
+            Integer pageNum,
+            Integer pageSize, String startTime, String endTime,Integer resultType,String con) {
+        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,startTime,endTime,con);
+    }
+
+    @ApiOperation(value = "查询计量数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(209)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/getWeightResult")
+    public Map<String, Object> getWeightResult( @RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,String startTime, String endTime,Integer resultType,String con) {
+        return tmsTrainFeign.getWeightResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,startTime,endTime,con);
+    }
+
+    @ApiOperation(value = "批量新增计量委托")
+    @PostMapping(value = "/batchSendMeasureCommission")
+    public Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.batchSendMeasureCommission(map);
+    }
+
+
+      //获取合同水分值，实装吨位，水分吨位
+    @PostMapping("/getMoistureAndInstallations")
+    public Map<String,Object> getMoistureAndInstallations(@RequestBody(required=false) Map<String,Object> map){
+        return tmsshipFeign.getMoistureAndInstallations(map);
+    }
+
+
+    @ApiOperation(value="查询辅料燃料统计报表")
+    @PostMapping("/getRLFLReport")
+    public Map<String, Object> getRLFLReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String startTime,
+                                               String endTime,
+                                               Integer orderType,
+                                               String con
+    ){
+        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType,con);
+    }
+    @ApiOperation(value="查询销售统计报表")
+    @PostMapping("/getAllSaleReport")
+    public Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String startTime,
+                                          String endTime,
+                                          String carrierSsoId,
+                                                Integer orderType,
+                                                Integer shipperId,
+                                                String receiveName,
+                                                String materialName,
+                                                String wareHouse
+    ){
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId,receiveName,materialName,wareHouse);
+    }
+
+    @ApiOperation(value="查询销售统计报表筛选过后的总净重")
+    @PostMapping("/getAllSaleReportTotal")
+    public Map<String, Object> getAllSaleReportTotal(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                String startTime, String endTime,
+                                                String carrierSsoId
+    ){
+        return tmsTruckFeign.getAllSaleReportTotal(mapValue==null?new HashMap<>():mapValue, startTime, endTime, carrierSsoId);
+    }
+
+    @ApiOperation(value="查询零星物资进厂统计报表")
+    @PostMapping("/getSporadicSuppliesReport1")
+    public Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                String startTime, String endTime,
+                                                String carrierSsoId,
+                                               String userId,
+                                               String userIds,
+                                               String con,
+                                               Integer orderType
+    ){
+        return tmsTruckFeign.getSporadicSuppliesReport1(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
+    }
+    @ApiOperation(value="查询零星物资出厂统计报表")
+    @PostMapping("/getSporadicSuppliesReport2")
+    public Map<String, Object> getSporadicSuppliesReport2(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String startTime,
+                                                          String endTime,
+                                                          String carrierSsoId,
+                                                          String userId,
+                                                          String userIds,
+                                                          String con,
+                                                          Integer orderType
+    ){
+        return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
+    }
+
+    @ApiOperation(value="查询采购内转运输实绩")
+    @PostMapping("/getPurInwardReport")
+    public Map<String, Object> getPurInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String startTime,
+                                                          String endTime) {
+        return tmsTruckFeign.getPurInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+    @ApiOperation(value="查询内转运输实绩")
+    @PostMapping("/getInwardReport")
+    public Map<String, Object> getInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String startTime,
+                                                          String endTime) {
+        return tmsTruckFeign.getInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+    @ApiOperation(value="")
+    @PostMapping("/getLoaderForResultDetail")
+    public Map<String, Object> getLoaderForResultDetail(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String startTime,
+                                               String endTime,
+                                               String con, String isPage) {
+        return tmsTruckFeign.getLoaderForResultDetail(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime,con,isPage);
+    }
+
+
+    @ApiOperation(value="获取内转报表")
+    @PostMapping("/getPurchaseInwardList")
+    public Map<String, Object> getPurchaseInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                        Integer apiId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        String startTime,
+                                                        String endTime,
+                                                        String orgCode,
+                                                        String isPage,
+                                                        String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getPurchaseInwardList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
+
+
+
+    @ApiOperation(value="获取采购订单报表")
+    @PostMapping("/getPurchaseOrderList")
+    public Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String startTime,
+                                             String endTime,
+                                             String orgCode,
+                                                    String isPage,
+                                                    String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getPurchaseOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
+
+    @ApiOperation(value="获取采购订单报表")
+    @PostMapping("/getInwardInFactory")
+    public Map<String, Object> getInwardInFactory(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String startTime,
+                                                    String endTime,
+                                                    String orgCode,
+                                                    String isPage,
+                                                  String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getInwardInFactory(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
+
+    @ApiOperation(value="获取销售订单列表")
+    @PostMapping("/getSaleOrderList")
+    public Map<String, Object> getSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String startTime,
+                                                    String endTime,
+                                                    String orgCode,
+                                                    String isPage,
+                                                   String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
+    @PostMapping("/sendMeasureCommission")
+    public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.sendMeasureCommission(map);
+    }
+
+    @ApiOperation(value="发送留皮计量委托(neizhuan)")
+    @GetMapping("/sendLiuPiMeasureCommission")
+    public Map<String, Object> sendLiuPiMeasureCommission(String capacityNumber){
+        return tmsTruckFeign.sendLiuPiMeasureCommission(capacityNumber);
+    }
+
+
+    @ApiOperation(value="新增计时作业实绩")
+    @PostMapping("/addTimeTaskResult")
+    public Map<String, Object> addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.addTimeTaskResult(map);
+    }
+
+    @ApiOperation(value="计时判断是否开始")
+    @PostMapping("/JudgeTimeTask")
+    public Map<String, Object> JudgeTimeTask(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.JudgeTimeTask(map);
+    }
+
+
+
+    @ApiOperation(value="计时暂停")
+    @PostMapping("/unitSureEndTimeout")
+    public Map<String, Object> unitSureEndTimeout(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.unitSureEndTimeout(map);
+    }
+
+    @ApiOperation(value="计时暂停")
+    @PostMapping("/JudgeTimeTaskPause")
+    public Map<String, Object> JudgeTimeTaskPause(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.JudgeTimeTaskPause(map);
+    }
+
+
+    @ApiOperation(value="对内转车辆装货点进行统计")
+    @PostMapping("/getLoading")
+    public Map<String, Object> getLoading(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String startTime,
+                                             String endTime
+    ){
+        return tmsTruckFeign.getLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+
+    @ApiOperation(value="对内转车辆装货点进行统计")
+    @PostMapping("/getLoaderResult")
+    public Map<String, Object> getLoaderResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String startTime,
+                                          String endTime
+    ){
+        return tmsTruckFeign.getLoaderResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+
+
+
+
+    @ApiOperation(value="对内转车辆装卸货点进行统计")
+    @PostMapping("/getUnLoading")
+    public Map<String, Object> getUnLoading(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String startTime,
+                                          String endTime
+    ){
+        return tmsTruckFeign.getUnLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+
+
+
+
+
+
+    @ApiOperation(value="查询零星中转统计报表")
+    @PostMapping("/getLXInwardReport")
+    public Map<String, Object> getLXInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String startTime,
+                                           String endTime,
+                                                 String con
+    ){
+        return tmsTruckFeign.getLXInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,con);
+    }
+
+
+    @ApiOperation(value="拼装车内转统计报表")
+    @PostMapping("/getInwardReportForAssemble")
+    public Map<String, Object> getInwardReportForAssemble(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 String startTime,
+                                                 String endTime,BigDecimal orderType, String index, String isPage,String orgCode
+
+    ){
+        return tmsTruckFeign.getInwardReportForAssemble(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,orderType,index,isPage,orgCode);
+    }
+
+
+    @ApiOperation("保卫部随机抽查车牌号")
+    @PostMapping("/getCapacityByDefend")
+    public Map<String,Object> getCapacityByDefend(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  String startTime,
+                                                  String endTime,
+                                                  String con,
+                                                  String yes){
+        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con,yes);
+    }
+
+    @ApiOperation("厂外抵达作业")
+    @PostMapping("/getReceiptResult")
+    public Map<String,Object> getReceiptResult(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  String con,
+                                                  String startTime,
+                                                  String endTime){
+        return tmsTruckFeign.getReceiptResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("展示满货箱的照片")
+    @PostMapping("/getReceiptPhoto")
+    public String getReceiptPhoto(@RequestParam String orderNumber){
+        return tmsTruckFeign.getReceiptPhoto(orderNumber);
+    }
+
+
+    @ApiOperation("厂外收货作业")
+    @PostMapping("/getReceivingResult")
+    public Map<String,Object> getReceivingResult(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con,
+                                               String startTime,
+                                               String endTime){
+        return tmsTruckFeign.getReceivingResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("展示收货的照片")
+    @PostMapping("/getReceivingPhoto")
+    public Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber){
+        return tmsTruckFeign.getReceivingPhoto(orderNumber);
+    }
+    @ApiOperation("展示收货的照片")
+    @PostMapping("/getReceivingPhotoByUrl")
+    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber) throws Exception {
+        Map<String,Object> map=tmsTruckFeign.getReceivingPhotoByUrl(orderNumber);
+        if(map.containsKey("resultEmptyContainerPhoto") && map.get("resultEmptyContainerPhoto")!=null){
+            String resultEmptyContainerPhoto = (String) imageFileUtils.downloadFile(map.get("resultEmptyContainerPhoto").toString());
+            map.put("resultEmptyContainerPhoto",resultEmptyContainerPhoto);
+        }
+        if(map.containsKey("resultSignedNotePhoto") && map.get("resultSignedNotePhoto")!=null){
+            String resultSignedNotePhoto = (String) imageFileUtils.downloadFile(map.get("resultSignedNotePhoto").toString());
+            map.put("resultSignedNotePhoto",resultSignedNotePhoto);
+        }
+        return map;
+    }
+
+
+    @ApiOperation("根据船舶位置查询船舶动态")
+    @PostMapping("/getShipLocationStatus")
+    public Map<String,Object> getShipLocationStatus(String shipLocation) {
+        Map<String, Object> map = tmsshipFeign.getShipLocationStatus(shipLocation);
+        return map;
+    }
+    //根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话
+    @ApiOperation(value="根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话", notes="模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "personName",value = "用户输入的输入提货联系人", required = false, dataType = "String")
+    })
+
+    @PostMapping("/getPersonByName")
+    public Map<String,Object>  getPersonByName(@RequestParam(value ="personName")String personName){
+        return tmsshipFeign.getPersonByName(personName);
+
+    }
+
+    //根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话
+    @ApiOperation(value="根据发货通知中用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话", notes="模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "personName",value = "用户输入的输入提货联系人", required = false, dataType = "String")
+    })
+
+    @PostMapping("/getNoticeContactNumberByPerson")
+    public Map<String,Object>  getNoticeContactNumberByPerson(@RequestParam(value ="personName")String personName){
+        return tmsshipFeign.getNoticeContactNumberByPerson(personName);
+
+    }
+
+
+
+
+    @ApiOperation(value="获取内转报表")
+    @PostMapping("/getOutFactoryInwardList")
+    public Map<String, Object> getOutFactoryInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String startTime,
+                                                     String endTime,
+                                                     String orgCode,
+                                                     String isPage,
+                                                     String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getOutFactoryInwardList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+	
+	@ApiOperation(value = "根据物资名和外轮船名查询采购订单号")
+    @PostMapping(value = "/findPurchaseOrderList")
+    public Map<String, Object> findPurchaseOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String materialName,
+                                                          String resultForeignShipName,
+                                                          String supplierName){
+        if(map==null)
+            map=new HashMap<>();
+        System.out.println(map);
+        return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName,supplierName);
+    }
+
+    @ApiOperation(value = "查询待绑定的批次")
+    @PostMapping(value = "/findBatchForBind")
+    public Map<String, Object> findBatchForBind(@RequestBody(required = false) Map<String, Object> map,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String materialName,
+                                                     String foreignShipName){
+        if(map==null)
+            map=new HashMap<>();
+        return tmsshipFeign.findBatchForBind(map,apiId,pageNum,pageSize,materialName, foreignShipName);
+    }
+
+    @ApiOperation(value = "绑定批次")
+    @PostMapping(value = "bindBatch")
+    Map<String, Object> bindBatch(@RequestBody(required = false) Map<String, Object> map){
+        return tmsshipFeign.bindBatch(map);
+    }
+
+    @ApiOperation(value = "销售钢材统计报表")
+    @PostMapping("/getSaleSteelReport")
+    public Map<String,Object> getSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String carrierSsoId,
+                                                 String receiveName,
+                                                 String materialName,
+                                                 String specification,
+                                                 String remark,
+                                                 String capacityNo,
+                                                 String carrierName,
+                                                 String consigneeName,
+                                                 String saler,
+                                                 String easPrimaryId){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
+    }
+
+    @ApiOperation(value = "销售钢材统计报表")
+    @PostMapping("/getSaleSteelSpellingReport")
+    public Map<String,Object> getSaleSteelSpellingReport(@RequestBody(required = false)Map<String,Object>map){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleSteelSpellingReport(map);
+    }
+
+    @ApiOperation(value = "计费详单（未结算）")
+    @PostMapping("/getSaleSteelReportNew")
+    public Map<String,Object> getSaleSteelReportNew(@RequestBody(required = false)Map<String,Object>map,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String carrierSsoId,
+                                                 String receiveName,
+                                                 String materialName,
+                                                 String specification,
+                                                 String remark,
+                                                 String capacityNo,
+                                                 String carrierName,
+                                                 String consigneeName,
+                                                 String saler,
+                                                 String easPrimaryId){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleSteelReportNew(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
+    }
+
+
+    @ApiOperation(value = "计费详单（已结算）")
+    @PostMapping("/getSettledSaleSteelReportNew")
+    public Map<String,Object> getSettledSaleSteelReportNew(@RequestBody(required = false)Map<String,Object>map,
+                                                    String startTime,
+                                                    String endTime,
+                                                    String carrierSsoId,
+                                                    String receiveName,
+                                                    String materialName,
+                                                    String specification,
+                                                    String remark,
+                                                    String capacityNo,
+                                                    String carrierName,
+                                                    String consigneeName,
+                                                    String saler,
+                                                    String easPrimaryId){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getSettledSaleSteelReportNew(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
+    }
+
+    @ApiOperation(value = "销售钢材未装统计报表")
+    @PostMapping("/loadingSaleSteelReport")
+    public Map<String,Object> loadingSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String carrierSsoId,
+                                                 String receiveName,
+                                                 String materialName,
+                                                 String specification,
+                                                 String remark,
+                                                 String capacityNo,
+                                                 String carrierName,
+                                                 String consigneeName,
+                                                 String saler,
+                                                 String easPrimaryId){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.loadingSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
+    }
+
+
+    @ApiOperation(value = "销售钢材统计报表")
+    @PostMapping("/getInwardSaleSteelReport")
+    public Map<String,Object> getInwardSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String carrierSsoId,
+                                                 String receiveName,
+                                                 String materialName,
+                                                 String specification,
+                                                 String remark,
+                                                 String capacityNo,
+                                                 String carrierName,
+                                                 String consigneeName,
+                                                 String saler){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getInwardSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler);
+    }
+
+    @ApiOperation(value = "销售钢材派单列表")
+    @PostMapping("/getInwardSaleSteelOrder")
+    public Map<String,Object> getInwardSaleSteelOrder(@RequestBody(required = false)Map<String,Object>map,
+                                                       String startTime,
+                                                       String endTime,
+                                                       String remark,
+                                                       String capacityNo,
+                                                       String consigneeName,
+                                                       String saler){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getInwardSaleSteelOrder(map,startTime,endTime,remark,capacityNo,consigneeName);
+    }
+
+    @ApiOperation(value = "发送短信")
+    @PostMapping("sendMeaage")
+    public Map<String,Object> sendMeaage(@RequestParam String mobile,
+                                         @RequestParam String content){
+        return tmsTruckFeign.sendMeaage(mobile,content);
+    }
+
+    /**
+     * 修改三程船装船作业明细
+     * @param
+     * @return
+     */
+    @PostMapping("/updateThreeSectionDetails")
+    public Map<String,Object> updateThreeSectionDetails(@RequestBody(required = false) Map<String, Object> mapVal){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return tmsshipFeign.updateThreeSectionDetails(mapVal);
+    }
+
+    @PostMapping("/addPleaseResult")
+    public Map<String,Object> addPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return tmsshipFeign.addPleaseResult(mapVal);
+    }
+
+    @PostMapping("/editPleaseResult")
+    public Map<String,Object> editPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return tmsshipFeign.editPleaseResult(mapVal);
+    }
+
+    @PostMapping("/getAllPleaseResult")
+    public Map<String,Object> getAllPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam Integer apiId,
+                                                  String con,
+                                                  String startTime,
+                                                  String endTime){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return tmsshipFeign.getAllPleaseResult(mapVal,pageNum,pageSize,apiId,con,startTime,endTime);
+    }
+
+    @PostMapping("/getPleaseResult/{resultId}")
+    public Map<String,Object> getPleaseResult(@PathVariable("resultId") BigDecimal resultId){
+        return tmsshipFeign.getPleaseResult(resultId);
+    }
+
+    @PostMapping("/getRealNumber")
+    public Map<String,Object> getRealNumber(@RequestBody(required = false) Map<String, Object> map){
+        return tmsshipFeign.getRealNumber(map);
+    }
+
+    @PostMapping("/getWagonWork")
+    public Map<String,Object> getWagonWork(@RequestBody(required = false) Map<String, Object> map){
+        return tmsshipFeign.getWagonWork(map);
+    }
+
+    @PostMapping("/queryNumber")
+    public Map<String,Object> queryNumber(@RequestParam String orderNumber){
+        return tmsTruckFeign.queryNumber(orderNumber);
+    }
+
+    @PostMapping("/changeNumber")
+    public Map<String,Object> changeNumber(@RequestParam String orderNumber){
+        return tmsTruckFeign.changeNumber(orderNumber);
+    }
+
+    @ApiOperation("根据车序号id查询主干数据")
+    @PostMapping("/getSteelReportDetailsBySmId")
+    public Map<String,Object> getSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId){
+        return tmsTruckFeign.getSteelReportDetailsBySmId(saleOrderMaterialId);
+    }
+
+    @PostMapping("/changeOrderLine")
+    public Map<String,Object> changeOrderLine(@RequestBody(required = false) Map<String, Object> map){
+        return tmsTruckFeign.changeOrderLine(map);
+    }
+
+    @ApiOperation("根据车序号id查询主干数据")
+    @PostMapping("/getSaleSteelReportForFinance")
+    public Map<String,Object> getSaleSteelReportForFinance(@RequestParam BigDecimal saleOrderMaterialId){
+        return tmsTruckFeign.getSaleSteelReportForFinance(saleOrderMaterialId);
+    }
+
+    @ApiOperation(value = "销售钢材运输情况统计报表")
+    @PostMapping("/steelTransportReport")
+    public Map<String,Object> steelTransportReport(@RequestBody(required = false)Map<String,Object>map,
+                                                     String startTime,
+                                                     String endTime){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.steelTransportReport(map,startTime,endTime);
+    }
+
+    @ApiOperation(value = "欠运力统计报表")
+    @PostMapping("/yawnReport")
+    public Map<String,Object> yawnReport(@RequestBody(required = false)Map<String,Object>map){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.yawnReport(map);
+    }
+}

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -0,0 +1,1271 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.config.ImageFileUtils;
+import com.steerinfo.dil.mapper.UniversalMapper;
+import com.steerinfo.dil.service.impl.UniversalServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartRequest;
+
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:06
+ * 通用接口
+ */
+@RequestMapping("${api.version}/uc")
+@RestController
+public class UniversalController extends BaseRESTfulController {
+
+    @Autowired
+    UniversalServiceImpl universalService;
+
+    @Autowired
+    UniversalMapper universalMapper;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @Autowired
+    private ImageFileUtils imageFileUtils;
+
+
+    @ApiOperation(value="查询数据打印提货单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/printTHD")
+    public RESTfulResult printTiHuoDan(@RequestBody(required=false) Map<String, Object> mapValue){
+        Map<String, Object> tiHuoDan = universalService.printTiHuoDan((String) mapValue.get("orderNumber"));
+        return success(tiHuoDan);
+    }
+
+
+    @ApiModelProperty(value = "模糊查询发货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "247", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/querySupplierByLike")
+    public RESTfulResult querySupplierByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index","%" + index + "%");
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.querySupplierByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId,columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "查询所有发货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "247", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryAllSupplierByLike")
+    public RESTfulResult queryAllSupplierByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index","%" + index + "%");
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryAllSupplierByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+
+
+    @ApiModelProperty(value = "通过物资ID查询该物资的发货单位信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "247", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSupplierMesByMaterialId")
+    public RESTfulResult getSupplierMesByMaterialId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index, String materialId) {
+        if(mapValue == null)
+            mapValue = new HashMap<>();
+
+        if(!"null".equals(materialId))
+            mapValue.put("materialId",materialId);
+
+        if(index != null){
+            mapValue.put("index","%" + index + "%");
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getSupplierMesByMaterialId(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+
+    @ApiOperation(value="查询所有运力信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllCapacityByCarrierLike")
+    public RESTfulResult getAllCapacityByCarrierLike(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        String carrierSsoId,
+                                        String index,
+                                        String con,
+                                        String indexText
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        if (con != null&& !con.equals("undefined")){
+            mapValue.put("con",con);
+        }
+        if (indexText != null&& !indexText.equals("undefined")){
+            mapValue.put("indexText",indexText);
+        }
+
+        if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
+            carrierSsoId = null;
+        }
+        if (carrierSsoId != null) {
+          BigDecimal carrierId = universalMapper.getCarrierIdBySSO(carrierSsoId);
+          mapValue.put("carrierId",carrierId);
+        }
+        //不分页筛选数据
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, capacity);
+        return success(pageList);
+    }
+
+
+
+
+    @ApiOperation(value="查询运力类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getCapacityType")
+    public RESTfulResult getCapacityType(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String index
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(index != null&&!index.equals("null")){
+            mapValue.put("index", index);
+        }
+        //不分页筛选数据
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getCapacityType(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, capacity);
+        return success(pageList);
+    }
+
+
+
+    @ApiOperation(value="通过订单ID查询订单下所有物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(395)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getMaterialMesByOrderId")
+    public RESTfulResult getMaterialMesByOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String orderId
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(orderId != null){
+            mapValue.put("orderId", orderId);
+        }
+        //不分页筛选数据
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getMaterialMesByOrderId(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, capacity);
+        return success(pageList);
+    }
+
+
+    @ApiModelProperty(value = "边输边查发货单位")
+    @PostMapping("/getSupplierMesByLike")
+    public RESTfulResult getSupplierMesByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getSupplierMesByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "船名边输边查")
+    @PostMapping("/getShipNameMesByLike")
+    public  RESTfulResult getShipNameMesByLike(@RequestParam("index") String index,Integer materialId) {
+        Map<String, Object> map = new HashMap<>();
+        if(materialId != null){
+            map.put("materialId",materialId);
+        }
+        if(index != null){
+            map.put("index","%" + index + "%");
+        }
+        List<Map<String,Object>>list = universalMapper.getShipNameMesByLike(map);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查用车单位")
+    @PostMapping("/getRequireUnitName")
+    public RESTfulResult getRequireUnitName(@RequestParam("index") String index) {
+        List<Map<String,Object>>list = universalMapper.getRequireUnitName(index == null ? "" : "%" + index + "%");
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查收货单位")
+    @PostMapping("/getConsigneeByLike")
+    public RESTfulResult getConsigneeByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getConsigneeByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "历史收货单位")
+    @PostMapping("/getConsigneeHistory")
+    public RESTfulResult getConsigneeHistory() {
+        List<Map<String, Object>> list = universalMapper.getConsigneeHistory();
+        return success(list);
+    }
+
+
+    @ApiModelProperty(value = "通过订单ID查询订单下物资信息")
+    @PostMapping("/getOrderMaterialMesByOrderId/{orderId}")
+    public RESTfulResult getMaterialMesByOrderId(@PathVariable("orderId") Integer orderId){
+        List<Map<String, Object>> mes = universalMapper.getOrderMaterialMesByOrderId(new BigDecimal(orderId));
+        return success(mes);
+    }
+
+    @ApiModelProperty(value = "模糊查询物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryAPOMaterialByLike")
+    public RESTfulResult queryAPOMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String index,
+                                                Integer supplierId) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null && !"".equals(index) &&!"null".equals(index)){
+            mapValue.put("index", index);
+        }
+        if(supplierId != null){
+            mapValue.put("supplierId", supplierId);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryAPOMaterialByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+
+    @ApiModelProperty(value = "模糊查询卸货点")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "374", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getUnloadingMesByLike")
+    public RESTfulResult getUnloadingMesByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             Integer type,
+                                             String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(type != null){
+            mapValue.put("type", type);
+        }
+        if(index != null && !"".equals(index) && !"null".equals(index)){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getUnloadingMesByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "模糊查询物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryMaterialByLike")
+    public RESTfulResult queryMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryMaterialByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "模糊查询批次")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryBatchByLike")
+    public RESTfulResult queryBatchByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getBatchAndOrderMes(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "模糊查询批次")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "502", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/selectPurchaseOrderForShip")
+    public RESTfulResult selectPurchaseOrderForShip(@RequestBody(required = false) Map<String,Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId,
+                                          String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.selectPurchaseOrderForShip(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "二程船结算用：查询发货通知的已下发批次")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "502", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getBatchOfNotice")
+    public RESTfulResult getBatchOfNotice(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer apiId,
+                                                    String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getBatchOfNotice(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "查询存在装船作业并且尚未计算水运费的批次")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "502", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/findBatchHavingLoad")
+    public RESTfulResult findBatchHavingLoad(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String index){
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.findBatchHavingLoad(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+
+
+
+
+    @ApiModelProperty(value = "边输边查承运商")
+    @PostMapping("/getCarrierMesByLike")
+    public RESTfulResult getCarrierMesByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getCarrierMesByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "模糊查询收货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "396", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryConsigneeByLike")
+    public RESTfulResult queryConsigneeByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryConsigneeByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "模糊查询物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "395", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/selectAllMaterialName")
+    public RESTfulResult selectAllMaterialName(@RequestBody(required = false) Map<String,Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId,
+                                              String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null && !"".equals(index) && !"null".equals(index)){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.selectAllMaterialName(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "返回sha1加密字符串")
+    @RequestMapping(value = "/sha1DigestUtils", method = {RequestMethod.GET,RequestMethod.POST})
+    public String sha1DigestUtils(String text){
+        return universalService.sha1DigestUtils(text);
+    }
+
+    @ApiModelProperty(value = "查装货卸货点")
+    @PostMapping("/selectUnloadingPoint")
+    public List<Map<String, Object>> selectUnloadingPoint(String index) {
+        String index1 = null;
+        if(index != null && !"null".equals(index) && !"".equals(index)){
+            index1 = "%" + index + "%";
+        }
+        return universalMapper.selectUnloadingPoint(index1);
+    }
+
+    @ApiModelProperty(value = "模糊查询承运商")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "412", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getCarrierListByLike")
+    public RESTfulResult getCarrierListByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String index) {
+        if(index != null){
+            if(index.length() == 0){
+                index = null;
+            }else {
+                index = "%" + index + "%";
+            }
+        }
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("index",index);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getCarrierListByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "所有门岗下拉框")
+    @GetMapping("/getAllGatepost")
+    public List<Map<String,Object>> getAllGatepost(){
+        return universalMapper.getAllGatepost();
+    }
+
+    //通过承运商id获取userId
+    @PostMapping("/getUserIdByCarrierId")
+    public String getUserIdByCarrierId(@RequestBody Map<String,Object> map){
+        //获取承运商id
+        Integer carrierId =(Integer) map.get("carrierId");
+        return universalMapper.getUserIdbyCarrierId(carrierId);
+    }
+
+
+
+    @ApiModelProperty(value = "已经在sso权限模块承运商下拉框")
+    @GetMapping("/getAllCarrierIdForSso")
+    public List<Map<String,Object>> getAllCarrierIdForSso(){
+        return universalMapper.getAllCarrierIdForSso();
+    }
+
+
+    @ApiModelProperty(value = "模糊查询收货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "418", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getConsigneeListByLike")
+    public RESTfulResult getConsigneeListByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String index) {
+        if(index != null){
+            if(index.length() == 0){
+                index = null;
+            }else {
+                index = "%" + index + "%";
+            }
+        }
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("index",index);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getConsigneeListByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiOperation("通过运输订单id查询销售订单审核状态")
+    @PostMapping("/getSaleOrderStatus")
+    public Integer getSaleOrderStatus(@RequestParam Integer orderId) {
+        Integer saleStatus = universalMapper.getSaleOrderStatus(new BigDecimal(orderId));
+        return saleStatus;
+    }
+
+    @ApiOperation("查询所有的汽车衡")
+    @GetMapping("/getAllCalculateMes")
+    public List<Map<String, Object>> getAllCalculateMes() {
+        return universalMapper.getAllCalculateMes();
+    }
+
+    @ApiOperation("查询所有的焦炭子类")
+    @GetMapping("/getAllMaterialCoke")
+    public List<Map<String, Object>> getAllMaterialCoke() {
+        return universalMapper.getAllMaterialCoke();
+    }
+
+    @ApiModelProperty(value = "边输边查车牌号")
+    @PostMapping("/getCapacityByLike")
+    public RESTfulResult getCapacityByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getCapacityByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查批次")
+    @GetMapping("/getBatchByLike")
+    public RESTfulResult getBatchByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getBatchByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "根据运力id查询所有承运商（下拉框）")
+    @GetMapping("/getCarrierByCapacityId")
+    public RESTfulResult getCarrierByCapacityId(@RequestParam("capacityId") Integer capacityId) {
+        List<Map<String, Object>> list = universalMapper.getCarrierByCapacityId(new BigDecimal(capacityId));
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "根据收货客户查询承运商")
+    @PostMapping("/getCarrierByConsignee")
+    public RESTfulResult getCarrierByConsignee(@RequestBody Map<String,Object> mapValue) {
+        Map<String, Object> map = universalService.getCarrierByConsignee(mapValue);
+        return success(map);
+    }
+
+    @ApiModelProperty(value = "确认车牌号与承运商关系是否存在")
+    @PostMapping("/isInCapacityCarrier")
+    public RESTfulResult isInCapacityCarrier(@RequestBody Map<String,Object> mapValue) {
+        Map<String,Object> map = universalService.isInCapacityCarrier(mapValue);
+        BigDecimal capacityId = (BigDecimal) map.get("capacityId");
+        BigDecimal capacityCarrierId = (BigDecimal) map.get("capacityCarrierId");
+        if (capacityId == null) {
+            return failed();
+        }
+        if (capacityCarrierId == null) {
+            return failed(capacityId);
+        }
+        return success(map);
+    }
+
+    @ApiModelProperty(value = "得到所有油价联动计费公式（apiId：444）")
+    @PostMapping("/getOilFormula")
+    public RESTfulResult getOilFormula(@RequestBody(required = false) Map<String,Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("con", con);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getOilFormula(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "获得港口下拉框")
+    @GetMapping("/getPortId")
+    public RESTfulResult getPortId() {
+        return success(universalService.getPortId());
+    }
+
+    @ApiModelProperty(value = "获取车牌号边输边查")
+    @GetMapping("/getCapacityNumber")
+    public RESTfulResult getCapacityNumber(String index) {
+        if(index.length() < 3){
+            return failed();
+        }
+        return success(universalService.getCapacityNumber(index));
+    }
+
+    @ApiModelProperty(value = "获得订单号及订单号下面物资")
+    @GetMapping("/getOrderNumber")
+    public RESTfulResult getOrderNumber(String capacityId) {
+        return success(universalService.getOrderNumber(capacityId));
+    }
+
+    @ApiModelProperty(value = "根据订单查询物资")
+    @GetMapping("/getMaterialIdByOrderId")
+    public RESTfulResult getMaterialIdByOrderId(Integer orderId) {
+        return success(universalService.getMaterialIdByOrderId(orderId));
+    }
+
+    @ApiOperation(value = "修改路段顺序号")
+    @PostMapping("/updateLineSqe")
+    public RESTfulResult updateLineSqe(@RequestBody Map<String,Object> map) {
+        int i = universalMapper.updateLineSqe(map);
+        return success(i);
+    }
+
+    @ApiModelProperty(value = "边输边查物资")
+    @GetMapping("/getMaterialByLike")
+    public RESTfulResult getMaterialByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getMaterialByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiOperation(value="通过一个carrierSsoId获得承运商对象")
+    @GetMapping("/getRmsCarrierByCarrierSsoId")
+    public RESTfulResult getRmsCarrierByCarrierSsoId(String carrierSsoId){
+       Map<String,Object> carrier= universalMapper.getRmsCarrierByCarrierSsoId(carrierSsoId);
+       if (carrier==null){
+           failed();
+       }
+       return success(carrier);
+    }
+
+    @ApiModelProperty(value = "模糊查询钢材物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSteelMaterial")
+    public RESTfulResult getSteelMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId,
+                                          String materialNameText,
+                                          String materialSpecificationText,
+                                          String materialModelText) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if (materialNameText != null && !materialNameText.equals("undefined") && !materialNameText.equals("null") && materialNameText != "" && !"".equals(materialNameText)) {
+            mapValue.put("materialNameText", materialNameText);
+        }
+        if (materialSpecificationText != null && !materialSpecificationText.equals("undefined") && !materialSpecificationText.equals("null") && materialSpecificationText != "" && !"".equals(materialSpecificationText)) {
+            mapValue.put("materialSpecificationText", materialSpecificationText);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getSteelMaterial(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiOperation(value="得到所有省份")
+    @PostMapping("/getAllProvince")
+    public RESTfulResult getAllProvince(){
+        List<Map<String,Object>> provinceList = universalMapper.getAllProvince();
+        return success(provinceList);
+    }
+
+    @ApiOperation(value="根据省份得到下面的地级市")
+    @PostMapping("/getDistrictByProvince")
+    public RESTfulResult getDistrictByProvince(@RequestParam String addressProvince){
+        List<Map<String,Object>> districtList = universalMapper.getDistrictByProvince(addressProvince);
+        return success(districtList);
+    }
+
+    @ApiOperation(value="根据地级市得到下面的区/县")
+    @PostMapping("/getTownByDistrict")
+    public RESTfulResult getTownByDistrict(@RequestParam String addressDistrict){
+        List<Map<String,Object>> townList = universalMapper.getTownByDistrict(addressDistrict);
+        return success(townList);
+    }
+
+    @ApiOperation(value="根据省市县得到下面的详细地址")
+    @PostMapping("/getPlaceByAllAddress")
+    public RESTfulResult getPlaceByAllAddress(@RequestBody Map<String,Object> mapValue){
+        List<Map<String,Object>> townList = universalMapper.getPlaceByAllAddress(mapValue);
+        return success(townList);
+    }
+
+    @ApiOperation(value="获得销售员下拉框")
+    @GetMapping("/getSalerList")
+    public RESTfulResult getSalerList(){
+        List<Map<String,Object>> salerList= universalMapper.getSalerList();
+        return success(salerList);
+    }
+
+    @ApiOperation(value="通过收货客户匹配销售组")
+    @PostMapping("/getSaleArea")
+    public RESTfulResult getSaleArea(@RequestParam Integer receiveId) {
+        String saleArea = universalMapper.getSaleArea(new BigDecimal(receiveId));
+        return success(saleArea);
+    }
+
+    @ApiOperation(value = "质保书前端展示")
+    @PostMapping("/getWarranty")
+    public RESTfulResult getWarranty(@RequestParam("orderNumber") String orderNumber) {
+
+        //List<String> list = universalService.getWarrantyAndPrint(orderNumber);
+        List<String> list= universalService.getWarranty(orderNumber);
+        if(list.get(0).equals("-1")){
+            return failed(-1,"质保书正在紧张制作中，请耐心等待！");
+        }else if(list.get(0).equals("-2")){
+            return failed(-2,"该车还未装货");
+        }
+        return success(list);
+    }
+    @ApiOperation(value = "查询待分解计划数量")
+    @PostMapping("/getPlanCount")
+    public Integer getPlanCount(){
+        return universalMapper.getPlanCount();
+    }
+
+    @ApiOperation(value = "查询承运起止地点下拉框")
+    @GetMapping("/getTransRange")
+    public RESTfulResult getTransRange(){
+        return success(universalMapper.getTransRange());
+    }
+
+//    //测试质保书回显
+//    @PostMapping("/getTest")
+//    public RESTfulResult getTest(@RequestBody Map<String,Object> map){
+//       List<String> list = universalService.getTest(map);
+//       if(list.get(0).equals("0")){
+//           return failed("质保书正在紧张制作中，请耐心等待！");
+//       }
+//       return success(list);
+//    }
+
+    @ApiOperation(value = "收货地址下匹配不到任何承运商")
+    @GetMapping("/getNoListCarrier")
+    public RESTfulResult getNoListCarrier() {
+        return success(universalMapper.getNoListCarrier());
+    }
+
+    @ApiOperation(value = "查询承运起止地点下拉框")
+    @GetMapping("/getNotReceiveOrderQuantity")
+    public Integer getNotReceiveOrderQuantity(@RequestParam("capacityNumber") String capacityNumber){
+        return universalMapper.getNotReceiveOrderQuantity(capacityNumber);
+    }
+
+    @ApiOperation(value = "西南水泥独用下拉框")
+    @GetMapping("/getXiNanCarrier")
+    public RESTfulResult getXiNanCarrier() {
+        return success(universalMapper.getXiNanCarrier());
+    }
+
+    @ApiModelProperty(value = "边输边查发站到站")
+    @GetMapping("/getArrivalByLike")
+    public RESTfulResult getArrivalByLike(@RequestParam("index") String index){
+        List <Map<String,Object>> list = universalMapper.getArrivalByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "司机APP订单小红点")
+    @GetMapping("/getOrderNum")
+    public int getOrderNum(@RequestParam("capacityNumber") String capacityNumber){
+        return universalMapper.getOrderNum(capacityNumber);
+    }
+
+    @ApiModelProperty(value = "补录计量实绩")
+    @PostMapping("/recordingWeightResult")
+    public int recordingWeightResult(@RequestBody(required = false)List<Map<String,Object>>mapList){
+        try {
+            return universalService.recordingWeightResult(mapList);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return 1;
+    }
+
+    @ApiOperation("删除计量实绩")
+    @PostMapping("/linkageDeleteTransportOrder")
+    public int linkageDeleteTransportOrder(@RequestBody(required = false)List<Map<String,Object>>mapList){
+        try {
+            return universalService.linkageDeleteTransportOrder(mapList);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return 1;
+    }
+
+    @ApiOperation("删除计量实绩")
+    @PostMapping("/linkageDeleteTransportOrder1")
+    public int linkageDeleteTransportOrder1(
+                                           @RequestBody(required = false)Map<String,Object> map){
+        try {
+            if( map != null) {
+                List<Map<String,Object>> list = new ArrayList<>();
+                list.add(map);
+                return universalService.linkageDeleteTransportOrder(list);
+            }
+            //return universalService.linkageDeleteTransportOrder(mapList);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return 1;
+    }
+
+    @ApiModelProperty(value = "获取仓库月台")
+    @GetMapping("/getSteelWarehouse")
+    public List<Map<String, Object>> getSteelWarehouse(){
+        return universalMapper.getSteelWarehouse();
+    }
+
+
+    @ApiOperation(value = "查询运力联系方式")
+    @GetMapping("/getCapacityTel")
+    public Map<String,Object>getCapacityTel(BigDecimal capacityId){
+        return universalMapper.getCapacityTel(capacityId);
+    }
+
+    @ApiModelProperty(value = "边输边查收货客户")
+    @PostMapping("/getConsigneeMesByLike")
+    public RESTfulResult getConsigneeMesByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getConsigneeMesByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    //根据收货客户userId，查询收货客户信息
+    @ApiOperation(value = "根据userId查询收货客户信息")
+    @GetMapping("/getConsigneeByuserid")
+    public Map<String,Object>getConsigneeByuserid(String userId){
+        return universalMapper.getConsigneeByuserid(userId);
+    }
+
+    //根据销售订单ID修改销售订单状态为上报
+    @PostMapping("/updateSaleOrderStatusById")
+    @ApiOperation(value = "根据销售订单id修改状态为未上报")
+    public RESTfulResult updateSaleOrderStatusById(BigDecimal saleOrderId){
+        return success(universalMapper.updateSaleOrderStatusById(saleOrderId));
+    }
+
+    //根据销售订单ID修改销售订单状态为上报
+    @PostMapping("/updateDriverTel")
+    @ApiOperation(value = "修改司机电话号码")
+    public RESTfulResult updateDriverTel(@RequestBody Map<String,Object> map){
+        try {
+            int orderId = (int) map.get("orderId");
+            String driverTel = (String) map.get("driverTel");
+            //根据运输id去查找出运力ID更新司机电话
+            universalMapper.updateCapacityDriverTel(orderId,driverTel);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return success(universalMapper.updateDriverTel(map));
+    }
+
+    @GetMapping("/getQueueCount")
+    public RESTfulResult getQueueCount(){
+        return success(universalMapper.getQueueCount());
+    }
+
+    @ApiModelProperty(value = "下拉下单客户的历史使用过的地址")
+    @PostMapping("/getReceiverAllPlaceUsed")
+    public RESTfulResult getReceiverAllPlaceUsed(@RequestParam Integer receiveId) {
+        List<Map<String, Object>> list = universalMapper.getReceiverAllPlaceUsed(receiveId);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查片区")
+    @PostMapping("/getSaleAreaByLike")
+    public RESTfulResult getSaleAreaByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getSaleAreaByLike(index == null ? "" : "%" + index + "%");
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "判断收货客户是否绑定片区")
+    @PostMapping("/isReceiveHaveArea")
+    public RESTfulResult isReceiveHaveArea(@RequestParam Integer receiveId) {
+        BigDecimal areaId = universalMapper.isReceiveHaveArea(receiveId);
+        if (areaId == null) {
+            return failed("该下单客户未绑定销售片区！！！");
+        }
+        return success(areaId);
+    }
+
+    @ApiModelProperty(value = "下单客户绑定片区")
+    @PostMapping("/bandSaleArea")
+    public RESTfulResult bandSaleArea(@RequestBody Map<String,Object> map) {
+        int result = universalMapper.bandSaleArea(map);
+        return success(result);
+    }
+
+    @ApiOperation(value = "查询厂内钢材车辆作业总数")
+    @GetMapping("/getSteelOrderNum")
+    public RESTfulResult getSteelOrderNum(){
+        int i = universalMapper.getSteelOrderNum();
+        return success(i);
+    }
+
+    @ApiModelProperty(value = "边输边查收货地址")
+    @PostMapping("/getPlaceAndAddress")
+    public RESTfulResult getPlaceAndAddress(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getPlaceAndAddress(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查物资名称")
+    @PostMapping("/getMaterialNameLike")
+    public RESTfulResult getMaterialNameLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getMaterialNameLike(index == null ? null : "%" + index + "%");
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查仓库")
+    @GetMapping("/getWareHouseNameLike")
+    public RESTfulResult getWareHouseNameLike(@RequestParam("index") String index){
+        List<Map<String, Object>> list = universalMapper.getWareHouseNameLike(index == null ? null : "%" + index + "%");
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查物资规格型号")
+    @PostMapping("/getSpecificationModelLike")
+    public RESTfulResult getSpecificationModelLike(@RequestBody Map<String,Object> map) {
+        List<Map<String, Object>> list = universalMapper.getSpecificationModelLike(map);
+        return success(list);
+    }
+
+    @ApiOperation(value = "内转计重承运合同物资")
+    @PostMapping("/getInwardWeightMaterial")
+    public RESTfulResult getInwardWeightMaterial(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getInwardWeightMaterial(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiOperation(value = "内转异地库查询发站")
+    @GetMapping("/getInwardSendStation")
+    public RESTfulResult getInwardSendStation(){
+        return success(universalMapper.getInwardSendStation());
+    }
+
+    @ApiOperation(value = "获取入库实绩")
+    @PostMapping("/getInwardInboundResult")
+    public RESTfulResult getInwardInboundResult(@RequestBody Map<String,Object> map){
+        List<Map<String,Object>> mapList = universalMapper.getInwardInboundResult(map);
+        //遍历数组去查物资数据
+        for(Map<String,Object>map1:mapList){
+            BigDecimal orderId = DataChange.dataToBigDecimal(map1.get("orderId"));
+            List<Map<String,Object>> materialList = universalMapper.getMaterialList(map1);
+            //for (Map<String,Object>materialMap:materialList){
+            //    BigDecimal materialId = DataChange.dataToBigDecimal(materialMap.get("materialId"));
+            //    //根据运输订单ID和物资ID去查询炉号
+            //    List<Map<String, Object>> luHaoNumberList = universalMapper.getLuhaoNum(orderId,materialId);
+            //    StringBuilder sb = new StringBuilder();
+            //    for (Map<String, Object> luHaoMap : luHaoNumberList) {
+            //        sb.append(luHaoMap.get("materialFurnaceNumber"));
+            //        sb.append("-");
+            //        sb.append(luHaoMap.get("materialNum"));
+            //        sb.append("/");
+            //    }
+            //    if(luHaoNumberList.size() > 0){
+            //        sb.deleteCharAt(sb.length() - 1);
+            //        materialMap.put("luhao",sb.toString());
+            //    }
+            //}
+            map1.put("materialList",materialList);
+        }
+        return success(mapList);
+    }
+
+    @ApiOperation(value = "查询派车状态")
+    @PostMapping("/getDispachSwitch")
+    public RESTfulResult getDispachSwitch(){
+        return success(universalMapper.getDispachSwitch());
+    }
+
+    @ApiOperation(value = "修改派车开关")
+    @PostMapping("/updateDispachSwitch")
+    public RESTfulResult updateDispachSwitch(@RequestBody Map<String,Object> map){
+        return success(universalMapper.updateDispachSwitch(map));
+    }
+
+    @ApiOperation("动态调整放行限制")
+    @GetMapping("/getReleaseFlag")
+    public String getReleaseFlag() {
+        return universalMapper.getReleaseFlag();
+    }
+
+
+    @ApiOperation("根据名称查询收货客户")
+    @PostMapping("/getConsigneeInfo")
+    public Map<String,Object> getConsigneeInfo(String consigneeName){
+        return universalMapper.getConsigneeInfo(consigneeName);
+    }
+
+    @ApiOperation("收货客户查询")
+    @PostMapping("/getColumnNoRoutList")
+    public List<String> getColumnNoRoutList(@RequestBody(required = false) Map<String,Object> map) {
+        return universalMapper.getColumnNoRoutList(map);
+    }
+
+    @ApiOperation("获取图片通用方法")
+    @PostMapping("/getPicture")
+    public List<String> getPicture(@RequestBody(required = false) Map<String,Object> map) throws Exception {
+        try{
+            List<String> results=new ArrayList<>();
+            String urls = map.get("urls").toString();
+            String files[]=urls.split(";");
+            for(int i=0;i<files.length && files[i].length()>5;i++){
+                results.add((String)imageFileUtils.downloadFile(files[i]));
+            }
+            return results;
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    @ApiOperation("获取图片通用方法")
+    @GetMapping("/getFile")
+    public RESTfulResult getFile(@RequestParam("path") String path, HttpServletResponse response) throws Exception {
+            try {
+                File file = new File(path);
+                if(file.isDirectory()){
+                    return failed("该路径是文件夹而非文件！");
+                }
+                FileInputStream inputStream = new FileInputStream(path);
+                byte[] data = new byte[inputStream.available()];
+                inputStream.read(data);
+                response.setCharacterEncoding("UTF-8");
+                response.setContentType("application/octet-stream;charset=UTF-8");
+                String diskfilename = URLEncoder.encode(file.getName(),"UTF-8") ;
+                response.setHeader("Content-Disposition", "attachment; filename=\"" + diskfilename + "\"");
+                response.setContentLength(data.length);
+                response.setHeader("Content-Range", "" + Integer.valueOf(data.length - 1));
+                response.setHeader("Accept-Ranges", "bytes");
+                OutputStream os = response.getOutputStream();
+                os.write(data);
+                //先声明的流后关掉！
+                os.flush();
+                os.close();
+                inputStream.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+                return failed("未知异常！",e.getMessage());
+            }
+            return success("成功！");
+    }
+
+    @ApiOperation("上传图片通用方法,返回成功后的url")
+    @PostMapping("/uploadPic")
+    public String getPicture(MultipartRequest request) throws Exception {
+        //添加到files数组
+        List<MultipartFile> files = new ArrayList<>();
+        for(int i=0;i<21;i++){
+            MultipartFile file = request.getFile("file"+i);
+            if(file!=null){
+                files.add(file);
+            }
+        }
+        //没有上传
+        if(files.size() == 0){
+            return  null;
+        }
+        //上传图片,拼接在一个url里
+        String url="";
+        for (int i=0;i<files.size();i++){
+            MultipartFile file=files.get(i);
+            url += imageFileUtils.updateFile(file,i)+';';
+        }
+        return url;
+    }
+
+    @ApiOperation("销售钢材报表通用提交按钮")
+    @PostMapping("submitSteel")
+    public Map<String,Object> submitSteel(@RequestBody(required = false) Map<String,Object> map) {
+        Map<String,Object> responseMap = universalService.submitSteel(map);
+        return responseMap;
+    }
+
+    @ApiOperation("表格查询显示和隐藏")
+    @PostMapping("/getColumnShowHidden")
+    public Map<String,Object> getColumnShowHidden(@RequestBody(required = false) Map<String,Object> map) {
+        Map<String,Object>  responseMap = universalService.getColumnShowHidden(map);
+        return responseMap;
+    }
+
+    @ApiOperation("切换列的显示与隐藏")
+    @PostMapping("updateColumnShowHidden")
+    public RESTfulResult updateColumnShowHidden(@RequestBody Map<String,Object> map){
+        return success(universalService.updateColumnShowHidden(map));
+    }
+
+    @ApiOperation("查询列的显示隐藏方案")
+    @PostMapping("getColumShowHideScheme")
+    public RESTfulResult getColumShowHideScheme(@RequestBody Map<String,Object> map) {
+        return success(universalService.getColumShowHideScheme(map));
+    }
+
+    @GetMapping("/getWlUrl")
+    public String getWlUrl() {
+        return universalMapper.getWlUrl();
+    }
+}

src/main/java/com/steerinfo/dil/controller/WMSController.java

@@ -0,0 +1,1123 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.QmsFeign;
+import com.steerinfo.dil.feign.WMSFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-09-17 14:09
+ */
+@RestController
+@RequestMapping("${api.version}/wms")
+public class WMSController extends BaseRESTfulController {
+    @Autowired
+    WMSFeign wmsFeign;
+    @Autowired
+    QmsFeign qmsFeign;
+    @PostMapping("getWmsInboundResult")
+    @ApiOperation(value = "展示入库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer warehouseId,
+                                                   String startTime,
+                                                   String endTime) {
+        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
+    }
+    @PostMapping("getWmsInboundResultStatistics")
+    @ApiOperation(value = "展示入库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "445", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsInboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer warehouseId,
+                                                   String startTime,
+                                                   String endTime) {
+        return wmsFeign.getWmsInboundResultStatistics(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
+    }
+    @PostMapping("getWmsInboundResults")
+    @ApiOperation(value = "展示入库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsInboundResults(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer warehouseId,
+                                                   String startTime,
+                                                   String endTime) {
+        return wmsFeign.getWmsInboundResults(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
+    }
+    @PostMapping("getWmsReservedResult")
+    @ApiOperation(value = "展示预留入库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsReservedResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                    Integer warehouseId,
+                                                    String con) {
+        return wmsFeign.getWmsReservedResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con);
+    }
+    @PostMapping("getWmspOutboundResult")
+    @ApiOperation(value = "展示出库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "152", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmspOutboundResult(@RequestBody(required = false) Map<String,Object> map,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId,
+                                                     Integer warehouseId,
+                                                     String startTime,
+                                                     String endTime) {
+        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,warehouseId,startTime,endTime);
+    }
+
+    @PostMapping("/wmspoutboundresults/insertWmspOutBoundResult")
+    @ApiOperation(value = "新增出单实绩并返回出库单详情")
+    public Map<String, Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval) {
+        Map<String, Object> resTfulResult = wmsFeign.insertWmspOutBoundResult(mapval);
+        return resTfulResult;
+    }
+
+    @PostMapping(value = "/deletewmspOutboundResult")
+    public Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId){
+        return wmsFeign.deleteWmspOutboundResult(resultId);
+    }
+
+    @PostMapping("/wmspoutboundresults/insertwmspOutboundScanResult")
+    public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
+        return resTfulResult;
+    }
+
+    @PostMapping("/wmspoutboundscanresults/copyWmspOutboundScanResult")
+    public Map<String, Object> copyWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.copyWmspOutboundScanResult(map);
+        return resTfulResult;
+    }
+
+    @PostMapping("/wmspoutboundscanresults/deleteWmspOutboundScanResult")
+    public Map<String, Object> deleteWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.deleteWmspOutboundScanResult(map);
+        return resTfulResult;
+    }
+
+    @PostMapping("/wmspoutboundresults/outbountResultToSuccess")
+    public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
+        return wmsFeign.outbountResultToSuccess(resultId);
+    }
+
+    @PostMapping("/updataResultStatus")
+    public Map<String, Object> updataResultStatus(@RequestParam Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
+        return resTfulResult;
+    }
+
+    @PostMapping("/getRmsMaterial")
+    public Map<String, Object> getRmsMaterial(@RequestBody(required = false) Map<String, Object> mapval) {
+        Map<String, Object> resTfulResult = wmsFeign.getRmsMaterial(mapval);
+        return resTfulResult;
+    }
+
+    //查询实时库存数据
+    @PostMapping("/selectGridMaterialList")
+    @ApiOperation(value = "展示实时库存数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      String warehouseId,
+                                                      String time,
+                                                      String con) {
+        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,warehouseId,time,con);
+
+    }
+//    查询仓库中超过库龄预警的物资
+    @PostMapping("/getGridMaterialAgeList")
+    @ApiOperation(value = "查询仓库中超过库龄预警的物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getGridMaterialAgeList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                      Integer warehouseId) {
+        return wmsFeign.getGridMaterialAgeList(mapVal==null?new HashMap<>():mapVal,warehouseId);
+
+    }
+
+    //通过成品仓库网格ID查询实时库存数据
+    @PostMapping("/selectGridMaterialListByGridId")
+    @ApiOperation(value = "通过成品仓库网格ID展示实时库存数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "155", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String,Object> selectGridMaterialListByGridId(BigDecimal gridId) {
+        return wmsFeign.selectGridMaterialListByGridId(gridId);
+
+    }
+
+    //修改物资钢材表的质量是否合格字段和逻辑删除
+    @PostMapping(value = "/updateRmsMaterialSteelDemotion")
+    public Map<String,Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String,Object> map){
+        return wmsFeign.updateRmsMaterialSteelDemotion(map);
+    }
+
+    //钢材异地库出库扫描
+    @PostMapping("/OutScanResultTag")
+    public Map<String, Object> OutScanResultTag(@RequestBody(required = false) Map<String, Object> mapval) {
+        Map<String, Object> resTfulResult = wmsFeign.OutScanResultTag(mapval);
+        return resTfulResult;
+    }
+
+    //钢材异地库出库展示实绩
+    @PostMapping("/getWmsOffsiteLibaryOutboundList")
+    @ApiOperation(value = "展示实时库存数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "164", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                               Integer pageNum,
+                                                               Integer pageSize,
+                                                               Integer apiId,
+                                                               String con) {
+        return wmsFeign.getWmsOffsiteLibaryOutboundList(mapVal == null ? new HashMap<>() : mapVal, pageNum, pageSize, apiId, con);
+    }
+
+    //展示钢材扫描入库实绩列表
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "165", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getWmsOffsiteLibaryInboundList")
+    public Map<String, Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String, Object> map,
+                                                              Integer pageNum,
+                                                              Integer pageSize,
+                                                              Integer apiId,
+                                                              String con) {
+        return wmsFeign.getWmsOffsiteLibaryInboundList(map == null ? new HashMap<>() : map, pageNum, pageSize, apiId, con);
+    }
+
+    //钢材异地库扫描入库
+    @PostMapping("/ScanResultTag")
+    public Map<String, Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
+        return resTfulResult;
+    }
+    //获取扫描实绩
+    @PostMapping("/getScanResult")
+    public Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.getScanResult(map);
+        return resTfulResult;
+    }
+    //获取已下发的钢材的每个炉号的数量
+    @PostMapping("/getFurnaceNoAmount")
+    public Map<String, Object> getFurnaceNoAmount(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.getFurnaceNoAmount(map);
+        return resTfulResult;
+    }
+    //更新状态
+    @PostMapping("/updateStatus")
+    public Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.updateStatus(map);
+        return resTfulResult;
+    }
+
+    //展示在途库存数据
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getWmspIntransitInventory")
+    public Map<String, Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         String con) {
+        return wmsFeign.getWmspIntransitInventory(mapVal == null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
+    }
+
+    //新增倒库出库实绩
+    @PostMapping("/insertOutBoundResult")
+    public Map<String, Object> insertOutBoundResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertOutBoundResult(map);
+        return resTfulResult;
+    }
+
+    //新增倒库出库扫描实绩
+    @PostMapping("/AddWmspOutboundScanResult")
+    public Map<String, Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapVal) {
+        Map<String, Object> resTfulResult = wmsFeign.AddWmspOutboundScanResult(mapVal);
+        return resTfulResult;
+    }
+
+    //通过下拉框筛选数据
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getWmspRestackMakeResultList")
+    public Map<String, Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                            Integer pageNum,
+                                                            Integer pageSize,
+                                                            Integer apiId,
+                                                            Integer warehouseid,
+                                                            Integer stackingId,
+                                                            Integer gradtionNumber) {
+        return wmsFeign.getWmspRestackMakeResultList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, warehouseid, stackingId, gradtionNumber);
+    }
+
+
+    @PostMapping(value = "/addRestackMakeResult")
+    public Map<String,Object> addRestackMakeResult(@RequestBody  Map<String,Object> mapval){
+        return wmsFeign.addRestackMakeResult(mapval);
+    }
+
+    //删除倒垛单
+    @PostMapping("/deleteByResultId/{resultId}")
+    public Map<String, Object> deleteByResultId(@PathVariable String resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
+        return resTfulResult;
+    }
+
+    //下发倒垛单
+    @PostMapping("/dispatchDistrubtionStatus/{resultId}")
+    public Map<String, Object> dispatchDistrubtionStatus(@PathVariable String resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
+        return resTfulResult;
+    }
+
+    //下拉框获取层次
+    @GetMapping("/selectGardationNumber")
+    public Map<String, Object> selectGardationNumber(Integer warehouseid, Integer stackingId) {
+        Map<String, Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid, stackingId);
+        return resTfulResult;
+    }
+
+    //下拉框获取仓库名称
+    @GetMapping("/selectWarehouse")
+    public Map<String, Object> selectWarehouse() {
+        Map<String, Object> resTfulResult = wmsFeign.selectWarehouse();
+        return resTfulResult;
+    }
+
+    //下拉框获取仓库名称
+    @GetMapping("/selectStackingId")
+    public Map<String, Object> selectStackingId(Integer warehouseid) {
+        Map<String, Object> resTfulResult = wmsFeign.selectStackingId(warehouseid);
+        return resTfulResult;
+    }
+
+    //展示倒垛单
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/selectRestackList")
+    public Map<String, Object> selectRestackList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 Integer DistrubtionStatus) {
+        return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
+    }
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/selectRestackList2")
+    public Map<String, Object> selectRestackList2(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 Integer DistrubtionStatus) {
+        return wmsFeign.selectRestackList2(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
+    }
+
+    @PostMapping("/editRestackMakeResult")
+    public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
+        Map<String, Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
+
+        return resTfulResult;
+    }
+
+    //渲染倒垛后的仓库信息
+    @PostMapping("/selectAfterWarehouseByResultId/{resultId}")
+    public Map<String, Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
+        return resTfulResult;
+    }
+
+    //渲染倒垛后的垛位信息
+    @PostMapping("/selectAfterstackingByResultId/{resultId}")
+    public Map<String, Object> selectAfterstackingByResultId(@PathVariable Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
+        return resTfulResult;
+    }
+
+    //PDA展示倒垛单
+    @PostMapping("/selectRestackForPDA")
+    public Map<String, Object> selectRestackForPDA(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.selectRestackForPDA(map);
+        return resTfulResult;
+    }
+
+    //PDA根据实绩id查找物资信息
+    @PostMapping("/selectMaterialInfoByResultId")
+    public Map<String, Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
+        return resTfulResult;
+    }
+
+
+   @ApiImplicitParams({
+           @ApiImplicitParam(value = "395",name = "apiId")
+   })
+    @PostMapping(value = "/getRestackInfoByResultId")
+    public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId
+
+    ){
+        return  wmsFeign.getRestackInfoByResultId(mapVal==null?new HashMap<>():mapVal, pageNum, pageSize, apiId);
+    }
+
+    //PDA根据仓库id查找倒垛单
+    @PostMapping("/selectRestackByWarehouseId")
+    public Map<String, Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.selectRestackByWarehouseId(map);
+        return resTfulResult;
+    }
+
+    //扫描吊牌添加扫描实绩
+    @PostMapping("/ScanTagResult")
+    public Map<String, Object> ScanTagResult(@RequestBody(required = false) Map<String, Object> mal) {
+        Map<String, Object> resTfulResult = wmsFeign.ScanTagResult(mal);
+        return resTfulResult;
+    }
+
+    //下发
+    @PostMapping("/Issue")
+    public Map<String, Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList) {
+        Map<String, Object> resTfulResult = wmsFeign.Issue(mapList);
+        return resTfulResult;
+    }
+
+    /**
+     * 2.展示退库实绩信息
+     *
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping("/getWmsReboundResult")
+    @ApiOperation(value = "展示退库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "161", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con) {
+        return wmsFeign.getWmsReboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @PostMapping("/selectScanResultByIboundResultId")
+    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                          @RequestParam Integer apiId,
+                                                          @RequestParam Integer pageNum,
+                                                          @RequestParam Integer pageSize,
+                                                          @RequestParam Integer inboundId
+    ) {
+        return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
+    }
+    //根据物资信息获取原来垛位信息
+    @PostMapping("/selectInfoByMaterialCode")
+    public Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal) {
+        if (mal == null) {
+            mal = new HashMap<>();
+        }
+        return  wmsFeign.selectInfoByMaterialCode(mal);
+    }
+    //根据仓库查询未接收的垛位
+    @PostMapping("/selectStackingInfoByWarehouseId")
+    public Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal) {
+        if (mal == null) {
+            mal = new HashMap<>();
+        }
+        return  wmsFeign.selectStackingInfoByWarehouseId(mal);
+    }
+
+    @PostMapping("/getWmsIvboundResult")
+    @ApiOperation(value = "展示倒库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "162", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getWmsIvboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize) {
+        return wmsFeign.getWmsIvboundResult(mapValue, apiId, pageNum, pageSize);
+    }
+
+
+    /**
+     * 展示倒库物资实绩
+     *
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping("/getWmsIvboundMaterialt")
+    @ApiOperation(value = "展示倒库物资实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "163", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        return wmsFeign.getWmsIvboundMaterial(mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/getInventoryCheck")
+    @ApiOperation(value = "展示库存盘点实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "94", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String  con) {
+        return wmsFeign.getInventoryCheck(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @PostMapping("/getInventoryClose")
+    @ApiOperation(value = "展示库存结转实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "95", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String  value) {
+        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,value);
+    }
+    //库存结转定时器
+    @PostMapping("/addInventoryClose")
+    @ApiOperation(value = "库存结转定时器")
+    public RESTfulResult addInventoryClose(){
+        return wmsFeign.addInventoryClose();
+    }
+
+    @PostMapping("/getSendReceive")
+    @ApiOperation(value = "展示收发存实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        String con,
+                                        String startTime,
+                                        String endTime) {
+        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    /**
+     * 展示未下发吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @ApiOperation(value = "展示未下发吊钢工扫描吊牌实绩")
+    @PostMapping("/getTagResult")
+    public Map<String, Object> getTagResult() {
+        return wmsFeign.getTagResult();
+    }
+
+    /**
+     * 展示正常入库吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @ApiOperation(value = "展示正常入库吊钢工扫描吊牌实绩")
+    @PostMapping("/getIssuedTagResult")
+    public Map getIssuedTagResult() {
+        return wmsFeign.getIssuedTagResult();
+    }
+
+    /**
+     * 展示异常入库吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @ApiOperation(value = "展示异常入库吊钢工扫描吊牌实绩")
+    @PostMapping("/getIssuedTagNoResult")
+    public Map getIssuedTagNoResult() {
+        return wmsFeign.getIssuedTagNoResult();
+    }
+
+    /**
+     * 展示已退库吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @ApiOperation(value = "展示已退库吊钢工扫描吊牌实绩")
+    @PostMapping("/getReIssuedResult")
+    public Map getReIssuedResult() {
+        return wmsFeign.getIssuedResult();
+    }
+
+    /**
+     * 展示未下发退库吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
+    @PostMapping("/getReTagResult")
+    public Map getReTagResult() {
+        return wmsFeign.getReTagResult();
+    }
+
+    /**
+     * 展示已倒库入库吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @ApiOperation(value = "展示已倒库入库吊钢工扫描吊牌实绩")
+    @PostMapping("/getIvIssuedResult")
+    public Map getIvIssuedResult() {
+        return wmsFeign.getIvIssuedResult();
+    }
+
+    /**
+     * 展示未下发退库吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
+    @PostMapping("/getIvTagResult")
+    public Map getIvTagResult() {
+        return wmsFeign.getIvTagResult();
+    }
+
+    /**
+     * 新增入库实绩
+     *
+     * @param mapList
+     * @return
+     */
+    @ApiOperation("新增入库实绩")
+    @PostMapping("/insertInboundResult")
+    @Transactional
+    public Map<String,Object> addInvoice(@RequestBody(required = false) List<Map<String, Object>> mapList) {
+        return wmsFeign.insertInboundResult(mapList);
+    }
+
+    /**
+     * 新增退库实绩
+     *
+     * @param mapList
+     * @return
+     */
+    @ApiOperation("新增退库实绩")
+    @PostMapping("/insertReboundResult")
+    @Transactional
+    public String addReboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
+        /*
+        获取入库物资件数
+         */
+        int size = mapList.size();
+        /*
+        获取入库垛位
+         */
+        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
+        String stackNo = (String) map1.get("stackNo");
+        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
+        for (Map<String, Object> map : mapList
+        ) {
+            map.put("stackingId", stackId);
+        }
+        wmsFeign.insertReboundResult(mapList);
+        return stackNo;
+    }
+
+    /**
+     * 新增倒库入库实绩
+     *
+     * @param mapList
+     * @return
+     */
+    @ApiOperation("新增倒库入库实绩")
+    @PostMapping("/insertIvboundResult")
+    @Transactional
+    public String addIvboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
+        /*
+        获取入库物资件数
+         */
+        int size = mapList.size();
+        /*
+        获取入库垛位
+         */
+        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
+        String stackNo = (String) map1.get("stackNo");
+        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
+        for (Map<String, Object> map : mapList
+        ) {
+            map.put("stackingId", stackId);
+        }
+        wmsFeign.insertIvboundResult(mapList);
+        return stackNo;
+    }
+
+    /**
+     * 展示入库垛位
+     *
+     * @param DriverId
+     * @return
+     */
+    @PostMapping("/getInboundStack")
+    @ApiOperation(value = "展示入库垛位")
+    public Integer getInboundStack(Integer DriverId) {
+        return wmsFeign.getInboundStack(DriverId);
+    }
+
+    /**
+     * 新增库存盘点
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping("/inventoryCheck")
+    @ApiOperation(value = "新增库存盘点")
+    public Map<String, Object> inventoryCheck(@RequestBody(required = false) Map<String, Object> map) {
+        return wmsFeign.inventoryCheck(map);
+    }
+
+    /**
+     * 新增入库扫描吊牌实绩
+     *
+     * @param map
+     * @return
+     */
+    @ApiOperation(value = "新增入库扫描吊牌实绩")
+    @PostMapping("/inboundScanResult/insertResult")
+    @Transactional
+    public Map<String, Object> insertResult(@RequestBody(required = false) Map<String, Object> map) {
+        return wmsFeign.insertResult(map);
+    }
+
+    /**
+     * 新增退库扫描吊牌实绩
+     *
+     * @param map
+     * @return
+     */
+    @ApiOperation(value = "新增退库扫描吊牌实绩")
+    @PostMapping("/insertReboundScanResult")
+    @Transactional
+    public Map<String, Object> insertReboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        return wmsFeign.insertReboundScanResult(map);
+    }
+
+    /**
+     * 新增倒库入库扫描吊牌实绩
+     *
+     * @param map
+     * @return
+     */
+    @ApiOperation(value = "新增倒库入库扫描吊牌实绩")
+    @PostMapping("/insertIvboundScanResult")
+    @Transactional
+    public Map<String, Object> insertIvboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        return wmsFeign.insertIvboundScanResult(map);
+    }
+
+    /**
+     * 根据实绩id查找物资唯一编码是否已经稽核完成
+     */
+    @PostMapping("/selectMaterialSteelIdByReusltId")
+    @Transactional
+    public Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map) {
+        return wmsFeign.selectMaterialSteelIdByReusltId(map);
+    }
+
+    //下发指令给行车工
+    @PostMapping("/updateInstruction")
+    public Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map) {
+        return wmsFeign.updateInstruction(map);
+    }
+
+
+
+    @PostMapping("/getIvboundMakeResultList")
+    @ApiOperation(value = "展示倒库列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getIvboundMakeResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          Integer apiId,
+                                                          String con) {
+
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmsFeign.getIvboundMakeResultList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    /**
+     * 新增倒库作业
+     * @param mapValue
+     * @return
+     */
+    @PostMapping(value = "/addIvboundMakeResult")
+    public Map<String,Object> addIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
+        return wmsFeign.addIvboundMakeResult(mapValue);
+    }
+
+    /**
+     * 逻辑删除倒库作业
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/deleteIvboundMakeResult/{resultId}")
+    public Map<String,Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
+        return wmsFeign.deleteIvboundMakeResult(resultId);
+    }
+
+    /**
+     * 查询倒库作业
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/selectIvboundMakeResult/{resultId}")
+    public List<Map<String,Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
+        return wmsFeign.selectIvboundMakeResult(resultId);
+    }
+
+    /**
+     * 修改倒库作业
+     * @param mapValue
+     * @return
+     */
+    @PostMapping(value = "/updateIvboundMakeResult")
+    public Map<String,Object> updateIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
+        return wmsFeign.updateIvboundMakeResult(mapValue);
+    }
+    //下发给行车工
+    @PostMapping("/IssueToCrane")
+    Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map){
+        return wmsFeign.IssueToCrane(map);
+    }
+    //新增入库实绩
+    @PostMapping("/inboundResult/insertInboundResult")
+    public  RESTfulResult addInvoice(@RequestParam("userName") String userName,@RequestParam("groupId") BigDecimal groupId,@RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList){
+
+
+        return wmsFeign.addInvoice(userName,groupId,personnelWorkshopid,mapList);
+    }
+    //抢单
+    @PostMapping("/wmspinbounddistributes/grabDistribute")
+    public  RESTfulResult grabDistribute( @RequestBody Map<String,Object> mapValue){
+        return wmsFeign.grabDistribute(mapValue);
+    }
+
+    @GetMapping("/wmspinbounddistributes/getNewDistribute")
+    public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid){
+        return wmsFeign.getNewDistribute(personnelWorkshopid);
+    }
+
+
+//    @PostMapping("/createRestackMakeResult")
+//    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+//                                                  @RequestParam("beforeLevel")BigDecimal  beforeLevel,
+//                                                  @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
+//                                                  @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
+//                                                  @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+//                                                  @RequestParam("resultRemark")String resultRemark,
+//                                                  @RequestBody(required = false) List<Map<String,Object>> mps){
+//        return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
+//    }
+
+
+
+
+        //    获取物资类型
+        @PostMapping(value = "/getMaterialTypeList")
+        public Map<String, Object> getMaterialTypeList (@RequestParam("warehouseid") String warehouseid,
+                @RequestParam("stackingId") BigDecimal stackingId,
+                @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
+                @RequestParam("pageNum") Integer pageNum,
+                @RequestParam("pageSize") Integer pageSize,
+                @RequestParam("apiId") Integer apiId){
+            return wmsFeign.getMaterialTypeList(warehouseid, stackingId, gradtionNumber, pageNum, pageSize, apiId);
+        }
+
+
+    @ApiOperation("进入出库扫码页面，查询出库物资信息详情")
+    @GetMapping("/wmspoutboundresults/getInitOutboundScanResultMaterialInfo")
+    @ApiImplicitParam(name = "resultId",value = "出库实绩id",paramType = "BigDecimal",required = true)
+    public RESTfulResult getInitOutboundScanResultMaterialInfo(@RequestParam(value = "resultId",required = true) BigDecimal resultId){
+        return wmsFeign.getInitOutboundScanResultMaterialInfo(resultId);
+    }
+
+    @PostMapping("/wmspoutboundresults/deleteGridMaterial")
+    public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode){
+        return wmsFeign.deleteGridMaterial(materialOnlyCode);
+    }
+
+    @PostMapping(value = "/createRestackMakeResult")
+    public Map<String, Object> createRestackMakeResult (@RequestParam("keeperId") BigDecimal keeperId,
+                                                        @RequestParam("beforeLevel") BigDecimal beforeLevel,
+                                                        @RequestParam(name = "afterStackingId", defaultValue = "20") BigDecimal afterStackingId,
+                                                        @RequestParam("afterWarehouseId") BigDecimal afterWarehouseId,
+                                                        @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+                                                        @RequestParam("resultRemark") String resultRemark,
+                                                        @RequestBody(required = false) List < Map < String, Object >> mps){
+        return wmsFeign.createRestackMakeResult(keeperId, beforeLevel, afterStackingId, afterWarehouseId, afterBeforeStackingId, resultRemark, mps);
+    }
+
+    //修改实时库存,针对倒垛
+    @PostMapping(value = "/updateWmspGridMaterialForRestack")
+    public Map<String, Object> updateWmspGridMaterialForRestack (@RequestBody Map < String, Object > mapValue){
+        return wmsFeign.updateWmspGridMaterialForRestack(mapValue);
+    }
+
+
+    //修改实时库存,针对倒垛
+    @PostMapping(value = "/getStockTakingList")
+    public Map<String, Object> getStockTakingList (@RequestParam(value = "pageNum") Integer pageNum,
+                                                   @RequestParam(value = "pageSize") Integer pageSize,
+                                                   @RequestParam(value = "apiId") Integer apiId){
+        return wmsFeign.getStockTakingList(pageNum, pageSize, apiId);
+    }
+    //    根据倒垛单ID获得物资类型
+    @GetMapping(value = "getRestackMakeTypeResult")
+    public Map<String, Object> getRestackMakeTypeResult (@RequestParam("restackMake") String restackMake,
+                                                         @RequestParam("context") String context){
+        return wmsFeign.getRestackMakeTypeResult(restackMake, context);
+    }
+    //    改变已经稽核的吊牌信息
+    @GetMapping(value = "changeRestackMakeResult")
+    public int changeRestackMakeResult (@RequestParam("restackMake") String restackMake){
+        return wmsFeign.changeRestackMakeResult(restackMake);
+
+    }
+
+    //PDA根据仓库id查找倒垛单
+    @GetMapping(value = "selectRestackByWarehouseIds")
+    public Map<String, Object> selectRestackByWarehouseIds(@RequestParam("warehouseid") String warehouseid) {
+        return wmsFeign.selectRestackByWarehouseIds(warehouseid);
+    }
+
+    //修改实时库存,针对倒垛
+    @PostMapping(value = "/insertStockTaking")
+    public Map<String,Object> insertStockTaking(@RequestParam(value = "warehouseId") String warehouseId,
+                                                @RequestParam(value = "materialCode") String materialCode,
+                                                @RequestParam(value = "quantity") Integer quantity) {
+        return wmsFeign.insertStockTaking(warehouseId,materialCode,quantity);
+    }
+    //修改入库转预留作业,针对预留
+    @PostMapping(value = "/insertReserved")
+    public Map<String,Object> insertReserved(@RequestParam(value = "warehouseId") String warehouseId,
+                                             @RequestParam(value = "materialCode") String materialCode,
+                                             @RequestParam(value = "materialSpecification") String materialSpecification,
+                                             @RequestParam(value = "materialModel") String materialModel,
+                                             @RequestParam(value = "quantity") Integer quantity,
+                                             @RequestParam String actuallyWeight,
+                                             @RequestParam String materialTheWeight,
+                                             @RequestParam(value = "remark") String remark) {
+        return wmsFeign.insertReserved(warehouseId,materialCode,materialSpecification,materialModel,quantity,actuallyWeight,materialTheWeight,remark);
+    }
+
+    //修改预留转入库作业,针对预留
+    @PostMapping(value = "/insertInbounds")
+    public Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
+                                             @RequestParam(value = "materialCode") String materialCode,
+                                             @RequestParam(value = "materialSpecification") String materialSpecification,
+                                             @RequestParam(value = "materialModel") String materialModel,
+                                             @RequestParam(value = "quantity") Integer quantity) {
+        return wmsFeign.insertInbounds(warehouseId,materialCode,materialSpecification,materialModel,quantity);
+    }
+//    查询所有的钢材物资信息
+    @PostMapping(value = "/getSteelMaterialList")
+    public Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  Integer warehouseId,
+                                                   String con) {
+        return wmsFeign.getSteelMaterialList(mapVal ==null? new HashMap<>():mapVal,pageNum,pageSize,apiId,warehouseId,con);
+    }
+    //    查询所有的钢材物资信息
+    @PostMapping(value = "/getSteelWarehouseList")
+    public Map<String,Object> getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                   Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                   String con) {
+        return wmsFeign.getSteelWarehouseList(mapVal ==null? new HashMap<>():mapVal,apiId,pageNum,pageSize,con);
+    }
+    //    查询所有的钢材物资规格型号信息
+    @PostMapping(value = "/getSteelMaterialModelList")
+    public Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                        @RequestParam(value = "pageNum") Integer pageNum,
+                                                        @RequestParam(value = "pageSize") Integer pageSize,
+                                                        @RequestParam(value = "apiId") Integer apiId,
+                                                        @RequestParam(value = "warehouseId") Integer warehouseId,
+                                                        @RequestParam(value = "status") Integer status,
+                                                        @RequestParam(value = "startTime",required = false)String startTime,
+                                                        @RequestParam(value = "endTime",required = false)String endTime,
+                                                        @RequestParam(value = "con") String con) {
+        return wmsFeign.getSteelMaterialModelList(mapValue ==null? new HashMap<>():mapValue,pageNum,pageSize,apiId,warehouseId,status,startTime,endTime,con);
+    }
+//    根据对应的入库实绩id修改入库状态为预留
+    @PostMapping("/changeReserved")
+    @ApiOperation(value = "根据对应的入库实绩id修改入库状态为预留")
+    public int changeReserved(@RequestBody(required = false) List<Map<String, Object>> mapList) {
+        return wmsFeign.changeReserved(mapList);
+    }
+
+    @PostMapping("/getWmsOutboundResultStatistics")
+    @ApiOperation(value = "展示炉号对应的出厂数量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "446", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getWmsOutboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer warehouseId,
+                                        String con,
+                                        String startTime,
+                                        String endTime) {
+        return wmsFeign.getWmsOutboundResultStatistics(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con,startTime,endTime);
+    }
+
+    //删除扫码吊牌
+    @PostMapping("/undoInbound")
+    @ApiOperation(value = "删除扫码吊牌")
+    public Map<String, Object> undoInbound(@RequestParam("inboundId") BigDecimal inboundId){
+        return wmsFeign.undoInbound(inboundId);
+    }
+
+    @PostMapping("/disorderlyOutbound")
+    @ApiOperation(value = "")
+    public Map<String, Object> disorderlyOutbound(@RequestBody Map<String,Object> map){
+        return wmsFeign.disorderlyOutbound(map);
+    }
+
+
+    @ApiOperation(value="船舶动态表展示库存吨位", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "158", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/gePortStockList")
+    public Map<String,Object> gePortStockList(@RequestBody(required = false) Map<String,Object> mapVal
+    ){
+        return wmsFeign.gePortStockList(mapVal);
+    }
+
+    @ApiOperation(value = "站台入库作业")
+    @PostMapping("platformInbound")
+    public Map<String,Object> platformInbound(@RequestBody Map<String,Object> map){
+        return wmsFeign.platformInbound(map);
+    }
+
+    @ApiOperation(value = "站台出库作业")
+    @PostMapping("afterInwardOutbound")
+    public Map<String,Object> afterInwardOutbound(@RequestBody Map<String,Object> map){
+        return wmsFeign.afterInwardOutbound(map);
+    }
+
+    @ApiOperation("获取理重信息")
+    @PostMapping("getTheoreticalByInfo")
+    public Map<String,Object> getTheoreticalByInfo(@RequestParam String warehouseId,
+                                                   @RequestParam String  materialCode,
+                                                   @RequestParam String materialSpecification,
+                                                   @RequestParam String materialModel,
+                                                   @RequestParam Integer status,
+                                                   @RequestParam Integer num){
+        return wmsFeign.getTheoreticalByInfo(warehouseId,materialCode,materialSpecification,materialModel,status,num);
+    }
+
+    @ApiOperation("获取上传金蝶信息")
+    @PostMapping("getInboundEasInfo")
+    public Map<String,Object> getInboundEasInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer warehouseId,
+                                                String startTime,
+                                                String endTime){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        return wmsFeign.getInboundEasInfo(mapValue,apiId,pageNum,pageSize,warehouseId,startTime,endTime);
+    }
+
+    @ApiOperation("撤销上传金蝶")
+    @PostMapping("reduceInboundEas")
+    public Map<String,Object> reduceInboundEas(Integer inboundEasId){
+        return wmsFeign.reduceInboundEas(inboundEasId);
+    }
+
+    @ApiOperation("listAfterInwardOutbound")
+    @PostMapping("listAfterInwardOutbound")
+    public Map<String,Object> listAfterInwardOutbound(@RequestBody List<Map<String,Object>>mapList){
+        return wmsFeign.listAfterInwardOutbound(mapList);
+    }
+
+    @PostMapping(value = "/deleteInboundMaterial")
+    public Map<String,Object> deleteInboundMaterial(@RequestParam(value = "warehouseId") String warehouseId,
+                                             @RequestParam(value = "materialCode") String materialCode,
+                                             @RequestParam(value = "materialSpecification") String materialSpecification,
+                                             @RequestParam(value = "materialModel") String materialModel,
+                                             @RequestParam(value = "quantity") Integer quantity) {
+        return wmsFeign.deleteInboundMaterial(warehouseId,materialCode,materialSpecification,materialModel,quantity);
+    }
+
+    @PostMapping("/recordScanResult")
+    public Map<String,Object> recordScanResult(@RequestBody Map<String,Object> map) {
+        return wmsFeign.recordScanResult(map);
+    }
+}
+

src/main/java/com/steerinfo/dil/controller/WMSHController.java

@@ -0,0 +1,228 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.WMSHFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/12 9:54
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("${api.version}/wmsh")
+public class WMSHController extends BaseRESTfulController {
+
+    @Autowired
+    WMSHFeign wmshFeign;
+
+    /**
+     * 展示下游港口港存库库存列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getUnloadPortStockList")
+    @ApiOperation(value = "展示下游港口港存库库存列表")
+    public RESTfulResult getUnloadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getUnloadPortStockList(mapValue, pageNum, pageSize, apiId);
+    }
+
+
+    /**
+     * 展示下游港口港存库库存列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getLoadPortStockByMaterialName")
+    @ApiOperation(value = "展示下游港口港存库库存列表")
+    public RESTfulResult getLoadPortStockByMaterialName(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                        String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getLoadPortStockByMaterialName(mapValue, pageNum, pageSize, apiId,con);
+    }
+
+
+    @PostMapping("getUnLockPortStock")
+    @ApiOperation(value = "展示万州港口港存库库存列表")
+    public RESTfulResult getUnLockPortStock(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String con,
+                                            String activeName,
+                                            String startTime,
+                                            String endTime) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getUnLockPortStock(mapValue, pageNum, pageSize, apiId,con,activeName,startTime,endTime);
+    }
+
+
+    @PostMapping("selectLoadResult")
+    @ApiOperation(value = "展示万州港口港存库库存列表")
+    public Map<String, Object> selectLoadResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.selectLoadResult(mapValue,con);
+    }
+
+    /**
+     * 展示万州港港存库库存列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getLoadPortStockList")
+    @ApiOperation(value = "展示万州港港存库库存列表")
+    public RESTfulResult getLoadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getLoadPortStockList(mapValue, pageNum, pageSize, apiId,con);
+    }
+
+    @PostMapping("getDownPortStockList")
+    @ApiOperation(value = "下游港口库存")
+    public RESTfulResult getDownPortStockList(@RequestBody(required = false) Map<String, Object> mapValue) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getDownPortStockList(mapValue);
+    }
+
+    @PostMapping("getRunStockList")
+    @ApiOperation(value = "在途库存")
+    public RESTfulResult getRunStockList(@RequestBody(required = false) Map<String, Object> mapValue) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getRunStockList(mapValue);
+    }
+    /**
+     * 查询所有港存库入库实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getInBoundResult")
+    @ApiOperation(value = "查询所有港存库入库实绩")
+    public RESTfulResult getInBoundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getInBoundResult(mapValue, apiId, pageNum, pageSize);
+    }
+
+    /**
+     * 查询所有港存库出库实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getOutBoundResult")
+    @ApiOperation(value = "查询所有港存库入库实绩")
+    public RESTfulResult getOutBoundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getOutBoundResult(mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("getResultById/{resultId}")
+    @ApiOperation(value = "通过实绩Id查询实绩")
+    RESTfulResult getResultById(@PathVariable("resultId") Integer resultId) {
+        return wmshFeign.getResultById(resultId);
+    }
+
+    @PostMapping("deleteWareHosingResult/{resultId}")
+    @ApiOperation(value = "逻辑删除港存库入库实绩")
+    RESTfulResult deleteWareHosingResult(@PathVariable("resultId") Integer resultId) {
+        return wmshFeign.deleteWareHosingResult(resultId);
+    }
+
+    @PostMapping("updateWareHosingResult")
+    @ApiOperation(value = "修改港存库入库实绩")
+    RESTfulResult updateWareHosingResult(@RequestBody Map<String, Object> wmshInboundResult) {
+        return wmshFeign.updateWareHosingResult(wmshInboundResult);
+    }
+
+    @PostMapping("addWarehousingResult")
+    @ApiOperation(value = "添加港存库入库实绩")
+    RESTfulResult addWarehousingResult(@RequestBody Map<String, Object> wmshInboundResult) {
+        return wmshFeign.addWarehousingResult(wmshInboundResult);
+    }
+
+    @PostMapping("clearWmshGridMaterial")
+    @ApiOperation(value = "清场远程调用")
+    RESTfulResult clearWmshGridMaterial(@RequestBody Map<String, Object> wmshInboundResult) {
+        return wmshFeign.clearWmshGridMaterial(wmshInboundResult);
+    }
+
+
+
+    @PostMapping("addResult")
+    @ApiOperation(value = "添加港存库出库实绩")
+    RESTfulResult addResult(@RequestBody Map<String, Object> map) {
+        return wmshFeign.addResult(map);
+    }
+
+    @PostMapping("findInboundDetail")
+    @ApiOperation(value = "查询点后批次入库操作详情")
+    RESTfulResult findInboundDetail(@RequestBody Map<String, Object> map) {
+        return wmshFeign.findInboundDetail(map);
+    }
+
+    @PostMapping("findOutboundDetail")
+    @ApiOperation(value = "查询点后批次出库操作详情")
+    RESTfulResult findOutboundDetail(@RequestBody Map<String, Object> map) {
+        return wmshFeign.findOutboundDetail(map);
+    }
+}

src/main/java/com/steerinfo/dil/controller/ZhongJiaoXingLuContoller.java

@@ -0,0 +1,40 @@
+package com.steerinfo.dil.controller;
+
+
+import com.steerinfo.dil.feign.OtmsFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("apis")
+public class ZhongJiaoXingLuContoller {
+
+    @Autowired
+    private OtmsFeign otmsFeign;
+
+    //偏离预警回调示例
+    @PostMapping("/abnormalLineWarn")
+    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception {
+        otmsFeign.abnormalLineWarn(data);
+
+        return "success";
+    }
+    //停车预警回调示例
+    @PostMapping("/parkWarn")
+    public String parkWarn(@RequestParam(value = "data") String data) throws Exception {
+        otmsFeign.parkWarn(data);
+        return "success";
+    }
+    //离线预警回调示例
+    @PostMapping("/offLineWarn")
+    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception {
+
+        otmsFeign.offLineWarn(data);
+        return "success";
+    }
+
+
+}

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -0,0 +1,1916 @@
+package com.steerinfo.dil.feign;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/23 8:46
+ * @Version:V2.0
+ */
+@FeignClient(value = "DIL-AMS-API-DEV", url = "${openfeign.AmsFeign.url}")
+public interface AmsFeign {
+
+    /**
+     * 展示违约规则
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractbreach/getBreachList")
+    Map<String, Object> getBreachList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                @RequestParam("pageNum") Integer pageNum,
+                                @RequestParam("pageSize") Integer pageSize,
+                                @RequestParam("apiId") Integer apiId);
+
+    /**
+     * 新增违约规则
+     *
+     * @param amsContractBreach
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractbreach/addContractBreach")
+    Map<String, Object> addContractBreach(@RequestBody Map<String, Object> amsContractBreach);
+
+    /**
+     * 逻辑删除违约规则
+     *
+     * @param breachId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractbreach/deleteContractBreach/{breachId}")
+    Map<String, Object> deleteContractBreach(@PathVariable("breachId") BigDecimal breachId);
+
+    /**
+     * 通过违约id查询
+     *
+     * @param breachId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractbreach/selectBreachToUpdate/{breachId}")
+    Map<String, Object> selectBreachToUpdate(@PathVariable("breachId") BigDecimal breachId);
+
+    /**
+     * 修改违约规则
+     *
+     * @param amsContractBreach
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractbreach/updateContractBreach")
+    Map<String, Object> updateContractBreach(@RequestBody Map<String, Object> amsContractBreach);
+
+    /**
+     * 展示港口装卸单价列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractotherprices/getLoadUnloadPriceList")
+    Map<String, Object> getLoadUnloadPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId);
+
+    /**
+     * 新增港口装卸单价
+     *
+     * @param amsContractOtherPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractotherprices/addLoadUnloadPrice")
+    Map<String, Object> addLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice);
+
+    /**
+     * 逻辑删除港口装卸单价
+     *
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractotherprices/deleteLoadUnloadPrice/{priceId}")
+    Map<String, Object> deleteLoadUnloadPrice(@PathVariable("priceId") BigDecimal priceId);
+
+    /**
+     * 通过单价id查询
+     *
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractotherprices/selectLoadUnloadPriceToUpdate/{priceId}")
+    Map<String, Object> selectLoadUnloadPriceToUpdate(@PathVariable("priceId") BigDecimal priceId);
+
+    /**
+     * 修改港口装卸单价
+     *
+     * @param amsContractOtherPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractotherprices/updateLoadUnloadPrice")
+    Map<String, Object> updateLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice);
+
+
+    /**
+     * 展示火运单价
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttrainprices/getTrainPriceList")
+    Map<String, Object> getTrainPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam Integer apiId);
+
+    /**
+     * 新增火运单价
+     *
+     * @param amsContractTrainPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttrainprices/addTrainPrice")
+    Map<String, Object> addTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice);
+
+    /**
+     * 逻辑删除火运单价
+     *
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttrainprices/deleteTrainPrice/{priceId}")
+    Map<String, Object> deleteTrainPrice(@PathVariable("priceId") BigDecimal priceId);
+
+    /**
+     * 通过单价id查询
+     *
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttrainprices/selectTrainPriceToUpdate/{priceId}")
+    Map<String, Object> selectTrainPriceToUpdate(@PathVariable("priceId") BigDecimal priceId);
+
+    /**
+     * 修改火运单价
+     *
+     * @param amsContractTrainPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttrainprices/updateTrainPrice")
+    Map<String, Object> updateTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice);
+
+
+    /**
+     * 展示水运单价
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/getShipPriceList")
+    Map<String, Object> getShipPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize,
+                                   @RequestParam Integer apiId);
+
+    /**
+     * 新增水运单价
+     *
+     * @param amsContractTransportPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/addShipPrice")
+    Map<String, Object> addShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
+
+    /**
+     * 逻辑删除运费单价
+     *
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/deleteShipPrice/{priceId}")
+    Map<String, Object> deleteShipPrice(@PathVariable("priceId") BigDecimal priceId);
+
+    /**
+     * 修改水运单价
+     *
+     * @param amsContractTransportPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/updateShipPrice")
+    Map<String, Object> updateShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
+
+    /**
+     * 通过单价id查询
+     *
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/selectPriceToUpdate/{priceId}")
+    Map<String, Object> selectPriceToUpdate(@PathVariable("priceId") BigDecimal priceId);
+
+    /**
+     * 展示汽运单价
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/getTruckPriceList")
+    Map<String, Object> getTruckPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam Integer apiId);
+
+    /**
+     * 新增汽运单价
+     *
+     * @param amsContractTransportPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/addAmsContractTransportPrice")
+    Map<String, Object> addAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
+
+    /**
+     * 修改汽运单价
+     *
+     * @param amsContractTransportPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/updateAmsContractTransportPrice")
+    Map<String, Object> updateAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
+
+    /**
+//     * 油价联动导致运价变动，批量修改运价
+//     *
+//     * @return
+//     */
+//    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/batchUpdateTransportPriceByOilPrice")
+//    Map<String, Object> batchUpdateTransportPriceByOilPrice();
+
+    /**
+     * 展示采购订单列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amspurchaseorders/getPurchaseOrderList")
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("con") String con,
+                                       @RequestParam("sendCompId") String sendCompId
+                                             );
+
+
+
+    /**
+     * 下拉框
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getAddressDeliveryAddress")
+    Map<String, Object> getAddressDeliveryAddress(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam String con);
+
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getShipperId")
+    Map<String, Object> getShipperId();
+
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getCarrierId")
+    Map<String, Object> getCarrierId();
+
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getCapacityId")
+    Map<String, Object> getCapacityId();
+
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getMaterialId")
+    Map<String, Object> getMaterialId();
+
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getTruckCapacityId")
+    Map<String, Object> getTruckCapacityId();
+
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getLineId")
+    Map<String, Object> getLineId();
+// ----------------------------------------------销售合同-------------------------------------
+    /**
+     * 销售合同查询汽运单价
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询汽运单价信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(109)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getAmsContractTransportPrice1")
+    Map<String, Object> getAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("con") String con,
+                                       @RequestParam("deleted") Integer deleted
+
+    );
+
+    @ApiOperation(value="查询汽运单价信息")
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/importDataForAmsContractTransportPrice")
+    Map<String, Object> importDataForAmsContractTransportPrice(@RequestBody(required = false) List<Map<String,Object>> mapList,
+                                                               @RequestParam("importPriceValue") BigDecimal importPriceValue,
+                                                               @RequestParam("importPriceDate") String importPriceDate);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/deleteSalelPrice")
+    Map<String,Object> deleteSalelPrice(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/getCarrierListByPrice")
+    Map<String,Object> getCarrierListByPrice(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/updatePriceValue")
+    Map<String,Object> updatePriceValue(@RequestBody(required = false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/getCarrierListByAddress")
+    Map<String,Object> getCarrierListByAddress(@RequestBody(required = false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/updateCarrierName")
+    Map<String,Object> updateCarrierName(@RequestBody(required = false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/updateaddressDeliveryAddress")
+    Map<String,Object> updateaddressDeliveryAddress(@RequestBody(required = false) Map<String,Object> mapValue);
+
+    @ApiOperation(value="查询汽运单价信息（计费详单专用）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(519)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getAmsContractTransportPriceForDetail")
+    Map<String, Object> getAmsContractTransportPriceForDetail(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      @RequestParam("pageNum") Integer pageNum,
+                                                      @RequestParam("pageSize") Integer pageSize,
+                                                      @RequestParam("apiId") Integer apiId,
+                                                      @RequestParam("con") String con,
+                                                              @RequestParam("userId") String userId
+
+    );
+    /**
+     *销售合同新增汽运单价
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/addAmsContractTransportPrice1")
+    Map<String, Object> addAmsContractTransportUnitPrice1(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    /**
+     *通过主键id删除汽运单价
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/deleteAmsContractTransportPrice1")
+    Map<String, Object> deleteAmsContractTransportPrice1(@RequestParam BigDecimal priceId);
+    /**
+     *通过主键渲染信息
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getAmsContractTransportPriceByPriceId1")
+    Map<String, Object> getAmsContractTransportPriceByPriceId1(@RequestParam BigDecimal priceId);
+    /**
+     * 通过主键修改汽运单价
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/updateAmsContractTransportPrice1")
+    Map<String, Object> updateAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapVal);
+    /**
+     * 油价联动导致运价变动，批量修改运价
+     * @param
+     * @return
+     */
+    @ApiOperation(value="油价联动导致运价变动，批量修改运价")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/batchUpdateTransportPriceByOilPrice1")
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1(@RequestBody Map<String,Object> map);
+    /**
+     * 获取线路编号
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取线路编号")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getLineNo")
+    Map<String, Object> getLineNo();
+    /**
+     * 获取线路编号
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取运力编号")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getCapacityNumber")
+    Map<String, Object> getCapacityNumber();
+    /**
+     * 获取收货地址
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取收货地址")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getDeliveryAddress")
+    Map<String, Object> getDeliveryAddress();
+    /**
+     * 获取货物类型
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取货物类型")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getCargoName")
+    Map<String, Object> getCargoName();
+    /**
+     * 获取油品名称
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取油品名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getOilTypeName")
+    Map<String, Object> getOilTypeName();
+
+    /**
+     * 新增(固定派单/公开抢单)
+     * @param mapVal
+     * @return
+     */
+    @ApiOperation(value="新增(固定派单/公开抢单)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsDispatchSaleOrder", value = "(固定派单/公开抢单)对象", required = false, dataType = "AmsDispatchSaleOrder")
+    })
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/addAmsDispatchSaleOrder")
+    Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal);
+    /**
+     * 获取承运商名
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取承运商名")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getCarrierName")
+    Map<String, Object> getCarrierName();
+
+    /**
+     * 查询未上报销售订单信息
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询未上报销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(98)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderInfo")
+    Map<String, Object> getSaleOrderInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId);
+
+
+
+    @ApiOperation(value = "关闭分录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "list", value = "批量关闭分录", required = false, dataType = "java.util.List")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/closingEntries")
+    Map<String, Object> closingEntries(@RequestBody List<Map<String, Object>> mapList);
+
+    /**
+     * 查询已上报销售订单信息
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询已上报销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(98)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderReported")
+    Map<String, Object> getSaleOrderReported(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize,
+                                   @RequestParam Integer apiId);
+
+
+
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompany")
+     Map<String,Object> getSaleOrderListBySaleCompany(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      @RequestParam("pageNum") Integer pageNum,
+                                                      @RequestParam("pageSize") Integer pageSize,
+                                                      @RequestParam("apiId") Integer apiId,
+                                                      @RequestParam("con") String con);
+
+    /**
+     * 查询财务已审批销售订单信息
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询财务已审批销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(105)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getAmsSaleOrderApproved")
+    Map<String, Object> getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam Integer pageNum,
+                                       @RequestParam Integer pageSize,
+                                       @RequestParam Integer apiId);
+
+    /**
+     * 根据销售订单号查询销售订单详细信息
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+
+    @ApiOperation(value="根据销售订单号查询销售订单详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderDetail")
+    Map<String, Object> getSaleOrderDetail(@RequestParam BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer apiId);
+    /**
+     * 上传销售订单
+     * @param saleOrderId
+     * @return
+     */
+    @ApiOperation(value="上传销售订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "saleOrderId", value = "销售订单ID", required = false, dataType = "java.math.BigDecimal")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/uploadSaleOrder")
+    Map<String, Object> uploadSaleOrder(@RequestParam BigDecimal saleOrderId);
+    /**
+     * 新增销售订单
+     */
+    @ApiOperation(value="新增销售订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleOrder", value = "销售订单对象", required = false, dataType = "AmsSaleOrder")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/addAmsSaleOrder")
+    Map<String, Object> addAmsSaleOrder(@RequestBody(required = false) Map<String,Object> map);
+
+    /**
+     * 通过主键渲染销售订单信息
+     * @param saleOrderId
+     * @return
+     */
+    @ApiOperation(value="通过主键渲染销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "saleOrderId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getAmsSaleOrderBySaleOrderId")
+    Map<String, Object> getAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId);
+    /**
+     * 通过主键修改销售订单
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="通过主键修改销售订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleOrder", value = "销售订单对象", required = false, dataType = "AmsSaleOrder")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateAmsSaleOrder")
+    Map<String, Object> updateAmsSaleOrder(@RequestBody(required = false) Map<String,Object> map);
+    /**
+     * 通过主键删除销售订单
+     * @param saleOrderId
+     * @return
+     */
+    @ApiOperation(value="通过主键删除销售订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "saleOrderId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/deleteAmsSaleOrderBySaleOrderId")
+    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@RequestBody(required = false) List<Map<String,Object>> mapValue);
+    @ApiOperation(value="根据销售订单号查询销售订单修改日志")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleOrderUpdateLog")
+    Map<String, Object> getSaleOrderUpdateLog(@RequestParam BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId);
+    /**
+     * 获取销售计划名称
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取销售计划名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amssaleorders/getSalePlanName")
+    Map<String, Object> getSalePlanName();
+
+    /**
+     * 获取发货单位
+     */
+    @ApiOperation(value="获取发货单位")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amssaleorders/getShipperName")
+    Map<String, Object> getShipperName();
+    /**
+     * 获取收货单位
+     */
+    @ApiOperation(value="获取收货单位")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amssaleorders/getConsigneeCompanyName")
+    Map<String, Object> getConsigneeCompanyName();
+    //获取到站名称
+    @GetMapping("/api/v1/ams/amstruckraildayplans/getArriveName")
+    Map<String,Object> getArriveName();
+    @PostMapping("/api/v1/ams/amsdispatchsaleorders/selectDispatchSaleOrderList")
+    Map<String,Object> selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("carrierSsoId") String carrierSsoId);
+
+    /**
+     * 新增销售订单物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增销售订单物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleOrderMaterial", value = "销售订单物资信息对象", required = false, dataType = "AmsSaleOrderMaterial")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/addAmsSaleOrderMaterial")
+    Map<String, Object> addAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map);
+
+    /**
+     *通过主键渲染销售订单物资信息
+     * @param saleOrderMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键渲染销售订单物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleOrderMaterial", value = "销售订单物资信息对象", required = false, dataType = "AmsSaleOrderMaterial")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAmsSaleOrderMaterialBySaleOrderMaterialId")
+    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@RequestParam BigDecimal saleOrderMaterialId);
+
+    /**
+     * 通过主键修改销售订单物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="通过主键修改销售订单物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleOrderMaterial", value = "销售订单物资信息对象", required = false, dataType = "AmsSaleOrderMaterial")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/updateAmsSaleOrderMaterial")
+    Map<String, Object> updateAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map);
+
+    /**
+     * 通过主键删除销售订单物资信息
+     * @param saleOrderMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键删除销售订单物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/deleteAmsSaleOrderMaterialBySaleOrderMaterialId")
+    Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(@RequestParam BigDecimal saleOrderMaterialId);
+
+    /**
+     * 通过主键获取收货地址
+     * @param saleOrderMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键获取收货地址")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAddress")
+    Map<String, Object> getAddress(@RequestParam BigDecimal saleOrderMaterialId);
+
+
+    /**
+     * 通过主键修改销售订单信息(新增一条），过去的成为历史记录
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="通过主键修改销售订单信息(新增一条），过去的成为历史记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleOrderMaterial", value = "销售订单物资信息对象", required = false, dataType = "AmsSaleOrderMaterial")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/updateAddress")
+    Map<String, Object> updateAddress(@RequestBody(required = false)Map<String,Object> map);
+
+    /**
+     * 查询销售计划信息
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询销售计划信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(92)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleplans/getSalePlanInfo")
+    Map<String, Object> getSalePlanInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId);
+
+    /**
+     * 新增销售计划
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增销售计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amssaleplans", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleplans/addAmsSalePlan")
+    Map<String, Object> addAmsSalePlan(@RequestBody(required = false)Map<String,Object> map);
+
+    /**
+     * 通过主键查询销售计划信息
+     * @param planId
+     * @return
+     */
+    @ApiOperation(value="通过主键查询销售计划信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "销售计划主键", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleplans/getAmsSalePlanByPlanId")
+    Map<String, Object> getAmsSalePlanByPlanId(@RequestParam BigDecimal planId);
+    /**
+     * 通过主键修改销售计划
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="通过主键修改车皮装车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSalePlan", value = "修改车皮装车map", required = false, dataType = "AmsSalePlan")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleplans/upadteAmsSalePlanByPlanId")
+    Map<String, Object> upadteAmsSalePlanByPlanId(@RequestBody(required = false)Map<String,Object> map);
+    /**
+     * 通过主键删除销售计划
+     * @param planId
+     * @return
+     */
+    @ApiOperation(value="通过主键删除车皮装车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "主键ID", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleplans/deleteAmsSalePlanByPlanId")
+    Map<String, Object> deleteAmsSalePlanByPlanId(@RequestParam BigDecimal planId);
+
+    /**
+     * 获取物资编码
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取物资编码")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amssaleplans/getMaterialName")
+    Map<String, Object> getMaterialName();
+
+    /**
+     * 获取销售片区名称
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取销售片区名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amssaleplans/getAreaName")
+    Map<String, Object> getAreaName();
+
+    /**
+     * 查询销售计划物资信息
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(169)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("api/v1/ams/amssaleplanmaterials/getSalePlanMaterialInfo")
+    Map<String, Object> getSalePlanMaterialInfo(@RequestParam BigDecimal planId,@RequestBody(required=false) Map<String,Object> mapValue,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
+
+    /**
+     * 新增销售计划物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSalePlanMaterial", value = "销售计划物资信息对象", required = false, dataType = "AmsSalePlanMaterial")
+    })
+    @PostMapping(value = "api/v1/ams/amssaleplanmaterials/addAmsSalePlanMaterial")
+    Map<String, Object> addAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 通过主键删除销售计划物资信息
+     * @param planMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键删除销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "主键ID", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "api/v1/ams/amssaleplanmaterials/deleteAmsSalePlanMaterial")
+    Map<String, Object> deleteAmsSalePlanMaterial(@RequestParam BigDecimal planMaterialId);
+
+    /**
+     * 通过主键查询销售计划物资信息
+     * @param planMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键查询销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planMaterialId", value = "销售计划物资表主键", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "api/v1/ams/amssaleplanmaterials/getAmsSalePlanMaterialByPlanMaterialId")
+    Map<String, Object> getAmsSalePlanMaterialByPlanMaterialId(@RequestParam BigDecimal planMaterialId);
+
+    /**
+     * 通过主键修改销售计划物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="通过主键修改销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSalePlanMaterial", value = "销售计划物资信息", required = false, dataType = "AmsSalePlanMaterial")
+    })
+    @PostMapping(value = "api/v1/ams/amssaleplanmaterials/upadteAmsSalePlanMaterial")
+    Map<String, Object> upadteAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 查询销售订单车序号详细信息
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询销售订单车序号详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(170)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("api/v1/ams/amssaletrucknomaterials/getTruckNoDetail")
+    Map<String, Object> getTruckNoDetail(@RequestParam BigDecimal saleOrderMaterialId,@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
+
+    /**
+     * 新增车序号物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增车序号物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleTrucknoMaterial", value = "新增车序号物资对象", required = false, dataType = "AmsSaleTrucknoMaterial")
+    })
+    @PostMapping(value = "api/v1/ams/amssaletrucknomaterials/addAmsSaleTrucknoMaterial")
+    Map<String, Object> addAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 通过主键删除车序号物资信息
+     * @param trucknoMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键删除车序号物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "trucknoMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
+    })
+    @PostMapping(value = "api/v1/ams/amssaletrucknomaterials/deleteAmsSaleTrucknoMaterial")
+    Map<String, Object> deleteAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId);
+
+    /**
+     * 通过主键渲染车序号物资信息
+     * @param trucknoMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键渲染车序号物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
+    })
+    @PostMapping(value = "api/v1/ams/amssaletrucknomaterials/getAmsSaleTrucknoMaterial")
+    Map<String, Object> getAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId);
+
+    /**
+     * 通过主键修改车序号物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="通过主键修改车序号物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleTrucknoMaterial", value = "车序号物资信息对象", required = false, dataType = "AmsSaleTrucknoMaterial")
+    })
+    @PostMapping(value = "api/v1/ams/amssaletrucknomaterials/updateAmsSaleTrucknoMaterial")
+    Map<String, Object> updateAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map);
+
+    /*
+       AmstruckPurplanController中所有接口
+    */
+    @PostMapping("api/v1/ams/amstruckpurplans/getAllPurPlan")
+    Map<String, Object> getAllPurPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+                                @RequestParam("apiId") Integer apiId,
+                                @RequestParam("pageNum") Integer pageNum,
+                                @RequestParam("pageSize") Integer pageSize,
+                                @RequestParam("status") Integer status,
+                                @RequestParam("con") String con);
+
+    @PostMapping ("api/v1/ams/amstruckpurplans/getPurPlanById/{planId}")
+    public Map<String, Object> getPurPlanById(@PathVariable("planId")Integer planId);
+
+    @PostMapping ("api/v1/ams/amstruckinwardplan/changePlanStatus/{planId}")
+    public Map<String, Object> changePlanStatus(@PathVariable("planId")BigDecimal planId);
+
+
+    @PostMapping("api/v1/ams/amstruckpurplans/addPurPlan")
+    public Map<String, Object> addPurPlan(@RequestBody Map<String, Object> map);
+
+
+
+    @PostMapping("api/v1/ams/amstruckpurplans/sendPurPlan/{planId}")
+    public Map<String, Object> sendPurPlan(@PathVariable("planId")Integer planId);
+
+    @PostMapping("api/v1/ams/amstruckpurplans/receptionPurPlan/{planId}")
+    public Map<String, Object> receptionPurPlan(@PathVariable("planId")Integer planId);
+    
+    @PostMapping("api/v1/ams/amstruckpurplans/updatePurPlan")
+    public Map<String, Object> updatePurPlan(@RequestBody Map<String, Object> amstruckPurplan);
+
+    @PostMapping("api/v1/ams/amstruckpurplans/deletePurPlan/{planId}")
+    public Map<String, Object> deletePurPlan(@PathVariable("planId")Integer planId);
+
+    @PostMapping("api/v1/ams/amstruckpurplans/getDecomposedPlan")
+    public Map<String, Object> getDecomposedPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("planId") Integer planId,
+                                           @RequestParam("status") Integer status,
+                                           @RequestParam("planStatus") Integer planStatus,
+                                           @RequestParam("con") String con
+    );
+
+    //*****************************************内转物流**************************************
+    //查询汽运单价
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprices/getAmsContractTransportPriceForConverted")
+    Map<String,Object> getAmsContractTransportPriceForConverted(@RequestParam("lineId")BigDecimal lineId,
+                                                                @RequestParam("apiId")Integer apiId,
+                                                                @RequestParam("pageNum")Integer pageNum,
+                                                                @RequestParam("pageSize")Integer pageSize);
+    //获得运输线路
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprices/getLineRoute")
+    Map<String,Object> getLineRoute();
+
+
+    /**
+     *展示销售公司已审核销售订单的车序号列表
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询销售公司已审核销售订单的车序号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(181)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleOrderList")
+    Map<String,Object> amsSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer status);
+
+    //固定派单：通过车序号查询收货地址，截取收货地址的区域，去资源管理中查询对应的承运商,将车序号与承运商绑定
+    @PostMapping(value = "/api/v1/ams/amssaleorders/addAmsDispatchSaleOrder")
+    Map<String,Object> addFixedAmsDispatchSaleOrder(@RequestBody(required = false) List<Map<String,Object>> mapValue);
+
+    //公开派单
+    //查询未分派车辆的销售订单的车序号
+    @ApiOperation(value="展示车序号列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(182)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getAmsSaleOrderMaterial")
+    Map<String,Object> getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam("status") Integer status);
+    //新增公开派单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/addOpenAmsDispatchSaleOrder/{orderMaterialId}")
+    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("orderMaterialId") BigDecimal orderMaterialId);
+    //删除公开派单
+    @PostMapping(value = "/api/v1/ams/amssaleorders//deleteAmsDispatchSaleOrder/{dispatchId}")
+    Map<String,Object> deleteAmsDispatchSaleOrder(@PathVariable("dispatchId")BigDecimal saleOrderId);
+
+    //展示公开派单
+    @ApiOperation(value="展示公开派单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(181)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getOpenDispatchSaleOrder")
+    Map<String,Object> getOpenDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId);
+    //修改公开派单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateOpenDispatchSaleOrder")
+    Map<String,Object> updateOpenDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    //新增日计划
+    @PostMapping(value = "/api/v1/ams/amstruckraildayplans/addTruckRailDayPlan")
+    Map<String,Object> addTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapVal);
+    //删除日计划
+    @PostMapping(value = "/api/v1/ams/amstruckraildayplans/deleteTruckRailDayPlan/{dayPlanId}")
+    Map<String,Object> deleteTruckRailDayPlan(@PathVariable("dayPlanId") BigDecimal dayPlanId);
+    //通过计划Id查询修改数据
+    @PostMapping("/api/v1/ams/amstruckraildayplans/getDayPlanByDayPlanId/{dayplanId}")
+    Map<String,Object> getDayPlanByDayPlanId(@PathVariable("dayplanId") Integer dayplanId);
+
+    //修改日计划  2021年11月20日03:17:37
+    @PostMapping("/api/v1/ams/amstruckraildayplans/updateDayPlan")
+    public Map<String,Object> updateDayPlan(@RequestBody(required = false) Map<String, Object> map);
+
+    //查询所有承运商
+    @GetMapping("/api/v1/ams/amstruckraildayplans/getCarrierMes")
+    public  Map<String,Object> getCarrierMes();
+
+    //修改日计划
+    @PostMapping(value = "/api/v1/ams/amstruckraildayplans/updateTruckRailDayPlan")
+    Map<String,Object> updateTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapVal);
+    //查询日计划
+    @ApiOperation(value="展示焦炭日计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(183)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckraildayplans/getTruckRailDayPlanList")
+    Map<String, Object> getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("status") Integer status
+    );
+    //查询日计划
+    @ApiOperation(value="展示水渣日计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(183)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckraildayplans/getSzTruckRailDayPlanList")
+    Map<String, Object> getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("status") Integer status);
+
+    //新增钢材发往异地库日计划
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/addRailOffsetDayplan")
+    Map<String,Object> addRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    //删除钢材发往异地库计划
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/deleteRailOffsetDayplan/{dayplanId}")
+    Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayplanId") Integer dayplanId);
+
+    //接收钢材发往异地库计划
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/receiveRailOffsetDayplan/{dayplanId}")
+    Map<String,Object> receiveRailOffsetDayplan(@PathVariable("dayplanId") Integer dayplanId);
+
+    //修改钢材发往异地库计划
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/addRailOffsetDayplan")
+    Map<String,Object> updateRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    //展示钢材发往异地库计划
+    @ApiOperation(value="展示钢材发往异地库计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(183)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/getRailOffsetDayplan")
+    Map<String, Object> getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam Integer pageNum,
+                                       @RequestParam Integer pageSize,
+                                       @RequestParam Integer apiId,
+                                       @RequestParam Integer dayplanReceiveStatus,
+                                       @RequestParam Integer carrierId);
+
+    /**
+     *新增运输计划
+     */
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/addTruckPlan")
+    Map<String,Object> addTruckPlan(@RequestBody(required = false) Map<String, Object> mapVal);
+    //删除运输计划
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/deleteTruckPlan/{planId}")
+    Map<String,Object> deleteTruckPlan(@PathVariable("planId") BigDecimal planId);
+    //接收运输计划
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/receiveInwardPlan/{planId}")
+    Map<String,Object> receiveInwardPlan(@PathVariable("planId") BigDecimal planId);
+    //修改渲染
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/selectInwardPlanToUpdate/{planId}")
+    Map<String,Object> selectInwardPlanToUpdate(@PathVariable("planId") BigDecimal planId);
+    //下发运输计划
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/downTruckPlan")
+    Map<String,Object> downTruckPlan(@RequestBody List<Map<String,Object>> mapList);
+    //修改运输计划
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/updateTruckPlan")
+    Map<String,Object> updateTruckPlan(@RequestBody(required = false) Map<String, Object> mapVal);
+    //修改运输计划
+//    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/updateTruckPlan")
+//    Map<String,Object> updateTruckPlan(@RequestBody(required = false) Map<String, Object> mapVal);
+    /**
+     * 展示运输计划
+     */
+    @ApiOperation(value="展示运输计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(还没有设置表头)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/getTruckPlanList")
+    Map<String, Object> getTruckPlanList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer planStatus,
+                                         @RequestParam String carrierId,
+                                         @RequestParam Integer planId,
+                                         @RequestParam String con);
+
+    @ApiOperation(value="展示运输计划下的运输订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(还没有设置表头)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/getPlanOrder")
+    Map<String, Object> getPlanOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer planId,
+                                        @RequestParam Integer requirementId,
+                                         @RequestParam Integer orderStatus
+
+                                     );
+
+    /**
+     *新增用车需求
+     */
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/addTruckRequirement")
+    Map<String,Object> addTruckRequirement(@RequestBody(required = false) Map<String, Object> mapVal);
+    //用车需求
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/deleteTruckRequirement/{requirementId}")
+    Map<String,Object> deleteTruckRequirement(@PathVariable("requirementId") BigDecimal requirementId);
+    // 接收
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/receiveRequirement/{requirementId}")
+    Map<String,Object> receiveRequirement(@PathVariable("requirementId") Integer requirementId);
+    // 修改渲染
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/selectRequirement/{requirementId}")
+    Map<String, Object> selectRequirement(@PathVariable("requirementId")Integer requirementId);
+    //修改用车需/下发用车需求
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/updateTruckRequirement")
+    Map<String,Object> updateTruckRequirement(@RequestBody(required = false) Map<String, Object> mapVal);
+    //下发
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/downRequirement")
+    Map<String,Object> downRequirement(@RequestBody List<Map<String,Object>> requirementIds);
+    /**
+     * 展示用车需求
+     */
+    @ApiOperation(value="展示用车需求")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(还没有设置表头)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/getTruckRequirementList")
+    Map<String, Object> getTruckRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize,
+                                   @RequestParam Integer apiId,
+                                   @RequestParam Integer requirementStatus,
+                                   @RequestParam String orgCode, @RequestParam String index,@RequestParam String startTime,
+                                                @RequestParam String endTime);
+
+    @ApiOperation(value="查询app端公开抢单")
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")
+    Map<String,Object> getDispatchSaleOrderList();
+
+    @ApiOperation(value="抢单/接收订单锁定")
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/lockDispatchSaleOrder")
+    Map<String, Object> lockDispatchSaleOrder(@RequestParam Integer dispatchId,
+                                              @RequestParam String carrierSsoId);
+
+    @ApiOperation(value="查询app端承运商已抢到的单")
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
+    Map<String, Object> getLockDispatchSaleOrderList(@RequestParam Integer carrierId);
+
+//    @PostMapping("/api/v1/ams/amssaleplans/getAllSteelMaterialMes")
+//    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+//                                                      @RequestParam Integer pageNum,
+//                                                      @RequestParam Integer pageSize,
+//                                                      @RequestParam Integer apiId,
+//                                                      @RequestParam String con) ;
+
+    @PostMapping("/api/v1/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
+    Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      @RequestParam Integer pageNum,
+                                                      @RequestParam Integer pageSize,
+                                                      @RequestParam Integer apiId,
+                                                      @RequestParam Integer dispatchType,
+                                                      @RequestParam String carrierSsoId) ;
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/getPurchaseIdByBatch")
+    Map<String, Object> getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId);
+
+    @GetMapping("/api/v1/ams/amstruckinwardrequirement/getCapacityType")
+    Map<String, Object> getCapacityType();
+
+    @GetMapping("/api/v1/ams/amstruckinwardrequirement/getShipperUser")
+    Map<String, Object> getShipperUser();
+
+    @GetMapping("/api/v1/ams/amstruckinwardplan/getCarrierList")
+    Map<String, Object> getCarrierList();
+
+    @GetMapping("/api/v1/ams/amstruckinwardrequirement/getOffsetWarehouse")
+    Map<String, Object> getOffsetWarehouse();
+
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/getWareHouse")
+    Map<String, Object>getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam String con);
+
+    /**
+     * 钢材发运到异地库查询物资
+     * @param dayplanId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/getMaterialMesByDayPlanId")
+    Map<String, Object> getMaterialMesByDayPlanId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer dayplanId);
+
+    /**
+     * 下发钢材发往异地库计划
+     * @param mapList
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/issueRailOffsetDayplan")
+    Map<String,Object> issueRailOffsetDayplan(@RequestBody List<Map<String, Object>> mapList);
+
+    /**
+     * 到站下拉
+     * @return
+     */
+    @GetMapping("/api/v1/ams/amsrailoffsetdayplan/getdayPlanToTheStationId")
+    Map<String, Object> getdayPlanToTheStationId();
+
+
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/getRailOffsetDayplanId")
+    Map<String, Object> getRailOffsetDayplanId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer dayPlanId);
+
+    @PostMapping("/api/v1/ams/amstruckinwardplan/finishTruckPlan/{planId}")
+    public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId);
+
+    //零星订单================================================================================================================================
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/getSporadicOrdersList")
+    RESTfulResult getSporadicOrdersList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer orderType,
+                                              @RequestParam Integer issueStatus,
+                                              @RequestParam String con,
+                                              @RequestParam Integer dispatchStatus,
+                                              @RequestParam Integer sporadicStatus,
+                                              @RequestParam String carrierSsoId,
+                                              @RequestParam String userId,
+                                              @RequestParam String userIds,
+                                        @RequestParam String startTime,
+                                        @RequestParam String endTime);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/seeAllMaterials")
+    RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer sporadicOrderId,
+                                              @RequestParam String con);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/deleteSporadicOrders")
+    Map<String, Object> deleteSporadicOrders(@RequestParam Integer sporadicOrderId);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/issueSporadicOrders")
+    Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/closeSporadicOrder")
+    Map<String, Object> closeSporadicOrder(@RequestBody Map<String, Object> map);
+
+
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/addInwardSporadicOrder")
+    Map<String, Object> addInwardSporadicOrder(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/addSporadicOrders")
+    Map<String, Object> addSporadicOrders(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/addSporadicOrderTimes")
+    Map<String, Object> addSporadicOrderTimes(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/selectSporadicOrder")
+    RESTfulResult selectSporadicOrder(@RequestParam Integer sporadicOrderId);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/updateSporadicOrder")
+    Map<String, Object> updateSporadicOrder(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amssaleordermaterials/getTruckNoList")
+    RESTfulResult getTruckNoList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam Integer apiId,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize,
+                                 @RequestParam Integer issueStatus);
+
+
+    @ApiOperation(value="查询未上报的销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(408)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderInfoes")
+    Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam(required = false) String consigneeSsoId,
+                                           @RequestParam(required = false) String con,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime,
+                                           @RequestParam String saler);
+
+    @ApiOperation(value="查询已上报销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(408)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderReportedes")
+    Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam(required = false) String consigneeSsoId,
+                                               @RequestParam(required = false) String con,
+                                               @RequestParam String startTime,
+                                               @RequestParam String endTime,
+                                               @RequestParam String saler);
+
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
+    Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("con") String con,
+                                                       @RequestParam Integer shipperId,
+                                                       @RequestParam(required = false) Integer saleType,
+                                                       @RequestParam(required = false) String consigneeSsoId,
+                                                       @RequestParam(required = false) String startTime,
+                                                       @RequestParam(required = false) String endTime,
+                                                       @RequestParam(required = false) String saler
+    );
+
+    @ApiOperation(value="查询财务已审批销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(409)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getAmsSaleOrderApprovedes")
+    Map<String, Object> getAmsSaleOrderApprovedes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  @RequestParam("pageNum") Integer pageNum,
+                                                  @RequestParam("pageSize") Integer pageSize,
+                                                  @RequestParam("apiId") Integer apiId,
+                                                  @RequestParam("con") String con);
+
+    @ApiOperation(value="查询销售订单物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(410)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderAndMaterialById")
+    RESTfulResult getSaleOrderAndMaterialById(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("saleOrderId") BigDecimal saleOrderId);
+
+    @ApiOperation(value="新增车序号")
+    @PostMapping("/api/v1/ams/amssaleordermaterials/addTruckNo")
+    Map<String, Object> addTruckNo(@RequestBody List<Map<String, Object>> mapList);
+
+    @ApiOperation(value="下发车序号")
+    @PostMapping("/api/v1/ams/amssaleordermaterials/issueTruckNo")
+    Map<String, Object> issueTruckNo(@RequestBody List<Map<String, Object>> mapList);
+
+    @ApiOperation(value="定向派单选择承运商并下发")
+    @PostMapping("/api/v1/ams/amsdispatchsaleorders/addDispatchSaleOrder")
+    Map<String, Object> addDispatchSaleOrder(@RequestBody Map<String, Object> mapValue);
+
+
+    //发布通知==============================================================================================
+    /*
+
+    //公告获取列表
+    @PostMapping(value = "/api/v1/rms/dilnotices/getNoticeList")
+    Map<String, Object> getNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("con") String con);
+*/
+
+    //承运商公告获取列表
+    @PostMapping(value = "/api/v1/ams/dilnotices/getCarrierNoticeList")
+    Map<String, Object> getCarrierNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @RequestParam("con") String con);
+
+
+
+    //销售公司公告获取列表
+    @PostMapping(value = "/api/v1/ams/dilnotices/getMarketingNoticeList")
+    Map<String, Object> getMarketingNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("con") String con);
+
+    //收货用户公告获取列表
+    @PostMapping(value = "/api/v1/ams/dilnotices/getClientNoticeList")
+    Map<String, Object> getClientNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("con") String con);
+
+
+    //新增公告
+    @PostMapping(value = "api/v1/ams/dilnotices/insertNotice")
+    Map<String,Object> insertNotice(@RequestBody(required = false) Map<String,Object> map);
+
+    //发布公告
+    @PostMapping(value = "api/v1/ams/dilnotices/releaseNotice")
+    Map<String,Object> releaseNotice(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除公告
+    @PostMapping(value = "api/v1/ams/dilnotices/deleteNotice/{id}")
+    Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id);
+
+
+    //获取公告名字
+    @PostMapping(value = "api/v1/ams/dilnotices/queryName/{userId}")
+    Map<String, Object> queryName(@PathVariable("userId") String userId);
+
+    //更新公告
+    @PostMapping(value = "api/v1/ams/dilnotices/updateNotice")
+    Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map);
+
+    //根据用户ID更新状态
+    @PostMapping(value = "api/v1/ams/dilnotices/updateNoticeStatus")
+    Map<String, Object> updateNoticeStatus(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/dilnotices/getNoticeUser")
+    Map<String, Object> getNoticeUser(@RequestBody(required = false) Map<String, Object> map,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("apiId") Integer apiId);
+
+    @PostMapping(value = "api/v1/ams/dilnotices/getNoticeAll")
+    Map<String, Object> getNoticeAll(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/dilnotices/readAll")
+    Map<String, Object> readAll(@RequestBody(required = false) Map<String, Object> map);
+
+    //根据id获取公告
+    @PostMapping(value = "api/v1/ams/dilnotices/getNoticeById/{id}")
+    Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id);
+
+    //根据权限获取最新公告
+    @PostMapping(value = "api/v1/ams/dilnotices/getNewNoticeByPermission/{permissions}")
+    Map<String, Object> getNewNoticeByPermission(@PathVariable("permissions")String permissions);
+
+
+    //******************************************下拉框*******************************
+
+
+    //公告下拉框,须摸清实现原理
+    @GetMapping(value = "api/v1/ams/dilnotices/getNoticeTypeId")
+    Map<String,Object> getNoticeTypeId();
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/getTruckNoMaterialList")
+    RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/getSaleMaterialList")
+    RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "api/v1/ams/amsdispatchsaleorders/getDispatchMaterialList")
+    RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchTruckOrderBySale")
+    Map<String, Object> dispatchTruckOrderBySale(Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchInwardTruckOrderBySale")
+    Map<String, Object> dispatchInwardTruckOrderBySale(Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/ams/amssaleorders/getCokeSaleOrderList")
+    RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("con") String con);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchTruckOrderByCarrier")
+    Map<String, Object> dispatchTruckOrderByCarrier(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/closeSaleOrder")
+    Map<String, Object> closeSaleOrder(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/lockDispatchSaleOrderList")
+    Map<String, Object> lockDispatchSaleOrderList(@RequestBody Map<String, Object> mapValue);
+
+    //新增采购内转需求
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/addPurInwardRequirement")
+    Map<String, Object> addPurInwardRequirement(@RequestBody  Map<String, Object> mapval);
+
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/getPurRequirementList")
+    Map<String, Object> getPurRequirementList(@RequestBody Map<String, Object> mapValue,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer requirementStatus,
+                                              @RequestParam String con,
+                                              @RequestParam String userId,
+                                              @RequestParam String carrierSsoId,
+                                              @RequestParam String enableStatus,
+                                              @RequestParam String planStatus,
+                                              @RequestParam String startTime,
+                                              @RequestParam String endTime,
+                                              @RequestParam BigDecimal planId);
+
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRealAddressByLike")
+    Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index);
+
+    @PostMapping("/api/v1/ams/amssaleorders/saleOrderEmpowerCarrier")
+    public RESTfulResult saleOrderEmpowerCarrier(@RequestBody(required = false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListByCarrierSsoId")
+    public RESTfulResult getSaleOrderListByCarrierSsoId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                        @RequestParam String carrierSsoId,
+                                                        @RequestParam Integer pageNum,
+                                                        @RequestParam Integer pageSize,
+                                                        @RequestParam Integer apiId,
+                                                        @RequestParam String con);
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getPriceMap")
+    Map<String, Object> getPriceMap(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/getRequirementMaterial/{requirementId}")
+    Map<String,Object> getRequirementMaterial(@PathVariable("requirementId") Integer requirementId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getBenPrice")
+    Map<String, Object> getBenPrice(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/refuseDispatchSaleOrderList")
+    Map<String, Object> refuseDispatchSaleOrderList(List<Map<String, Object>> mapList);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/addSteelSaleOrder")
+    Map<String, Object> addSteelSaleOrder(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getTruckNoAndMaterialList")
+    RESTfulResult getTruckNoAndMaterialList(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/dispatchSteelOrder")
+    Map<String, Object> dispatchSteelOrder(@RequestBody List<Map<String, Object>> mapList);
+
+    @GetMapping(value = "/api/v1/ams/amssaleorders/getCarrierByPlace")
+    RESTfulResult getCarrierByPlace(@RequestParam Integer placeId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getPriceByCarrierAndPlace")
+    Map<String, Object> getPriceByCarrierAndPlace(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/dispatchToCarrier")
+    RESTfulResult dispatchToCarrier(@RequestBody(required = false) List<Map<String, Object>> mapList);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleOrderListToCarrier")
+    RESTfulResult getSaleOrderListToCarrier(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String carrierSsoId,
+                                            @RequestParam(required = false) String con);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getSteelTruckNoList")
+    RESTfulResult getSteelTruckNoList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam String con,
+                                      @RequestParam(required = false) String startTime,
+                                      @RequestParam(required = false)String endTime);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getTruckNoMaterial")
+    RESTfulResult getTruckNoMaterial(@RequestParam Integer saleOrderMaterialId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getNoCarTruckNoList")
+    RESTfulResult getNoCarTruckNoList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam String con,
+                                      @RequestParam(required = false) String startTime,
+                                      @RequestParam(required = false)String endTime);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getHaveCarTruckNoList")
+    RESTfulResult getHaveCarTruckNoList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam String con,
+                                        @RequestParam String startTime,
+                                        @RequestParam String endTime);
+    @PostMapping(value = "/api/v1/ams/amstrucksporadicorders/getSporadic")
+    Map<String, Object> getSporadic(@RequestParam Integer sporadicId);
+
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/getSporadicOfOrder")
+    Map<String, Object> getSporadicOfOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                        @RequestParam Integer apiId,
+                                                        @RequestParam Integer pageNum,
+                                                        @RequestParam Integer pageSize,
+                                                        @RequestParam Integer sporadicId);
+
+    /*
+    新增内转运输单价
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/insertInwardPrice")
+    Map<String, Object> insertInwardPrice(Map<String, Object> mapVal);
+
+
+    @ApiOperation(value="查询汽运单价信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(109)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardContractPrice")
+    Map<String, Object> getInwardContractPrice(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      @RequestParam("pageNum") Integer pageNum,
+                                                      @RequestParam("pageSize") Integer pageSize,
+                                                      @RequestParam("apiId") Integer apiId,
+                                                      @RequestParam("deleted") Integer deleted,
+                                                      @RequestParam("con") String con);
+    //根据物资查询运输物资单价
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardPriceBy")
+    Map<String, Object> getInwardPriceBy(@RequestBody(required = false)Map<String, Object> mapvalue);
+
+
+    //删除销售订单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/deleteSaleOrderById")
+    Map<String,Object> deleteSaleOrderById(@RequestParam Integer saleOrderId);
+
+    //查询出销售订单下的所有数据
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getAllSaleMessages")
+    RESTfulResult getAllSaleMessages(@RequestParam Integer saleOrderId);
+
+    // 修改承运商授权
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateTruckNoCarrier")
+    Map<String, Object> updateTruckNoCarrier(@RequestBody Map<String, Object> mapValue);
+
+    // 批量上传销售订单到金蝶
+    @PostMapping(value = "/api/v1/ams/amssaleorders/uploadSaleOrderList")
+    Map<String, Object> uploadSaleOrderList(@RequestBody List<Map<String, Object>> saleOrderIdList);
+
+    // 自动匹配出最近的一个地址
+    @PostMapping(value = "/api/v1/ams/amssaleorders/matchingAddressRecently")
+    RESTfulResult matchingAddressRecently(@RequestParam BigDecimal receiveId);
+
+    // 自动匹配上一条运单的司机电话
+    @PostMapping(value = "/api/v1/ams/amssaleorders/matchingDriverTelRecently")
+    RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber);
+
+    // 展示副产品销售订单列表
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getFuSaleOrderList")
+    Map<String, Object> getFuSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam String con,
+                                           @RequestParam BigDecimal deleted,
+                                           @RequestParam(required = false) String startTime,
+                                           @RequestParam(required = false)String endTime);
+
+    // 展示副产品销售订单列表
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateAllMaterialInSale")
+    Map<String,Object> updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue);
+
+    // 同步关闭金蝶订单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/deleteSaleOrderSame")
+    Map<String,Object> deleteSaleOrderSame(@RequestBody Map<String, Object> mapValue);
+
+    // 修改收货地址
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateCarAddress")
+    Map<String, Object> updateCarAddress(Map<String, Object> mapValue);
+
+    // 展示反审批的钢材订单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getSteelOrderDeletedList")
+    Map<String, Object> getSteelOrderDeletedList(@RequestBody(required = false) Map<String, Object> objectMap,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam String con,
+                                                 @RequestParam String consigneeSsoId,
+                                                 @RequestParam(required = false) String startTime,
+                                                 @RequestParam(required = false) String endTime,
+                                                 @RequestParam(required = false) String saler);
+
+    // 修改厂内未装货车辆的运单车牌号
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateCapacityNumberInFactory")
+    Map<String,Object> updateCapacityNumberInFactory(@RequestBody Map<String, Object> mapValue);
+
+    // 修改厂内未装货车辆的运单车牌号
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateConsigneeTel")
+    Map<String,Object> updateConsigneeTel(@RequestBody Map<String,Object> mapValue);
+
+    // 展示下发给承运商的车序号和物资
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getCarrierTruckNoAndMaterialList")
+    Map<String, Object> getCarrierTruckNoAndMaterialList(@RequestBody Map<String, Object> map);
+
+    // 展示下发给承运商的车序号和物资
+    @PostMapping(value = "/api/v1/ams/amssaleorders/closeSteelMaterialId")
+    Map<String, Object> closeSteelMaterialId(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleCokeOrder")
+    Map<String, Object> getSaleCokeOrder(@RequestBody Map<String, Object> map,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String con,
+                                            @RequestParam String consigneeSsoId,
+                                            @RequestParam Integer shipperId,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/adverseCloseSaleMaterial")
+    Map<String, Object> adverseCloseSaleMaterial(@RequestParam Integer saleMaterialId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/adverseCloseSaleOrder")
+    Map<String, Object> adverseCloseSaleOrder(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRangePoint")
+    Map<String, Object> getRangePoint(@RequestBody(required = false) Map<String, Object> map,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam String con);
+
+
+
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/updateInwardConsignee")
+    Map<String, Object> updateInwardConsignee(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getKucunList")
+    Map<String, Object> getKucunList(@RequestBody(required = false) Map<String, Object> map,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime,
+                                     @RequestParam String remark,
+                                     @RequestParam String transferIndep,
+                                     @RequestParam String consigneeName,
+                                     @RequestParam String totheStation);
+
+
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/batchUpdateInwardConsignee")
+    Map<String, Object> batchUpdateInwardConsignee(@RequestBody List<Map<String, Object>> mapList);
+
+    @PostMapping(value = "/api/v1/ams/dilnotices/getNotice")
+    RESTfulResult getNotice(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/ams/dilnotices/selectAllLog")
+    RESTfulResult selectAllLog(@RequestBody(required = false) Map<String, Object> mapValue,
+                               @RequestParam Integer pageNum,
+                               @RequestParam Integer pageSize,
+                               @RequestParam Integer apiId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/queryFormat")
+    RESTfulResult queryFormat(@RequestBody List<Map<String,Object>> mapList);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/queryMaterial")
+    RESTfulResult queryMaterial(@RequestBody List<Map<String,Object>> mapList);
+
+    @PostMapping("/api/v1/ams/amssaleorders/addSteelSaleOrderList")
+    Map<String, Object> addSteelSaleOrderList(@RequestBody List<Map<String, Object>> mapList);
+
+    @PostMapping("/api/v1/ams/amssaleorders/addUnloadSteelSaleOrderList")
+    Map<String, Object> addUnloadSteelSaleOrderList(@RequestBody List<Map<String, Object>> mapList);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/updateTransPrice")
+    Map<String, Object> updateTransPrice(@RequestBody Map<String, Object> mapList);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/getwz")
+    Map<String, Object> getwz(@RequestBody Map<String, Object> mapList);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/getcargonameId")
+    Map<String, Object> getcargonameId(@RequestBody Map<String, Object> mapList);
+
+    @PostMapping("/api/v1/ams/amssaleorders/reverseCloseOrder")
+    Map<String, Object> reverseCloseOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderStatus")
+    Map<String, Object> getSaleOrderStatus(@RequestParam String saleNumber);
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/closeDueDate")
+    Map<String, Object> closeDueDate(@RequestParam BigDecimal requirementId);
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/addBilletRequirement")
+    Map<String,Object> addBilletRequirement(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/getBilletRequirementList")
+    Map<String, Object> getBilletRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam String orgCode,
+                                                 @RequestParam String index,
+                                                 @RequestParam String startTime,
+                                                 @RequestParam String endTime);
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/checkBillet")
+    Map<String, Object> checkBillet(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amssaleorders/getMakeOrderDate")
+    Map<String, Object> getMakeOrderDate(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amssaleorders/mergeOrder")
+    Map<String, Object> mergeOrder(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amssaleorders/splitOrder")
+    Map<String, Object> splitOrder(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amssaleorders/batchUpdateCapacity")
+    Map<String, Object> batchUpdateCapacity(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amssaleorders/updateSaleOrderRemark")
+    Map<String, Object> updateSaleOrderRemark(@RequestBody Map<String, Object> mapValue);
+
+}

src/main/java/com/steerinfo/dil/feign/BmsshipFeign.java

@@ -0,0 +1,331 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/23 8:46
+ * @Version:V2.0
+ */
+@FeignClient(value = "DIL-BMSSHIP-API-DEV", url = "${openfeign.BmsshipFeign.url}")
+public interface BmsshipFeign {
+
+    /**
+     * 展示港口装卸费
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getPortHandlingFeeList")
+    RESTfulResult getPortHandlingFeeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("con") String con);
+
+    /**
+     * 展示批次信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getBatch")
+    RESTfulResult getBatch(@RequestBody(required = false) Map<String, Object> mapValue,
+                           @RequestParam("pageNum") Integer pageNum,
+                           @RequestParam("pageSize") Integer pageSize,
+                           @RequestParam("apiId") Integer apiId,
+                           @RequestParam("con") String con);
+
+    /**
+     * 生成港口装卸费
+     *
+     * @param portHandlingFee
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/addPortHandlingFee")
+    RESTfulResult addPortHandlingFee(@RequestBody Map<String, Object> portHandlingFee) throws Exception;
+
+    /**
+     * 修改港口装卸费信息
+     *
+     * @param portHandlingFee
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/updatePortHandlingFee")
+    RESTfulResult updatePortHandlingFee(@RequestBody Map<String, Object> portHandlingFee);
+
+    /**
+     * 查询修改港口装卸费数据渲染表单
+     *
+     * @param feeId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getFeeToUpdate/{feeId}")
+    RESTfulResult getFeeToUpdate(@PathVariable("feeId") BigDecimal feeId);
+
+    /**
+     * 逻辑删除港口装卸费
+     *
+     * @param feeId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/deletePortHandlingFee/{feeId}")
+    RESTfulResult deletePortHandlingFee(@PathVariable("feeId") String feeId);
+
+    /**
+     * 展示水运详单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipdetailsorder/getDetailsOrderList")
+    RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("con") String con);
+
+    /**
+     * 展示未生成账单的详单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipdetailsorder/getUncomplateDetailsOrderList")
+    RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @RequestParam("pageNum") Integer pageNum,
+                                                @RequestParam("pageSize") Integer pageSize,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("con") String con);
+
+    /**
+     * 生成水运计费详单
+     *
+     * @param resultId
+     * @return
+     * @throws Exception
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipdetailsorder/addDetailsOrder/{resultId}")
+    RESTfulResult addDetailsOrder(@PathVariable("resultId") BigDecimal resultId) throws Exception;
+
+
+    /**
+     * 展示水运费和水分质检费账单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getStatementList")
+    RESTfulResult getStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam("pageNum") Integer pageNum,
+                                   @RequestParam("pageSize") Integer pageSize,
+                                   @RequestParam("apiId") Integer apiId,
+                                   @RequestParam("con") String con);
+
+    /**
+     * 展示途损费账单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getLossStatementList")
+    RESTfulResult getLossStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("con") String con);
+
+    /**
+     * 展示水分质检实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getWaterResult")
+    RESTfulResult getWaterResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam("pageNum") Integer pageNum,
+                                 @RequestParam("pageSize") Integer pageSize,
+                                 @RequestParam("apiId") Integer apiId);
+
+    /**
+     * 生成水运费账单
+     *
+     * @param mapList
+     * @return
+     * @throws Exception
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addStatement")
+    RESTfulResult addStatement(@RequestBody List<Map<String, Object>> mapList) throws Exception;
+
+    /**
+     * 生成水分质检账单
+     *
+     * @param mapList
+     * @return
+     * @throws Exception
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addWaterStatement")
+    RESTfulResult addWaterStatement(@RequestBody List<Map<String, Object>> mapList) throws Exception;
+
+    /**
+     * 生成途损账单
+     *
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addLossStatement")
+    RESTfulResult addLossStatement(@RequestBody Map<String, Object> map) throws Exception;
+
+    /**
+     * 展示账单下的详单
+     *
+     * @param batchId
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getStatementDetailsOrderList")
+    RESTfulResult getStatementDetailsOrderList(@RequestParam BigDecimal batchId,
+                                               @RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("statementId") BigDecimal statementId,
+                                               @RequestParam("con") String con);
+
+    /**
+     * 展示详单下的船运实绩
+     *
+     * @param batchId
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getShipResult")
+    RESTfulResult getShipResult(@RequestParam BigDecimal batchId,
+                                @RequestBody(required = false) Map<String, Object> mapValue,
+                                @RequestParam("pageNum") Integer pageNum,
+                                @RequestParam("pageSize") Integer pageSize,
+                                @RequestParam("apiId") Integer apiId);
+
+    /**
+     * 查询水运费计算公式
+     *
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipformulas/getShipFeesFormula")
+    RESTfulResult getShipFeesFormula();
+
+    /**
+     * 查询途损费计算公式
+     *
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipformulas/getLossFeesFormula")
+    RESTfulResult getLossFeesFormula();
+
+    /**
+     * 查询水分质检计算公式
+     *
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipformulas/getWaterFeesFormula")
+    RESTfulResult getWaterFeesFormula();
+
+     //新增二程船装卸费用
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/addPortHandlingFeeSecond")
+    Map<String, Object> addPortHandlingFeeSecond(@RequestBody(required = true) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/uploadBmsshipOrder", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    Map<String, Object> uploadBmsshipOrder(@RequestPart("file") MultipartFile multipartFile);
+
+    //下载水运单图片
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/downloadBmsshipOrder")
+    Map<String, Object> downloadBmsshipOrder(@RequestParam("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/selectPortFeeSecondList")
+    Map<String, Object> selectPortFeeSecondList(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                @RequestParam("pageNum")Integer pageNum,
+                                                @RequestParam("pageSize")Integer pageSize,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("startTime") String startTime,
+                                                @RequestParam("feeType")Integer feeType,
+                                                @RequestParam("endTime") String endTime,
+                                                @RequestParam("con") String con);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getBmsshipFee/{id}")
+    Map<String, Object> getBmsshipFee(@PathVariable("id") Integer id);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/deletePortHandlingFeeSecond/{feeId}")
+    Map<String,Object> deletePortHandlingFeeSecond(@PathVariable("feeId")BigDecimal feeId);
+
+
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addwaterStatement")
+    Map<String, Object> addwaterStatement(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getTrainDetailsByBatch/{batchId}")
+    Map<String,Object> getTrainDetailsByBatch(@PathVariable("batchId")BigDecimal batchId);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getTruckDetailsByBatch/{batchId}")
+    Map<String,Object> getTruckDetailsByBatch(@PathVariable("batchId")BigDecimal batchId);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findBatchHavingLoad")
+    Map<String,Object> findBatchHavingLoad(String con);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findLoadByBatch")
+    Map<String, Object> findLoadByBatch(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                @RequestParam("pageNum")Integer pageNum,
+                                                @RequestParam("pageSize")Integer pageSize,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("batchId") BigDecimal batchId);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getShipFeeStatement")
+    Map<String, Object> getShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getShipFeeStatemented")
+    Map<String, Object> getShipFeeStatemented(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/addShipFeeStatement")
+    Map<String, Object> addShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/editShipFeeStatement")
+    Map<String, Object> editShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getWetDryDetails")
+    Map<String, Object> getWetDryDetails(@RequestBody(required = false) Map<String, Object> map);
+}

src/main/java/com/steerinfo/dil/feign/BmstrainFeign.java

@@ -0,0 +1,185 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:BmsshipFeign
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/23 8:46
+ * @Version:V2.0
+ */
+@FeignClient(value = "DIL-BMSTRAIN-API-DEV", url = "${openfeign.BmstrainFeign.url}")
+public interface BmstrainFeign {
+
+    /**
+     * 展示火运详单
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/getTrainDetailsOrderList")
+    RESTfulResult getTrainDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("con") String con);
+
+    /**
+     * 展示未转账单的火运详单
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/getUncomplateTrainDetailsList")
+    RESTfulResult getUncomplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @RequestParam("pageNum") Integer pageNum,
+                                                @RequestParam("pageSize") Integer pageSize,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("con") String con);
+
+    /**
+     * 展示火运实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/getTrainResultList")
+    RESTfulResult getTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam("pageNum") Integer pageNum,
+                                     @RequestParam("pageSize") Integer pageSize,
+                                     @RequestParam("apiId") Integer apiId);
+
+    /**
+     * 生成火运详单
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/addTrainDetails")
+    RESTfulResult addTrainDetails(@RequestBody Map<String, Object> map);
+
+    /**
+     * 展示火运账单列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getTrainStatementList")
+    RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("con") String con);
+
+    /**
+     * 展示火运实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getStatementTrainResultList")
+    RESTfulResult getStatementTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("detailsId") Integer detailsId);
+
+    /**
+     * 展示账单下的详单
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getComplateTrainDetailsList")
+    RESTfulResult getComplateTrainDetailsList(@RequestParam("batchId") BigDecimal batchId,
+                                              @RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("statementId") BigDecimal statementId,
+                                              @RequestParam("con") String con);
+
+    /**
+     * 生成火运费账单
+     *
+     * @param mapList
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/addTrainStatement")
+    RESTfulResult addTrainStatement(@RequestBody List<Map<String, Object>> mapList);
+  
+  /**
+     * 展示销售火运结算列表
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/getSettlementList")
+    RESTfulResult getSettlementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("con") String con);
+
+    /**
+     * 新增火运结算
+     * @param bmstrainSettlement
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/addTrainSettlement")
+    Map<String,Object> addTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement);
+
+    /**
+     * 修改火运结算
+     * @param bmstrainSettlement
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/updateTrainSettlement")
+    Map<String,Object> updateTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement);
+
+    /**
+     * 逻辑删除火运结算
+     * @param settlementId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/deleteTrainSettlement/{settlementId}")
+    Map<String,Object> deleteTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId);
+
+    /**
+     * 得到修改渲染
+     * @param settlementId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/selectTrainSettlement/{settlementId}")
+    Map<String,Object> selectTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId);
+
+}

src/main/java/com/steerinfo/dil/feign/BmstruckFeign.java

@@ -0,0 +1,337 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/23 8:46
+ * @Version:V2.0
+ */
+@FeignClient(value = "DIL-BMSTRUCK-API-DEV", url = "${openfeign.BmstruckFeign.url}")
+public interface BmstruckFeign {
+
+    /**
+     * 展示汽运详单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getTruckDetailsOrderList")
+    RESTfulResult getTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("orderType") Integer orderType,
+                                           @RequestParam("carrierSsoId") String carrierSsoId);
+
+    /**
+     * 展示汽运实绩信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getTruckResultList")
+    RESTfulResult getTruckResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam("pageNum") Integer pageNum,
+                                     @RequestParam("pageSize") Integer pageSize,
+                                     @RequestParam("apiId") Integer apiId,
+                                     @RequestParam("orderId") BigDecimal orderId);
+
+    /**
+     * 新增汽运详单
+     *
+     * @param orderId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addDetailsOrder/{orderId}")
+    RESTfulResult addTruckDetailsOrder(@PathVariable("orderId") BigDecimal orderId);
+
+
+    /**
+     * 展示内转汽运未生成账单的作业详单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckConverted/getUnFinishedConvertedTruckDetailsOrderList")
+    RESTfulResult getUnFinishedConvertedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                              @RequestParam("pageNum") Integer pageNum,
+                                                              @RequestParam("pageSize") Integer pageSize,
+                                                              @RequestParam("apiId") Integer apiId,
+                                                              @RequestParam("orderType") BigDecimal orderType);
+
+    /**
+     * 新增内转汽运详单
+     *
+     * @param orderId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckConverted/addConvertedDetailsOrder/{orderId}")
+    RESTfulResult addConvertedDetailsOrder(@PathVariable("orderId") BigDecimal orderId);
+
+
+    /**
+     * 生成内转汽运账单
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/addConvertedTruckStatement")
+    RESTfulResult addConvertedTruckStatement(@RequestBody(required = false) List<Map<String, Object>> mapList);
+
+    /**
+     * 删除汽运账单
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/deleteConvertedTruckStatement/{statementId}")
+    RESTfulResult delete(@PathVariable("statementId") BigDecimal statementId);
+
+    /**
+     * 审批计费账单
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/updateConvertedTruckStatement/{statementId}")
+    RESTfulResult update(@PathVariable("statementId") BigDecimal statementId);
+
+    /**
+     * 销售汽运计费账单
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/getTruckStatementList")
+    RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("userId") String userId,
+                                        @RequestParam("startTime") String startTime,
+                                        @RequestParam("endTime") String endTime,
+                                        @RequestParam("con") String con);
+
+    /**
+     * 生成销售汽运计费账单
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/addTruckStatement")
+    RESTfulResult addTruckStatement(@RequestBody Map<String, Object> map);
+
+    /**
+     * 直接修改汽运计费详单
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/updateTruckDetail")
+    RESTfulResult updateTruckDetail(@RequestBody Map<String, Object> map);
+
+
+    /**
+     * 直接修改汽运计费详单
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addTruckDetail")
+    RESTfulResult addTruckDetail(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/updateConsignee")
+    RESTfulResult updateConsignee(@RequestBody Map<String, Object> map);
+
+    /**
+     * 展示账单下的详单
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @param statementId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/getSaleTruckStatementDetailsOrderList")
+    RESTfulResult getSaleTruckStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                        @RequestParam("pageNum") Integer pageNum,
+                                                        @RequestParam("pageSize") Integer pageSize,
+                                                        @RequestParam("apiId") Integer apiId,
+                                                        @RequestParam("statementId") BigDecimal statementId);
+
+    /**
+     * 审核
+     *
+     * @param statementId
+     * @param status
+     * @param person
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckcheck/updateBmstruckCheck")
+    RESTfulResult updateBmstruckCheck(@RequestParam("statementId") BigDecimal statementId,
+                                      @RequestParam("status") Integer status,
+                                      @RequestParam("person") Integer person);
+
+    /**
+     * 查询销售汽运离100KM差距10KM内计费公式
+     *
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckformulas/getSmallTruckFormula")
+    RESTfulResult getSmallTruckFormula();
+
+    /**
+     * 查询销售汽运离100KM差距10KM外计费公式
+     *
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckformulas/getBigTruckFormula")
+    RESTfulResult getBigTruckFormula();
+
+    /**
+     * 展示发票
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckinvoice/getInvoiceList")
+    RESTfulResult getInvoiceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam("pageNum") Integer pageNum,
+                                 @RequestParam("pageSize") Integer pageSize,
+                                 @RequestParam("apiId") Integer apiId,
+                                 @RequestParam("con") String con);
+
+    /**
+     * 新增发票
+     *
+     * @param mapVal
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckinvoice/addBmstruckInvoice")
+    RESTfulResult addBmstruckInvoice(@RequestBody Map<String, Object> mapVal);
+
+    /**
+     * 展示汽运未生成账单的详单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @param orderType
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getUnFinishedTruckDetailsOrderList")
+    RESTfulResult getUnFinishedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     @RequestParam("pageNum") Integer pageNum,
+                                                     @RequestParam("pageSize") Integer pageSize,
+                                                     @RequestParam("apiId") Integer apiId,
+                                                     @RequestParam("orderType") Integer orderType,
+                                                     @RequestParam("carrierSsoId") String carrierSsoId);
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/updateDetailsOrder")
+    RESTfulResult updateDetailsOrder(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addLossFeeOfCoke")
+    RESTfulResult addLossFeeOfCoke(@RequestBody Map<String, Object> map);
+
+    /**
+     * 内转结算详单
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @param carrierSsoId
+     * @param detailStatus
+     * @param orderType
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getInwardWeightDetailsOrder")
+    Map<String, Object> getInwardWeightDetailsOrder(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                    @RequestParam("pageNum") Integer pageNum,
+                                                    @RequestParam("pageSize") Integer pageSize,
+                                                    @RequestParam("apiId") Integer apiId,
+                                                    @RequestParam("carrierSsoId") String carrierSsoId,
+                                                    @RequestParam("detailStatus") Integer detailStatus,
+                                                    @RequestParam("orderType") Integer orderType,
+                                                    @RequestParam("userId") String userId,
+                                                    @RequestParam("startTime")String startTime,
+                                                    @RequestParam("endTime")String endTime,
+                                                    @RequestParam("capacityNo")String capacityNo,
+                                                    @RequestParam("shipperNames")String shipperNames,
+                                                    @RequestParam("transRangeValues")String transRangeValues,
+                                                    @RequestParam("materialTypeNames")String materialTypeNames,
+                                                    @RequestParam String isPage);
+
+
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getInwardWeightTimeDetailsOrder")
+    Map<String, Object> getInwardWeightTimeDetailsOrder(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                        @RequestParam("pageNum") Integer pageNum,
+                                                        @RequestParam("pageSize") Integer pageSize,
+                                                        @RequestParam("apiId") Integer apiId,
+                                                        @RequestParam("carrierSsoId") String carrierSsoId,
+                                                        @RequestParam("detailStatus") Integer detailStatus,
+                                                        @RequestParam("orderType") Integer orderType,
+                                                        @RequestParam("userId") String userId,
+                                                        @RequestParam("startTime")String startTime,
+                                                        @RequestParam("endTime")String endTime);
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getNoInwardDetails")
+    Map<String, Object> getNoInwardDetails(@RequestBody(required = false)Map<String, Object> mapVal,
+                                           @RequestParam("pageNum")Integer pageNum,
+                                           @RequestParam("pageSize")Integer pageSize,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("carrierSsoId") String carrierSsoId,
+                                           @RequestParam("userId") String userId,
+                                           @RequestParam("startTime") String startTime,
+                                           @RequestParam("endTime") String endTime,
+                                           @RequestParam("orgCode") String orgCode,
+                                           @RequestParam("capacityNo") String capacityNo,
+                                           @RequestParam("transRangeValues") String transRangeValues,
+                                           @RequestParam("materialTypeNames") String materialTypeNames,
+                                           @RequestParam("shipperNames") String shipperNames,
+                                           @RequestParam("isPage") String isPage);
+
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getSteelTruckDetailsOrder")
+    Map<String, Object> getSteelTruckDetailsOrder(@RequestBody(required = false) Map<String, Object> map,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer orderType,
+                                                  @RequestParam String carrierSsoId,
+                                                  @RequestParam String startTime,
+                                                  @RequestParam String endTime,
+                                                  @RequestParam String con);
+
+    @PostMapping("/api/v1/bmstruck/bmstruckdetailsorder/newInwardSettle")
+    Map<String, Object> newInwardSettle(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/bmstruck/bmstruckdetailsorder/updateDetailsStatus")
+    Map<String, Object> updateDetailsStatus(Map<String, Object> map);
+
+    @PostMapping("/api/v1/bmstruck/bmstruckdetailsorder/updateBatchDetailsOrder")
+    Map<String, Object> updateBatchDetailsOrder(Map<String, Object> map);
+
+    @PostMapping("/api/v1/bmstruck/bmstruckstatement/findDetailsForStatement")
+    Map<String, Object> findDetailsForStatement(Map<String, Object> map);
+
+    @PostMapping("/api/v1/bmstruck/bmstruckstatement/getStatementPhoto")
+    String getStatementPhoto(@RequestParam BigDecimal statementId);
+
+}
+
+

src/main/java/com/steerinfo/dil/feign/ColumnDataFeign.java

@@ -0,0 +1,19 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/6/23 9:58
+ * @Version 1.0
+ */
+@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "${openfeign.ColumnDataFeign.url}")
+public interface ColumnDataFeign {
+    @RequestMapping("getColumnData")
+    List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);
+}

src/main/java/com/steerinfo/dil/feign/JoinFeign.java

@@ -0,0 +1,27 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2022/2/24 18:07
+ */
+
+@FeignClient(value = "dal-dazhou-join-api",url = "${openfeign.JoinFeign.url}")
+public interface JoinFeign {
+
+    @PostMapping("api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult")
+    Map<String, Object> receiveTmsTruckWeightResult(@RequestBody List<Map<String, Object>> mapList);
+
+    @PostMapping("api/v1/join/wmsoutboundresult/sendWarranty")
+    String sendWarranty(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/join/tmstruckweightresult/linkageDeleteTransportOrder")
+    String linkageDeleteTransportOrder(List<Map<String, Object>> mapList);
+
+}

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -0,0 +1,551 @@
+package com.steerinfo.dil.feign;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/28 13:28
+ */
+
+@FeignClient(value = "DAL-OMS-API-DEV", url = "${openfeign.OMSFeign.url}")
+public interface OmsFeign {
+
+     /*
+    OmstruckOrderController
+     */
+
+    @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrder")
+    public Map<String, Object> getAllTruckOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("orderStatus") Integer orderStatus,
+                                          @RequestParam("planId") Integer planId,
+                                          @RequestParam("orderType") Integer orderType,
+                                          @RequestParam("fuelOrder") Integer fuelOrder,
+                                          @RequestParam("carrierSSOId")String carrierSSOId,
+                                          @RequestParam("con")String con,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
+
+    @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrderReturnListMap")
+    public Map<String, Object> getAllTruckOrderReturnListMap(
+            @RequestParam("orderStatus") Integer orderStatus,
+            @RequestParam("planId") Integer planId,
+            @RequestParam("orderType") Integer orderType);
+
+    @PostMapping("api/v1/oms/omstruckorders/getAllCapacity")
+    public Map<String, Object> getAllCapacity(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("carrierId") Integer carrierId);
+
+    @PostMapping("api/v1/oms/omstruckorders/addPurOrder")
+    public Map<String, Object> addPurOrder(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/oms/omstruckorders/updateOrder")
+    public Map<String, Object> updateOrder(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/oms/omstruckorders/dispatchOrder")
+    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/oms/omstruckorders/deleteOrder")
+    public Map<String, Object> deleteOrder(@RequestBody(required = false) Map<String, Object> map,
+                                     @RequestParam("planId") Integer planId);
+
+    @PostMapping("api/v1/oms/omstruckorders/driverReceiveOrRefuse")
+    public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/oms/omstruckorders/undoOrder")
+    Map<String, Object> undoOrder(@RequestBody Map<String, Object> map);
+
+
+
+    @PostMapping("api/v1/oms/omstruckorders/getReceiveRefuseOrder/{orderReceiveStatus}")
+    public Map<String, Object> getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
+                                               @RequestParam("orderType") Integer orderType,
+                                               @RequestParam("orderStatus") Integer orderStatus,
+                                                     @RequestParam("con")String con);
+
+    @PostMapping("api/v1/oms/omstruckorders/sendMesToDriver")
+    public Map<String, Object> sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber,
+                                         @RequestParam("orderStatus") Integer orderStatus);
+
+
+    @PostMapping("api/v1/oms/omstruckorders/getRefuseOrderByCapacityNum")
+    public Map<String, Object> sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber);
+
+
+    @PostMapping("api/v1/oms/omstruckorders/getOrderMesByOrderNum/{orderId}")
+    public Map<String, Object> getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId);
+
+    @PostMapping("api/v1/oms/omstruckorders/selectPlaceAndTime/{orderId}")
+    public Map<String, Object> selectPlaceAndTime(@PathVariable("orderId") Integer orderId);
+
+    @PostMapping("api/v1/oms/omstruckorders/selectOrderByOrderId/{orderId}")
+    public Map<String, Object> selectOrderByOrderId(@PathVariable("orderId") Integer orderId);
+
+    @PostMapping("api/v1/oms/omstruckorders/getTransportDispatch")
+    public Map<String, Object> getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("orderType") Integer orderType,
+                                              @RequestParam("orderStatus") Integer orderStatus,
+                                              @RequestParam("fuelOrder") Integer fuelOrder,
+                                              @RequestParam("carrierSSOId") String carrierSSOId,
+                                              @RequestParam("con")      String con,
+                                                    @RequestParam("startTime") String startTime,
+                                                    @RequestParam("endTime")String endTime);
+    /**
+     * 展示承运商接收销售公司已接受的销售订单
+     * @param carrierId
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "api/v1/oms/omstruckorders/getSaleOrderForCarrierList/{carrierId}",method = RequestMethod.POST)
+    Map<String,Object> getSaleOrderForCarrierList(@RequestBody(required = false)Map<String,Object> map,
+                                                  @PathVariable("carrierId") Integer carrierId,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam String con
+                                                  );
+
+
+    /**
+     * 销售物流司机接收新的订单
+     */
+    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale")
+    Map<String,Object> getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer orderType,
+                                            @RequestParam Integer orderStatus,
+                                            @RequestParam String con,
+                                            @RequestParam String carrierSsoId,
+                                            @RequestParam Integer shipperId
+    );
+
+
+    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale1")
+    Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestParam("orderStatus")Integer orderStatus,
+                                            @RequestParam("con")        String con,
+                                            @RequestParam("numberPlate")  String numberPlate,
+                                            @RequestParam("saleOrderId") Integer saleOrderId
+    );
+
+    /**
+     * 销售司机派单
+     */
+
+    @PostMapping("api/v1/oms/omstruckorders/dispatchOrderForSale")
+    Map<String, Object> dispatchOrderForSale(@RequestBody(required = false) Map<String, Object> map);
+
+
+
+
+
+    /**
+     * 查询所有已经接收的焦炭发运日计划
+     * @param carrierId
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "api/v1/oms/omstruckorders/getCokeDayPlanAndRecivedList/{carrierId}",method = RequestMethod.POST)
+    Map<String,Object> getCokeDayPlanAndRecivedList(@RequestBody(required = false)Map<String,Object> map,
+                                                    @PathVariable("carrierId") Integer carrierId,
+                                                    @RequestParam Integer apiId,
+                                                    @RequestParam Integer pageNum,
+                                                    @RequestParam Integer pageSize);
+    /**
+     *查询所有已经接收的水渣发运日计划
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "api/v1/oms/omstruckorders/getWaterSlagDayPlanAndRecivedList/{carrierId}")
+    Map<String,Object> getWaterSlagDayPlanAndRecivedList(@RequestBody(required = false)Map<String,Object> map,
+                                                         @PathVariable("carrierId") Integer carrierId,
+                                                         @RequestParam Integer apiId,
+                                                         @RequestParam Integer pageNum,
+                                                         @RequestParam Integer pageSize);
+    //查询空闲运力信息
+    @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityForLeisure/{carrierId}")
+    Map<String,Object> getCapacityForLeisure(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @PathVariable("carrierId")Integer carrierId);
+
+    //通过物资id查询批次表匹配最新的批次，关联最新的采购订单号
+    @PostMapping("api/v1/oms/omstruckorders/selectNewOrderId")
+    Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map);
+
+
+    @PostMapping(value = "api/v1/oms/omstruckorders/selectAllOrderForSale/{carrierId}")
+    Map<String, Object> selectAllOrderForSale(
+                                                   @RequestBody(required = false) Map<String,Object> mapValue,
+                                                   @PathVariable Integer carrierId,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("orderType") Integer orderType,
+                                                   @RequestParam("orderStatus") Integer orderStatus,
+                                                   @RequestParam("saleOrderMaterialId") Integer saleOrderMaterialId,
+                                                   @RequestParam("con") String  con
+    );
+
+
+    //展示已经形成虚拟订单的焦炭发运计划
+    @PostMapping(value = "api/v1/oms/omstruckorders/getCokeRailDayPlanForGenOrder/{carrierId}")
+   Map<String,Object>  getCokeRailDayPlanForGenOrder(@RequestBody(required = false)Map<String,Object> map,
+                                                     @PathVariable("carrierId")  Integer carrierId,
+                                                     @RequestParam ("pageNum")   Integer pageNum,
+                                                     @RequestParam ("pageSize")  Integer pageSize,
+                                                     @RequestParam("apiId")      Integer apiId,
+                                                     @RequestParam("dayPlanId")  Integer dayPlanId,
+                                                     @RequestParam("orderStatus")Integer orderStatus,
+                                                     @RequestParam("orderType") Integer orderType,
+                                                     @RequestParam("con")  String con
+    );
+    @PostMapping(value = "api/v1/oms/omstruckorders/getWaterslagDayPlanForGenOrder/{carrierId}")
+    Map<String,Object>  getWaterslagDayPlanForGenOrder(@RequestBody(required = false)Map<String,Object> map,
+                                                      @PathVariable("carrierId") Integer carrierId,
+                                                      @RequestParam("pageNum") Integer pageNum,
+                                                      @RequestParam("pageSize") Integer pageSize,
+                                                      @RequestParam("apiId") Integer apiId,
+                                                      @RequestParam("dayPlanId") Integer dayPlanId,
+                                                      @RequestParam("orderType")Integer orderType,
+                                                      @RequestParam("orderStatus") Integer orderStatus,
+                                                      @RequestParam("con") String con
+    );
+
+    @PostMapping("api/v1/oms/omstruckorders/selectSteelSaleForCarrier/{carrierId}")
+    public Map<String,Object> selectSteelSaleForCarrier(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @PathVariable Integer carrierId
+    );
+
+    @PostMapping("api/v1/oms/omstruckorders/selectInfoBySaleOrderId/{saleOrderId}")
+    public Map<String,Object> selectInfoBySaleOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @PathVariable Integer saleOrderId
+
+
+    )  ;
+    @PostMapping("api/v1/oms/omstruckorders/selectCokeRailPlan/{carrierId}")
+     Map<String,Object> selectCokeRailPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                       @PathVariable Integer carrierId,
+                                      @RequestParam  Integer orderType
+
+    );
+    @PostMapping("api/v1/oms/omstruckorders/selectInfoByDayPlanId/{dayPlanId}")
+     Map<String,Object> selectInfoByDayPlanId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                               @PathVariable  Integer dayPlanId,
+                                               @RequestParam Integer orderType
+
+
+    );
+
+    @ApiOperation(value="车牌号下拉")
+    @GetMapping(value = "api/v1/oms/omstruckorders/getDriverCapacity")
+    Map<String, Object> getDriverCapacity();
+
+    @ApiOperation(value="派单信息")
+    @PostMapping(value = "api/v1/oms/omstruckorders/getTruckNoDispatchMap")
+    Map<String, Object> getTruckNoDispatchMap(@RequestParam Integer dispatchId);
+
+    @ApiOperation(value="承运商分派运输订单给司机")
+    @PostMapping(value = "api/v1/oms/omstruckorders/addAppTruckOrder")
+    Map<String, Object> addAppTruckOrder(@RequestParam Integer dispatchId,
+                                         @RequestParam Integer orderType,
+                                         @RequestParam String capacityNumber,
+                                         @RequestParam Integer carrierId);
+
+    @ApiOperation(value="根据运单id关闭订单")
+    @PostMapping(value = "api/v1/oms/omstruckorders/closeOmstruckOrder")
+    Map<String, Object> closeOmstruckOrder(@RequestBody Map<String,Object> map);
+
+
+    @ApiOperation(value="根据运单id修改运力")
+    @PostMapping(value = "api/v1/oms/omstruckorders/updateCapacityId")
+    Map<String, Object> updateCapacityId(@RequestBody Map<String,Object> map);
+
+
+    @ApiOperation(value="车牌")
+    @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityAndDriverList")
+    Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam String con,
+                                                 @RequestParam String carrierId);
+
+    @GetMapping("api/v1/oms/omstruckorders/getReceivingUnit")
+    public Map<String, Object> getReceivingUnit();
+
+    //查询所有的发货单位
+    @GetMapping("api/v1/oms/omstruckorders/getSupplier")
+    public Map<String, Object> getSupplier();
+
+    @PostMapping("api/v1/oms/omstruckorders/CloseOrder")
+    Map<String,Object> CloseOrder(@RequestBody(required = false)Map<String,Object> map);
+
+    // 分解内转计划
+    @PostMapping("api/v1/oms/omstruckorders/addInwardOrder")
+    Map<String, Object> addInwardOrder(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    // 分解计划查询
+    @PostMapping("api/v1/oms/omstruckorders/getInwardOrderList")
+    Map<String, Object> getInwardOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer orderStatus,
+                                           @RequestParam String carrierId,
+                                           @RequestParam String con,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
+
+    // 分派计划
+    @PostMapping("api/v1/oms/omstruckorders/apportionInwardOrder")
+    Map<String, Object> apportionInwardOrder(@RequestBody List<Map<String, Object>> mapList);
+
+    // 司机APP端查询下发给自己运输订单
+    @PostMapping("api/v1/oms/omstruckorders/sendOrderToApp")
+    List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber);
+
+    //分解异地库计划
+    @PostMapping("api/v1/oms/omstruckorders/apportionInwardOffsetOrder")
+    Map<String, Object> apportionInwardOffsetOrder(@RequestBody Map<String, Object> mapvalue);
+
+    @ApiOperation(value = "查询司机的所有运输订单信息")
+    @PostMapping("api/v1/oms/omstruckorders/getAllOrderMessage")
+    List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber);
+    @PostMapping("api/v1/oms/omstruckorders/driverConfirmation")
+    Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @PostMapping("api/v1/oms/omstruckorders/getMessageToApp")
+    Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) ;
+
+    @PostMapping("api/v1/oms/omstruckorders/getAllOrderMessagesByCapacityNum")
+    List<Map<String, Object>> getAllOrderMessagesByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @PostMapping("api/v1/oms/omstruckorders/getReceiveOrderIdListByCapacityNum")
+    List<Integer> getReceiveOrderIdListByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("api/v1/oms/omstruckorders/getAllRefuseOrderNumberByCapacity")
+    List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @ApiOperation(value = "添加退货实绩关闭当前订单")
+    @PostMapping("api/v1/oms/omstruckorderseparates/returnOrderCloseOrder")
+    Map<String, Object> returnOrderCloseOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value = "根据运单id查询实绩位置")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getOrderResult")
+    List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map);
+
+    @ApiOperation(value = "根据运单id查询实绩位置")
+    @PostMapping("api/v1/oms/omstruckorders/addInputOrder")
+    Map<String, Object> addInputOrder(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getOthersOrderMesToSend")
+    Map<String, Object> getOthersOrderMesToSend(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("orderStatus") Integer orderStatus,
+                                                       @RequestParam("carrierId") String carrierId,
+                                                       @RequestParam("type") Integer type,
+                                                       @RequestParam("con") String con,
+                                                       @RequestParam("userId") String userId,
+                                                       @RequestParam("usersId") String usersId,
+                                                       @RequestParam("type1")Integer type1,
+                                                @RequestParam("startTime")String  startTime,
+                                                @RequestParam("endTime") String endTime
+                                                       );
+
+    @ApiOperation(value = "根据运输订单id修改运力id")
+    @PostMapping("api/v1/oms/omstruckorderseparates/updateOmstruckOrder")
+    Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map);
+
+    @ApiOperation(value = "承运商销售分派运输订单给司机")
+    @PostMapping("api/v1/oms/omstruckorderseparates/addSaleTruckOrder")
+    Map<String, Object> addSaleTruckOrder(@RequestBody Map<String, Object> mapValue);
+
+    @ApiOperation(value = "根据运输订单号查询物资")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderMaterial")
+    Map<String, Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String, Object> map);
+
+    @ApiOperation(value = "根据运输订单号查询卸货点")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderWarehouseName")
+    Map<String, Object> getUnloadOrderWarehouseName(@RequestBody(required = false)Map<String, Object> map);
+
+    @ApiOperation(value = "根据运输订单id查询物资")
+    @PostMapping("api/v1/oms/omstruckorders/getOrderMaterialList")
+    Map<String, Object> getOrderMaterialList(@RequestParam Integer orderId);
+
+    @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityAllOrder")
+    Map<String, Object> getCapacityAllOrder(@RequestParam String capacityNumber,@RequestParam  String date);
+
+    @ApiOperation(value = "该车牌号下的所有物资的综合")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getMatrialWeight")
+    Map<String, Object> getMatrialWeight(@RequestParam String capacityNumber,@RequestParam  String date);
+
+    @ApiOperation(value = "根据运单id关闭运输订单")
+    @PostMapping("api/v1/oms/omstruckorderseparates/closeOrder")
+    Map<String, Object> closeOrder(@RequestParam Integer orderId);
+
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("api/v1/oms/omstruckorders/getDriverConfirmation")
+    Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map);
+
+    @ApiOperation(value = "一键删除多个订单")
+    @PostMapping("api/v1/oms/omstruckorderseparates/deleteOrders")
+    Map<String, Object> deleteOrders(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("api/v1/oms/omstruckorders/addPurInwardOrder")
+    Map<String, Object> addPurInwardOrder(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    //采购内转运输订单
+    @PostMapping("api/v1/oms/omstruckorders/getPurInwardOrderList")
+    Map<String, Object> getPurInwardOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer orderStatus,
+                                           @RequestParam String carrierId,
+                                           @RequestParam String con,
+                                              @RequestParam Integer planEnableStatus,
+                                              @RequestParam String userId);
+
+
+    @ApiOperation(value = "装卸工查询自己所有装了货的订单信息")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getAllLoadUnloadResult")
+    Map<String, Object> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @ApiOperation(value = "撤销已拒绝")
+    @PostMapping("api/v1/oms/omstruckorders/refuseCtrlZ")
+    Map<String, Object> refuseCtrlZ(Map<String, Object> map);
+
+    @ApiOperation(value = "批量关闭运输订单")
+    @PostMapping("api/v1/oms/omstruckorderseparates/batchCloseOrder")
+    Map<String, Object> batchCloseOrder(@RequestBody List<Map<String, Object>> mapList);
+    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getOrderMaterial/{orderId}")
+    Map<String, Object> getOrderMaterial(@PathVariable Integer orderId);
+
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getAllResultLineMes")
+    Map<String, Object> getAllResultLineMes(@RequestParam("orderId") Integer orderId, @RequestParam("orderNumber") String orderNumber);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
+    Map<String, Object> closeInwardOrder(@RequestParam("orderId") Integer orderId);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeOrderResult")
+    Map<String, Object> getTimeOrderResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeTaskEnd")
+
+
+    Map<String, Object> getTimeTaskEnd(@RequestBody Map<String, Object> mapValue);
+    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeTaskEndDetail")
+    Map<String, Object> getTimeTaskEndDetail(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getPauseTimeTaskDetail")
+    Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId);
+
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getLoadForLoadCarResult")
+    Map<String,Object> getLoadForLoadCarResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityTypeByUserId")
+    Map<String,Object> getCapacityTypeByUserId(Map<String, Object> map);
+
+
+    @GetMapping("api/v1/oms/omstruckmatetialorders/getSteelOrderNum")
+    public Map<String, Object> getSteelOrderNum(@RequestParam("capacityId") String capacityId);
+
+    @GetMapping("api/v1/oms/omstruckmatetialorders/getMesToSteelDepartment")
+    public Map<String, Object> getMesToSteelDepartment(@RequestParam("orderId")Integer orderId);
+
+    @PostMapping("api/v1/oms/omstruckmatetialorders/updateMaterialMes")
+    public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/oms/omstruckmatetialorders/updateContinueStaus")
+    public Map<String, Object> updateContinueStaus(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/oms/omstruckorders/getDriverInfoForSale2")
+    Map<String, Object> getDriverInfoForSale2(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam BigDecimal saleOrderId,
+                                              @RequestParam String con);
+
+    @PostMapping("api/v1/oms/omstruckorders/getTransportOrder")
+    Map<String, Object> getTransportOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("orderId") Integer orderId,
+                                          @RequestParam("orderStatus") Integer orderStatus);
+
+    @PostMapping("api/v1/oms/omstruckorders/canCapacityEnfactory")
+    Map<String, Object> canCapacityEnfactory(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/oms/omstruckorders/getWarehouseMes")
+    Map<String, Object> getWarehouseMes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam(required = false) String startTime,
+                                        @RequestParam(required = false) String endTime,
+                                        @RequestParam(required = false) String con);
+
+    @PostMapping("api/v1/oms/omstruckorders/closeInwardOrderByPlan")
+    Map<String, Object> closeInwardOrderByPlan(@RequestParam Integer planId);
+
+    @GetMapping("api/v1/oms/omstrainorders/getOrderTrainMes")
+    Map<String, Object> getOrderTrainMes(@RequestParam Integer orderId);
+
+    @PostMapping("/api/v1/oms/omstrainorders/getWagonShippingDetails")
+    Map<String, Object> getWagonShippingDetails(@RequestBody(required = false)  Map<String, Object> map,
+                                                @RequestParam(required = false) String startTime,
+                                                @RequestParam(required = false) String endTime,
+                                                @RequestParam(required = false) String sendStation,
+                                                @RequestParam(required = false) String toTheStation,
+                                                @RequestParam(required = false) String consigneeName,
+                                                @RequestParam(required = false) String wagonNo);
+}
+

src/main/java/com/steerinfo/dil/feign/OtmsFeign.java

@@ -0,0 +1,178 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@FeignClient(value = "DAL-OTMS-API-DEV", url = "${openfeign.OTMSFeign.url}")
+public interface OtmsFeign {
+    //在途订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/getInTransitTransportation")
+    public RESTfulResult getInTransitTransportation(@RequestBody Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
+
+    //在途订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/transportationPerformance")
+    public RESTfulResult transportationPerformance(@RequestBody Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
+    //已完成订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/getFinishTruckOrderInfo")
+    public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
+                                                 @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                 @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
+                                                 @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
+    );
+    //有异常订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/getHaveAbnormalTruckOrderInfo")
+    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
+                                                       @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                       @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                       @RequestParam(required = false,name = "pageSize")Integer pageSize);
+    //车牌号和时间查询路径
+    @PostMapping("/api/v1/otms/pathDisplay/fullPathVisualizationByCarNumber")
+    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue);
+
+    //改变当前报警类型
+    @PostMapping(value = "/api/v1/otms/pathDisplay/inTransitWarn")
+    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio);
+
+
+    //查询当前报警类型
+    @PostMapping(value = "/api/v1/otms/pathDisplay/selectWarnSwitch")
+    public RESTfulResult selectWarnSwitch();
+
+    //通过运输订单号查询全路径
+    @PostMapping("/api/v1/otms/pathDisplay/fullPath")
+    public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception;
+
+    //获得抵达列表
+//    @PostMapping("/api/v1/otms/tmstruckarrivalresults/getArrivalResultInfo")
+//    Map<String, Object> getArrivalResultInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+//                                         @RequestParam Integer apiId,
+//                                         @RequestParam Integer pageNum,
+//                                         @RequestParam Integer pageSize,
+//                                         @RequestParam String con,
+//                                         @RequestParam String startTime,
+//                                         @RequestParam String endTime
+//    );
+
+    //通过运输订单号获得抵达图片
+    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getArrivalPhoto")
+    String getReceiptPhoto(@RequestParam String orderNumber);
+
+    //获取收货作业照片
+    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getReceivingPhotoByUrl")
+    public String getReceivingPhotoByUrl(@RequestParam String orderNumber);
+
+    //获得抵达实集
+    @PostMapping(value = "/api/v1/otms/tmstruckarrivalresults/addtmstruckArrivalResult")
+    public RESTfulResult addtmstruckArrivalResult(@RequestBody Map<String,Object>  map ,@RequestParam("orderNumber")String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestParam("file") String file);
+
+    //添加签收图片
+    @PostMapping(value = "/api/v1/otms/pathDisplay/addTmstruckReceiptResult")
+    public  RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object>  mapValaue  , @RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress);
+
+    //获得异常信息
+    @PostMapping("/api/v1/otms/pathDisplay/getTransportAbnormalInfo")
+    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
+                                                  @RequestParam(name = "pageNum") Integer pageNum,
+                                                  @RequestParam(name = "pageSize") Integer pageSize);
+
+    //抵达信息列表
+    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getArrivalResult")
+    Map<String, Object> getArrivalResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam String con,
+                                         @RequestParam String startTime,
+                                         @RequestParam String endTime);
+
+    //获得抵达图片
+    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getArrivalPhoto")
+    String getArrivalPhoto(@RequestParam String orderNumber);
+
+    //获得签收实绩
+    @PostMapping("/api/v1/otms/pathDisplay/getReceiptResult")
+    Map<String, Object> getReceiptResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam String con,
+                                         @RequestParam String startTime,
+                                         @RequestParam String endTime
+    );
+    @GetMapping("/api/v1/otms/pathDisplay/getCurrentLocation")
+    public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception;
+
+    //获取地图顶点
+    @GetMapping(value = "/api/v1/otms/mapvertexs/findAllAvailableVertex")
+    public RESTfulResult findAllAvailableVertex();
+
+    //获取最佳路径
+    @GetMapping(value = "/api/v1/otms/mapvertexs/getObtainTheOptimalPath")
+    public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) throws Exception;
+
+    //获取当前订单导航路径
+    @GetMapping(value = "/api/v1/otms/mapvertexs/getPathByOrderID")
+    public RESTfulResult getPathByOrderID(@RequestParam("orderId") String orderId,@RequestParam("startStep")  String startStep,@RequestParam("endStep")  String endStep) throws Exception;
+
+    //获取导航可选地点
+    @GetMapping(value = "/api/v1/otms/mapvertexs/findSelections")
+    public RESTfulResult findSelections();
+
+    @PostMapping("/api/v1/otms/mapvertexs/getMapVertex")
+    public RESTfulResult getMapVertex(@RequestBody Map<String,Object> map,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize);
+
+    @PostMapping("/api/v1/otms/mapvertexs/getMapEdge")
+    public RESTfulResult getMapEdge(@RequestBody Map<String,Object> map,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
+
+    @PostMapping("/api/v1/otms/mapvertexs/addMapVertex")
+    public RESTfulResult addMapVertex(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/otms/mapvertexs/addMapEdge")
+    public RESTfulResult addMapEdge(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/otms/mapvertexs/delMapVertex")
+    public RESTfulResult delMapVertex(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/otms/mapvertexs/delMapEdge")
+    public RESTfulResult delMapEdge(@RequestBody Map<String,Object> map);
+
+
+    @PostMapping("/api/v1/otms/pathDisplay/offLineWarn")
+    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
+
+    @PostMapping("/api/v1/otms/pathDisplay/parkWarn")
+    public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception;
+
+    @PostMapping("/api/v1/otms/pathDisplay/abnormalLineWarn")
+    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
+
+    //查询地址经纬度
+    @GetMapping("/api/v1/otms/pathDisplay/getLocationForAddress")
+    public RESTfulResult getLocationForAddress(@RequestParam("address") String address);
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-10-19
+     * @Description:逆地址解析
+     */
+    @PostMapping("/api/v1/otms/Test/getAddress")
+    public RESTfulResult getAddress(@RequestBody Map<String,Object> map);
+
+}

src/main/java/com/steerinfo/dil/feign/QmsFeign.java

@@ -0,0 +1,234 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/1 17:19
+ */
+
+@FeignClient(name = "dil-trick-queue-dev", url = "${openfeign.QmsTruckFeign.url}")
+public interface QmsFeign {
+
+    @RequestMapping(value = "/api/v1/queueTruck/qmsqueuegrids/getStackingId",method = RequestMethod.POST)
+    Map<String,Object> getStackingId(@RequestParam BigDecimal warehouseId,
+                                     @RequestParam int size);
+
+    /*
+    QmsQueueResultController /  QmsQueueListController
+     */
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
+     Map<String, Object> addQueueResult( @RequestParam("vno")String vno);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
+     Map<String, Object> addQueueList(@RequestParam("resultId")String resultId);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
+     Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("queueType") Integer queueType,
+                                            @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueApply")
+     Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueListByQueueUp")
+     Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     @RequestParam("apiId") Integer apiId,
+                                                     @RequestParam("pageNum") Integer pageNum,
+                                                     @RequestParam("pageSize") Integer pageSize,
+                                                     @RequestParam("locationId") Integer locationId,
+                                                     @RequestParam("capacityNumber")String capacityNumber,
+                                                     @RequestParam("isSpelling")Integer isSpelling
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getChangeQueue")
+     Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+    );
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCancel")
+     Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancel")
+     Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateQueueCancel")
+     Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCutInLine")
+     Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueInsert")
+     Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueEndByPDA")
+    Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueEndResult")
+     Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 @RequestParam("apiId") Integer apiId,
+                                                 @RequestParam("pageNum") Integer pageNum,
+                                                 @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/listMonitor")
+     Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("isSpelling")Integer isSpelling
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getOrderReceive/{capacityNumber}")
+     Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/cancelQueue")
+     Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/allowEnFactory")
+    Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/modifyLoadWarehouse")
+    Map<String, Object> modifyLoadWarehouse(@RequestBody(required=false) Map<String, Object> mapValue);
+
+    @GetMapping("api/v1/queueTruck/qmsqueueresults/getQueueResultByTotalId")
+    Map<String, Object> getQueueResultByTotalId(@RequestParam("resultTotalId") String resultTotalId);
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListMonitorMes")
+    Map<String, Object> getListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/getSpellingListMonitorMes")
+    Map<String, Object> getSpellingListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/isInCircle")
+    Map<String, Object> isInCircle(@RequestParam String longitude,
+                                   @RequestParam String latitude,
+                                   @RequestParam String capacityNo);
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/ctrlZQueueAllow")
+    Map<String, Object> ctrlZQueueAllow(Map<String, Object> map);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getStoreQueueList")
+    Map<String, Object> getStoreQueueList();
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
+//     Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                              @RequestParam("apiId") Integer apiId,
+//                                              @RequestParam("pageNum") Integer pageNum,
+//                                              @RequestParam("pageSize") Integer pageSize,
+//                                              @RequestParam("gatepostId") Integer gatepostId,
+//                                              @RequestParam("con")String con
+//    );
+
+    
+//    @PostMapping("api/v1/queueTruck/qmsqueuelists/changeQueue")
+//     Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue);
+//
+    
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancelByResultId/{resultId}")
+//     Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId);
+
+    
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/capacityMonitor")
+//     Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                               @RequestParam("apiId") Integer apiId,
+//                                               @RequestParam("pageNum") Integer pageNum,
+//                                               @RequestParam("pageSize") Integer pageSize,
+//                                               @RequestParam("gridType") Integer gridType,
+//                                               @RequestParam("con")String con
+//    );
+    
+
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueStatusList")
+//     Map<String, Object> getQueueStatusList();
+
+
+    
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllExecutionOrder")
+//     Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                    @RequestParam("apiId") Integer apiId,
+//                                                    @RequestParam("pageNum") Integer pageNum,
+//                                                    @RequestParam("pageSize") Integer pageSize,
+//                                                    @RequestParam("orderType")Integer orderType,
+//                                                    @RequestParam("status")Integer status,
+//                                                    @RequestParam("con")String con
+//    );
+
+
+//
+//    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListQueueMes")
+//    RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueChange")
+//    Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                @RequestParam("apiId") Integer apiId,
+//                                                @RequestParam("pageNum") Integer pageNum,
+//                                                @RequestParam("pageSize") Integer pageSize,
+//                                                @RequestParam("con")String con
+//    );
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueEndMes")
+//    Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                @RequestParam("apiId") Integer apiId,
+//                                                @RequestParam("pageNum") Integer pageNum,
+//                                                @RequestParam("pageSize") Integer pageSize,
+//                                                @RequestParam("con")String con
+//    );
+    @GetMapping("api/v1/queueTruck/qmsqueueresults/getAllModel")
+    Map<String, Object> getAllModel(@RequestParam String index);
+
+    @GetMapping("api/v1/queueTruck/qmsqueueresults/getAllModelUnrolled")
+    Map<String, Object> getAllModelUnrolled(@RequestParam String index);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/addModel")
+    Map<String, Object> addModel(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateModel")
+    Map<String, Object> updateModel(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/deleteModel")
+    Map<String, Object> deleteModel(@RequestBody(required=false) Map<String,Object> mapValue);
+}

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -0,0 +1,733 @@
+package com.steerinfo.dil.feign;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+@FeignClient(value = "DIL-RMS-API-DEV", url = "${openfeign.RmsFeign.url}")
+public interface RmsFeign {
+    /**
+     * @author huk
+     * @return
+     */
+    //新增作业环节
+    @ApiOperation(value="新增作业环节")
+    @PostMapping("api/v1/rms/rmslinks/LinkInsertSelective")
+    Map<String,Object> LinkInsertSelective(@RequestBody(required = false) Map<String,Object> mapValue);
+
+    /**
+     * @author huk
+     * @return
+     */
+    @PostMapping("/api/v1/rms/rmslinks/getLink")
+    Map<String, Object> getlink();
+
+    /**
+     * @author huk
+     * @return
+     */
+    //新增运输路线
+    @ApiOperation(value="新增运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
+    })
+    @PostMapping("/api/v1/rms/rmslines/insertSelective")
+    Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @PostMapping(value = "/api/v1/rms/rmslines/getAllLineDesk")
+    Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize")Integer pageSize,
+                                        @RequestParam("apiId")Integer apiId,
+                                        @RequestParam("lineType")Integer lineType,
+                                        @RequestParam("con")String con);
+
+    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
+    @PostMapping("/api/v1/rms/rmslines/getGateCalculateMes")
+    Map<String, Object> getGateCalculateMes(@RequestParam("lineId")Integer lineId);
+
+    @ApiOperation(value = "根据主键查询出数据以供修改")
+    @PostMapping("/api/v1/rms/rmslines/getLinkToUpdate")
+    Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId);
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据")
+    @PostMapping("/api/v1/rms/rmslines/updateByPrimaryKeySelective")
+    Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
+    @PostMapping("/api/v1/rms/rmslines/updateRmsLine")
+    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
+    @PostMapping("/api/v1/rms/rmslines/getCountNumber")
+    Map<String, Object> getCountNumber(@RequestParam Integer lineId);
+
+    //********************************************************************************************************
+
+
+    //新增司机信息
+    @PostMapping(value = "api/v1/rms/rmscardriver/insertCarDriver")
+    Map<String, Object> insertCarDriver(@RequestBody(required = false) Map<String, Object> map);
+
+    //修改司机信息
+    @PostMapping(value = "api/v1/rms/rmscardriver/updateCarDriver")
+    Map<String, Object> updateCarDriver(Map<String, Object> map);
+    //通过id查询司机信息
+    @PostMapping(value = "api/v1/rms/rmscardriver/getCarDriverById/{id}")
+    Map<String, Object> getCarDriverById(@PathVariable("id") BigDecimal id);
+    //删除司机信息
+    @PostMapping(value = "api/v1/rms/rmscardriver/deleteCarDriver/{id}")
+    Map<String, Object> deleteCarDriver(@PathVariable("id") BigDecimal id);
+    //模糊查询司机
+    @PostMapping(value = "/api/v1/rms/rmscardriver/getCarDriverList")
+    Map<String, Object> getCarDriverList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("con") String con);
+
+
+    //获取承运商列表
+    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierList")
+    Map<String,Object>     getCarrierList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam String con);
+
+    //新增承运商
+    @PostMapping(value = "api/v1/rms/rmscarrier/insertCarrier")
+    Map<String,Object> insertCarrier(@RequestBody(required = false) Map<String,Object> map);
+    //删除承运商
+    @PostMapping(value = "api/v1/rms/rmscarrier/deleteCarrier/{id}")
+    Map<String, Object> deleteCarrier(@PathVariable("id") BigDecimal id);
+    //    处理承运商照片
+    @PostMapping(value = "api/v1/rms/rmscarrier/uploadCarrier1" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    String uploadCarrier1(@RequestPart("file") MultipartFile multipartFile);
+    //    处理承运商照片
+    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier2")
+    int uploadCarrier2(@RequestParam("file")MultipartFile multipartFile);
+    //    处理承运商照片
+    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier3")
+    int uploadCarrier3(@RequestPart("file") MultipartFile multipartFile);
+    //    更新承运商信息
+    @PostMapping(value = "api/v1/rms/rmscarrier/updateCarrier")
+    Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取承运商信息
+    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierById/{id}")
+    Map<String, Object> getCarrierById(@PathVariable("id") BigDecimal id);
+//    展示中标区域
+    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierBidAreaList")
+    Map<String, Object> getCarrierBidAreaList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam String con);
+
+    //获取物资列表
+    @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialList")
+    Map<String,Object> getMaterialList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam String con);
+
+
+    //新增物资
+    @PostMapping(value = "api/v1/rms/rmsmaterial/insertMaterial")
+    Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map);
+    //删除物资
+    @PostMapping(value = "api/v1/rms/rmsmaterial/deleteMaterial/{id}")
+    Map<String, Object> deleteMaterial(@PathVariable("id") BigDecimal id);
+    //    更新物资信息
+    @PostMapping(value = "api/v1/rms/rmsmaterial/updateMaterial")
+    Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取物资信息
+    @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialById/{id}")
+    Map<String, Object> getMaterialById(@PathVariable("id") BigDecimal id);
+
+
+    @PostMapping(value = "api/v1/rms/rmspersonnel/insertPersonnel")
+    Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map);
+    //删除人员信息
+    @PostMapping(value = "api/v1/rms/rmspersonnel/deletePersonnel/{id}")
+    Map<String, Object> deletePersonnel(@PathVariable("id") BigDecimal id);
+    //    更新人员信息
+    @PostMapping(value = "api/v1/rms/rmspersonnel/updatePersonnel")
+    Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取人员信息
+    @PostMapping(value = "api/v1/rms/rmspersonnel/getPersonnelById/{personnelId}")
+    Map<String, Object> getPersonnelById(@PathVariable("personnelId") BigDecimal personnelId);
+    //    模糊查询人员信息
+    @PostMapping(value = "/api/v1/rms/rmspersonnel/getPersonnelList")
+    Map<String, Object> getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                         @RequestParam("apiId")Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("con") String con);
+
+
+    //获得托运人列表
+    @PostMapping(value = "api/v1/rms/rmsshipper/getShipperList")
+    Map<String,Object>   getShipperList (@RequestBody(required = false) Map<String,Object> mapValue,
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam String con);
+    //新增托运人信息
+    @PostMapping(value = "api/v1/rms/rmsshipper/insertShipper")
+    Map<String, Object> insertShipper(@RequestBody(required = false) Map<String, Object> map);
+    //删除托运人
+    @PostMapping(value = "api/v1/rms/rmsshipper/deleteShipper/{id}")
+    Map<String, Object> deleteShipper(@PathVariable("id") BigDecimal id);
+    //修改托运人信息
+    @PostMapping(value = "api/v1/rms/rmsshipper/updateShipper")
+    Map<String, Object> updateShipper(@RequestBody(required = false) Map<String, Object> map);
+    //根据id获取托运人信息
+    @PostMapping(value = "api/v1/rms/rmsshipper/getShipperById/{id}")
+    Map<String, Object> getShipperById(@PathVariable("id") BigDecimal id);
+
+    //展示供应商列表
+    @PostMapping(value = "api/v1/rms/rmssupplier/getSupplierList")
+    Map<String,Object>   getSupplierList (@RequestBody(required = false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("con") String con);
+    //新增供应商信息
+    @PostMapping(value = "api/v1/rms/rmssupplier/insertSupplier")
+    Map<String, Object> insertSupplier(@RequestBody(required = false) Map<String, Object> map);
+    //删除供应商
+    @PostMapping(value = "api/v1/rms/rmssupplier/deleteSupplier/{id}")
+    Map<String, Object> deleteSupplier(@PathVariable("id") BigDecimal id);
+    //    更新供应商信息
+    @PostMapping(value = "api/v1/rms/rmssupplier/updateSupplier")
+    Map<String, Object> updateSupplier(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取供应商信息
+    @PostMapping(value = "api/v1/rms/rmssupplier/getSupplierById/{id}")
+    Map<String, Object> getSupplierById(@PathVariable("id") BigDecimal id);
+
+    //新增运力
+    @PostMapping(value = "api/v1/rms/rmscapacity/insertCapacity")
+    Map<String, Object> insertCapacity(@RequestBody(required = false) Map<String, Object> map);
+    //删除运力
+    @PostMapping(value = "api/v1/rms/rmscapacity/deleteCapacity/{id}")
+    Map<String, Object> deleteCapacity(@PathVariable("id") BigDecimal id);
+    //修改运力
+    @PostMapping(value = "api/v1/rms/rmscapacity/updateCapacity")
+    Map<String, Object> updateCapacity(Map<String, Object> map);
+
+
+    //模糊查询运力
+    @PostMapping(value = "/api/v1/rms/rmscapacity/getCapacityList")
+    Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam String con,
+                                        @RequestParam String carrierSSOId);
+
+    //根据id获取运力详细信息
+    @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityById/{id}")
+    Map<String,Object> getCapacityById(@PathVariable("id") BigDecimal id);
+
+    //新增汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculate")
+    Map<String, Object> insertTruckCalculate(@RequestBody(required = false) Map<String, Object> map);
+
+    //新增汽车衡下的物资
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculateOfMaterial")
+    Map<String, Object> insertTruckCalculateOfMaterial(@RequestBody(required = false) Map<String, Object> map);
+    //更新汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/updateTruckCalculate")
+    Map<String, Object> updateTruckCalculate(@RequestBody Map<String, Object> map);
+    //根据id查询汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateById/{id}")
+
+    Map<String, Object> getTruckCalculateById(@PathVariable("id") BigDecimal id);
+
+
+    //根据id删除汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculate/{id}")
+    Map<String, Object> deleteTruckCalculate(@PathVariable("id") BigDecimal id);
+
+    //根据id删除汽车衡与物资中间表
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculateMaterial/{id}")
+    Map<String, Object> deleteTruckCalculateMaterial(@PathVariable("id") BigDecimal id);
+    //模糊查询汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateList")
+    Map<String, Object> getTruckCalculateList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam String con);
+    //汽车衡物资展示表
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getCalculateOfMaterialList")
+    Map<String, Object> getCalculateOfMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam BigDecimal truckCalculateId);
+
+    //新增仓库
+    @PostMapping(value = "api/v1/rms/rmswarehouse/insertWarehouse")
+    Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map);
+    //删除仓库
+    @PostMapping(value = "api/v1/rms/rmswarehouse/deleteWarehouse/{id}")
+    Map<String, Object> deleteWarehouse(@PathVariable("id") BigDecimal id);
+    //修改仓库
+    @PostMapping(value="api/v1/rms/rmswarehouse/updateWarehouse")
+    Map<String, Object> updateWarehouse(Map<String, Object> map);
+    //根据id获取原料仓库详细信息
+
+    @PostMapping(value = "api/v1/rms/rmswarehouse/getWarehouseById/{id}")
+    Map<String, Object> getWarehouseById(@PathVariable("id") BigDecimal id);
+
+    //模糊查询原料仓库
+    @PostMapping(value = "api/v1/rms/rmswarehouse/getWarehouseList")
+    Map<String, Object> getWarehouseList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam String con);
+
+    //获取司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverCapacityList")
+    Map<String, Object> getDriverCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize);
+
+    //新增司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/insertDriverCapacity")
+    Map<String, Object> insertDriverCapacity(@RequestBody(required = false) Map<String, Object> map);
+
+    //更新司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/updateDriverCapacity")
+    Map<String, Object> updateDriverCapacity(@RequestBody(required = false) Map<String, Object> map);
+
+    //删除司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/deleteDriverCapacity/{id}")
+    Map<String, Object> deleteDriverCapacity(@PathVariable("id") BigDecimal id);
+
+    //根据id获取司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverCapacityById/{id}")
+    Map<String, Object> getDriverCapacityById(@PathVariable("id") BigDecimal id);
+
+
+    //获取门岗信息列表
+    @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostList")
+    Map<String,Object>     getGatepostList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam String con);
+    //新增门岗
+    @PostMapping(value = "api/v1/rms/rmsgatepost/insertGatepost")
+    Map<String,Object> insertGatepost(@RequestBody(required = false) Map<String,Object> map);
+    //删除门岗
+    @PostMapping(value = "api/v1/rms/rmsgatepost/deleteGatepost/{id}")
+    Map<String, Object> deleteGatepost(@PathVariable("id") BigDecimal id);
+    //    更新门岗信息
+    @PostMapping(value = "api/v1/rms/rmsgatepost/updateGatepost")
+    Map<String, Object> updateGatepost(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取门岗信息
+    @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostById/{id}")
+    Map<String, Object> getGatepostById(@PathVariable("id") BigDecimal id);
+    //    根据id获取门岗规则信息
+    @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostRulesById/{id}")
+    Map<String, Object> getGatepostRulesById(@PathVariable("id") BigDecimal id,@RequestParam("apiId") Integer apiId);
+    //    展示门岗规则信息
+    @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostRulesList")
+    Map<String, Object> getGatepostRulesList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @RequestParam String con);
+
+    //    根据规则Id删除规则
+    @PostMapping(value ="api/v1/rms/rmsgatepost/deleteGatepostRules/{rulesId}")
+    Map<String, Object> deleteGatepostRules(@RequestParam("rulesId") BigDecimal rulesId);
+    //    新增门岗规则
+    @PostMapping(value ="api/v1/rms/rmsgatepost/insertGatepostRule")
+    Map<String, Object> insertGatepostRule(@RequestBody(required = false) Map<String, Object> mapValue);
+    //    根据门岗id获取门岗名
+    @PostMapping(value ="api/v1/rms/rmsgatepost/getGatepostName/{gatepostId}")
+    Map<String,Object> getGatepostName(@PathVariable("gatepostId")BigDecimal gatepostId);
+
+    //获取物资种类
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTypeList")
+    Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String con);
+
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/deleteMaterialForInward")
+    Map<String, Object> deleteMaterialForInward(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/updateMaterialForInward")
+    Map<String, Object> updateMaterialForInward(@RequestBody(required = false) Map<String, Object> mapValue);
+
+
+    //******************************************下拉框*******************************
+    @GetMapping(value = "api/v1/rms/rmscapacity/getCapacityTypeId")
+    Map<String, Object> getCapacityTypeId();
+
+    @GetMapping(value = "api/v1/rms/rmswarehouse/getWarehouseTypeId" )
+    Map<String, Object> getWarehouseTypeId();
+
+    @GetMapping(value= "api/v1/rms/rmswarehouse/getPortId")
+    Map<String, Object> getPortId();
+
+    @GetMapping(value = "api/v1/rms/rmscapacity/getCarrierId")
+    Map<String, Object> getCarrierId();
+
+
+    //******************************************下拉框*******************************
+//    根据id下拉获取运力列表
+    @GetMapping(value = "/api/v1/rms/rmscapacity/getCapacityId")
+    Map<String, Object> getCapacityId();
+    //    根据id下拉框获取原料类型
+    @GetMapping(value = "api/v1/rms/rmsmaterial/getMaterialTypeId")
+    Map<String, Object> getMaterialTypeId();
+    //    根据id下拉框获取计量类型
+    @GetMapping(value = "api/v1/rms/rmsmaterial/getUnitOfMeasureId")
+    Map<String, Object> getUnitOfMeasureId();
+    //    根据id下拉框获取托运人
+    @GetMapping(value = "api/v1/rms/rmspersonnel/getShipperId")
+    Map<String, Object> getShipperId();
+
+    //获取司机下拉框
+    @GetMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverId")
+    Map<String, Object> getDriverId();
+
+    //    根据id下拉框获取门岗规则
+    @GetMapping(value = "api/v1/rms/rmsgatepost/getShipperId")
+    Map<String, Object> getGatepostRulesId();
+
+    //运输类型下拉框
+    @GetMapping(value = "api/v1/rms/rmscardriver/getTransportTypeId")
+    Map<String,Object> getTransportTypeId();
+    //    根据id下拉框获取车辆类型
+    @GetMapping(value = "api/v1/rms/rmsgatepost/getVehicleTypeId")
+    Map<String,Object> getVehicleTypeId();
+
+
+
+    @PostMapping(value = "/api/v1/rms/dilnotices/getNoticeList")
+    Map<String, Object> getNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("con") String con);
+    //新增公告
+    @PostMapping(value = "api/v1/rms/dilnotices/insertNotice")
+    Map<String,Object> insertNotice(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除公告
+    @PostMapping(value = "api/v1/rms/dilnotices/deleteNotice/{id}")
+    Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id);
+
+    //更新公告
+    @PostMapping(value = "api/v1/rms/dilnotices/updateNotice")
+    Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map);
+
+    //根据id获取公告
+    @PostMapping(value = "api/v1/rms/dilnotices/getNoticeById/{id}")
+    Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id);
+
+
+    //油价
+    @PostMapping(value = "/api/v1/rms/rmsoilprice/getOilPriceResultList")
+    Map<String, Object> getOilPriceResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("con") String con);
+    //新增油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/insertOilPrice")
+    Map<String,Object> insertOilPrice(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/deleteOilPrice/{id}")
+    Map<String, Object> deleteOilPrice(@PathVariable("id") BigDecimal id);
+
+    //更新油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/updateOilPrice")
+    Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    //根据id获取油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/getOilPriceById/{id}")
+    Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id);
+
+//******************************************下拉框*******************************
+
+
+    //公告下拉框,须摸清实现原理
+    @GetMapping(value = "api/v1/rms/dilnotices/getNoticeTypeId")
+    Map<String,Object> getNoticeTypeId();
+
+  //展示收货客户信息
+  @PostMapping(value = "/api/v1/rms/rmsconsignee/getConsigneeList")
+  Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("con") String con);
+
+
+    //新增收货客户信息
+    @PostMapping(value = "/api/v1/rms/rmsconsignee/insertConsignee")
+    Map<String, Object> insertConsignee(@RequestBody(required = false) Map<String, Object> map);
+    //删除收货客户信息
+    @PostMapping(value = "/api/v1/rms/rmsconsignee/deleteConsignee/{id}")
+    Map<String, Object> deleteConsignee(@PathVariable("id") BigDecimal id);
+    //修改收货客户信息
+    @PostMapping(value = "/api/v1/rms/rmsconsignee/updateConsignee")
+    Map<String, Object> updateConsignee(Map<String, Object> map);
+
+    //根据id获取收货客户信息详细信息
+    @PostMapping(value = "/api/v1/rms/rmsconsignee/getConsigneeById/{id}")
+    Map<String,Object> getConsigneeById(@PathVariable("id") BigDecimal id);
+
+
+
+    //边输入边搜索承运商
+    @PostMapping(value = "/api/v1/rms/rmscardriver/getCarrierName")
+    Map<String, Object> getCarrierName(@RequestParam(value = "state")String state);
+
+
+    //港口
+    @PostMapping(value = "api/v1/rms/rmsPort/insertPort")
+    Map<String,Object> insertPort(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除港口
+    @PostMapping(value = "api/v1/rms/rmsPort//deletePort/{portId}")
+    Map<String, Object> deletePort(@PathVariable("portId") BigDecimal portId);
+
+    //删除码头
+    @PostMapping(value = "api/v1/rms/rmsPier//deletePier/{pierId}")
+    Map<String, Object> deletePier(@PathVariable("pierId") BigDecimal pierId);
+
+    @PostMapping(value = "/api/v1/rms/rmsPort/getPort")
+    Map<String, Object> getPortList(@RequestBody(required = false) Map<String , Object> mapVal,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/rms/rmsPier/getPier")
+    Map<String, Object> getPierList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/rms/rmsPortYard/getPortYard")
+    Map<String, Object> getPortYardList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam String con);
+
+    @GetMapping(value = "api/v1/rms/rmsPort/getPortType")
+    Map<String, Object> getPortType();
+
+
+    @PostMapping(value = "api/v1/rms/rmsPier/insertPier")
+    Map<String, Object> insertPier(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsPortYard/insertPortYard")
+    Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map);
+
+    //删除港存堆场
+    @PostMapping(value = "api/v1/rms/rmsPortYard/deletePortYard/{warehouseId}")
+    Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId);
+
+
+    // 得到二级部门的下拉
+    @GetMapping(value = "api/v1/rms/rmspersonnel/getSecondShipper")
+    Map<String, Object> getSecondShipper();
+
+    // 得到三级部门的下拉
+    @GetMapping(value = "api/v1/rms/rmspersonnel/getThirdShipper")
+    Map<String, Object> getThirdShipper(@RequestParam Integer shipperId);
+
+    // 新增人员权限
+    @PostMapping(value = "api/v1/rms/rmspersonnel/addPersonnel")
+    Map<String, Object> addPersonnel(@RequestBody Map<String, Object> map);
+
+    // 查询SSO主键和机构编码
+    @PostMapping(value = "api/v1/rms/rmspersonnel/getShipperMap")
+    Map<String, Object> getShipperMap(@RequestParam Integer shipperId);
+    //根据运力id查询承运商名称
+    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierNameById/{id}")
+    Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id);
+
+    //根据司机id查询承运商名称
+    @PostMapping(value = "api/v1/rms/rmscardriver/getCarrierNameByDriverId/{id}")
+    Map<String,Object> getCarrierNameByDriverId(@PathVariable("id") BigDecimal id);
+
+    @ApiOperation(value="新增组织结构实绩")
+    @PostMapping(value = "api/v1/rms/rmsshipper/addShipperResult")
+    Map<String,Object>  addShipperResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "api/v1/rms/rmsshipper/updateShipperResult")
+    Map<String,Object>  updateShipperResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "api/v1/rms/rmsshipper/deleteShipperResult")
+    Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value = "根据carrierSSOId查询承运商")
+    @PostMapping(value = "api/v1/rms/rmscapacity/getCarrierNameBySSOId")
+    Map<String, Object> getCarrierNameBySSOId(@RequestParam("carrierSSOId") String carrierSSOId);
+
+    @ApiOperation(value = "边输边查收货客户父节点")
+    @PostMapping(value = "api/v1/rms/rmsconsignee/getConsigneeFarId")
+    Map<String, Object> getConsigneeFarId(@RequestParam("state") String state);
+
+    @ApiOperation(value = "边输边查收货客户父节点")
+    @PostMapping(value = "api/v1/rms/rmspersonnel/isInHere")
+    Integer isInHere(@RequestParam String personnelJobNumber);
+
+    @ApiOperation(value="创建", notes="添加油品名称")
+    @PostMapping(value = "api/v1/rms/rmsoilprice/addOilType")
+    Map<String, Object> addOilType(@RequestParam String oilTypeName);
+
+    @ApiOperation(value="创建", notes="查询油品名称")
+    @PostMapping(value = "api/v1/rms/rmsoilprice/oilNameSelect")
+    Map<String, Object> oilNameSelect();
+
+    @ApiOperation("解除承运商和车辆的绑定关系")
+    @PostMapping("api/v1/rms/rmscapacity/deleteCapacityCarrier")
+    public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmsmaterialtype/getInwardContractMaterial")
+    RESTfulResult getInwardContractMaterial(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con);
+
+    @PostMapping("api/v1/rms/rmsmaterialtype/insertMaterialType")
+    RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/rms/rmscapacity/getCapacityInfoById/{id}")
+    Map<String,Object> getCapacityInfoById(@PathVariable("id") Integer id);
+
+    @PostMapping("api/v1/rms/rmscargodeps/getCargoDep")
+    Map<String, Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("con") String con);
+
+    @PostMapping("api/v1/rms/rmscargodeps/deleteCargoDep")
+    Map<String,Object> deleteCargoDep(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/updateCargoDep")
+    Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/insertCargoDep")
+    Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/getCargoDepById/{id}")
+    Map<String, Object> getCargoDepById(@PathVariable("id") BigDecimal id);
+
+    @PostMapping("api/v1/rms/rmsconsignee/signConsignee")
+    Map<String, Object> signConsignee(@RequestBody Map<String, Object> mapVal);
+
+
+    @PostMapping(value = "/api/v1/rms/rmsPort/getPortName")
+    Map<String, Object> getPortName(@RequestParam("index") String index);
+
+    // 边输边查码头名称
+    @PostMapping(value = "/api/v1/rms/rmsPort/getPierName")
+    Map<String, Object> getPierName(@RequestParam("index") String index);
+
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/selectbmsshipContractPriceList")
+    Map<String, Object> selectbmsshipContractPriceList(@RequestBody(required = false) Map<String,Object> map,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("con") String con,
+                                                       @RequestParam("startTime") String startTime,
+                                                       @RequestParam("endTime")String endTime);
+
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/insertBmsshipContractPrice")
+    Map<String, Object> insertBmsshipContractPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/updateBmsshipContractPrice")
+    Map<String, Object> updateBmsshipContractPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    // 删除船运合同单价
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/deleteBmsshipContractPrice")
+    Map<String, Object> deleteBmsshipContractPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    // 渲染船运合同单价
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/selectBmsshipPriceList/{id}")
+    Map<String, Object> selectBmsshipPriceList(@PathVariable("id") BigDecimal id);
+
+    //运力类型
+    @PostMapping(value = "/api/v1/rms/rmscapacitytype/getCapacityType")
+    Map<String, Object> getCapacityType(@RequestBody(required = false) Map<String,Object> map,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("con") String con);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/insertCapacityType")
+    Map<String, Object> insertCapacityType(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteCapacityType/{id}")
+    Map<String, Object> deleteCapacityType(@PathVariable("id") BigDecimal id);
+
+    //运输范围
+    @PostMapping(value = "/api/v1/rms/rmscapacitytype/getTransRange")
+    Map<String, Object> getTransRange(@RequestBody(required = false) Map<String,Object> map,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("con") String con);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/insertTransRange")
+    Map<String, Object> insertTransRange(@RequestBody(required = false) Map<String, Object> map);
+
+    //APP备注(RMS_MATERIAL_COKE)
+    @PostMapping(value = "/api/v1/rms/rmscapacitytype/getMaterialCoke")
+    Map<String, Object> getMaterialCoke(@RequestBody(required = false) Map<String,Object> map,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("con") String con);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/insertMaterialCoke")
+    Map<String, Object> insertMaterialCoke(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteMaterialCoke/{id}")
+    Map<String, Object> deleteMaterialCoke(@PathVariable("id") BigDecimal id);
+
+    //收款客户(RMS_RECEIVE_COMPANY)
+    @PostMapping(value = "/api/v1/rms/rmscapacitytype/getReceiveCompany")
+    Map<String, Object> getReceiveCompany(@RequestBody(required = false) Map<String,Object> map,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("con") String con);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/insertReceiveCompany")
+    Map<String, Object> insertReceiveCompany(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteReceiveCompany/{id}")
+    Map<String, Object> deleteReceiveCompany(@PathVariable("id") BigDecimal id);
+}

src/main/java/com/steerinfo/dil/feign/TmsTrainFeign.java

@@ -0,0 +1,311 @@
+package com.steerinfo.dil.feign;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/1 16:19
+ */
+
+@FeignClient(name = "dil-tms-train-dev", url = "${openfeign.TmsTrainFeign.url}")
+public interface TmsTrainFeign {
+
+/*
+    TmstrainLoadingResultController
+ */
+
+    @PostMapping("api/v1/trainTms/tmstrainloadingresults/getTmstrainWagonLoad")
+    public Map<String, Object> getTmstrainWagonLoad(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("resultType") Integer resultType,
+                                              @RequestParam("materialId")Integer materialId,
+                                              @RequestParam("supplierId")Integer supplierId,
+                                                    @RequestParam("con") String con,
+                                                    @RequestParam("startTime")String startTime,
+                                                    @RequestParam("endTime")String endTime);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/insertTmstrainLoadingResult")
+    public Map<String, Object> insertTmstrainLoadingResult(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getTmstrainLoadingResultByResultId/{resultId}")
+    public Map<String, Object> getTmstrainLoadingResultByResultId(@PathVariable("resultId") BigDecimal resultId);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/upadteTmstrainLoadingResultByResultId")
+    public Map<String, Object> upadteTmstrainLoadingResultByResultId(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/deleteTmstrainLoadingResultByResultId")
+    public Map<String, Object> deleteTmstrainLoadingResultByResultId(@RequestParam BigDecimal resultId);
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/deleteOutBoundWagonById")
+    public Map<String, Object> deleteOutBoundWagonById(@RequestParam BigDecimal resultId);
+
+    //下拉框
+
+    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getSendStationName")
+    public Map<String, Object> getSendStationName();
+
+
+    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getArrivalStationName")
+    public Map<String, Object> getArrivalStationName();
+
+
+    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getBatchId")
+    public Map<String, Object> getBatchId();
+
+    @ApiOperation(value = "获取已装车还未卸车车皮")
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getWagonNo/{resultType}")
+    public Map<String, Object> getWagonNo(@PathVariable("resultType") Integer resultType,
+                                    @RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("wagon") String wagon,
+                                    @RequestParam("purchaseOrderNum") String purchaseOrderNum,
+                                    @RequestParam("materialName")String materialName);
+
+    /*
+        TmstrainWagonUnloadResultController
+     */
+
+    @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainWagonUnLoad")
+    public Map<String, Object> getTmstrainWagonUnLoad(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("pageNum") Integer pageNum,
+                                                @RequestParam("pageSize") Integer pageSize,
+                                                @RequestParam("resultType") Integer resultType,
+                                                      @RequestParam("con") String con);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/deleteTmstrainWagonUnLoadResultByUnLoadingId")
+    public Map<String, Object> deleteTmstrainWagonUnLoadResultByUnLoadingId(@RequestParam BigDecimal unloadingId);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/insertTmstrainWagonUnLoadResult")
+    public Map<String, Object> insertTmstrainWagonUnLoadResult(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/upadteTmstrainWagonUnLoadResultByUnLoadingId")
+    public Map<String, Object> upadteTmstrainWagonUnLoadResultByUnLoadingId(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult);
+
+
+    @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainresult")
+    public Map<String, Object> getTmstrainresult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("con") String con);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainWagonUnLoadResultByUnLoadingId/{unloadingId}")
+    public Map<String, Object> getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId);
+
+
+        //下拉框
+    @GetMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getUnloadingPointName")
+    public Map<String, Object> getUnloadingPointName();
+
+
+    @GetMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getUnloadingRouteName")
+    public Map<String, Object> getUnloadingRouteName();
+
+
+
+    /**************************TmstrainPleaseApproveResultController************************************/
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getAllWagonPlease")
+    public Map<String, Object> getAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("status") Integer status,
+                                           @RequestParam("resultType") Integer resultType,
+                                           @RequestParam("resultId") Integer resultId,
+                                           @RequestParam("con") String con
+                                                 );
+
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getWagonPleaseById/{resultId}")
+    public Map<String, Object> getWagonPleaseById(@PathVariable("resultId")Integer resultId);
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonPlease")
+    public Map<String, Object> addWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/updateWagonPlease")
+    public Map<String, Object> updateWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/deleteWagonPlease/{resultId}")
+    public Map<String, Object> deleteWagonPlease(@PathVariable("resultId") Integer resultId);
+
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/sendWagonPlease/{resultId}")
+    public Map<String, Object> sendWagonPlease(@PathVariable("resultId") Integer resultId);
+
+    //下拉框
+    @GetMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getShipper")
+    public Map<String, Object> getShipper();
+
+    @GetMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getRailPlan")
+    Map<String, Object> getRailPlan();
+
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveAllWagonPlease")
+    public Map<String, Object> getApproveAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam("apiId") Integer apiId,
+                                                  @RequestParam("pageNum") Integer pageNum,
+                                                  @RequestParam("pageSize") Integer pageSize,
+                                                  @RequestParam("resultType") Integer resultType,
+                                                  @RequestParam("status") Integer status,
+                                                  @RequestParam("con") String con
+    );
+
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveWagonPleaseById/{resultId}")
+    public Map<String, Object> getApproveWagonPleaseById(@PathVariable("resultId")Integer resultId);
+
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/addApproveWagonPlease")
+    public Map<String, Object> addApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/updateApproveWagonPlease")
+    public Map<String, Object> updateApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/deleteApproveWagonPlease/{resultId}")
+    public Map<String, Object> deleteApproveWagonPlease(@PathVariable("resultId") Integer resultId);
+
+    //*****************************************内转物流***************************************************
+
+    @PostMapping("api/v1/trainTms/tmstrainloadingresults/addTrainLoadResultForConverted")
+    Map<String,Object>  addTrainLoadResultForConverted(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+    @PostMapping ("api/v1/trainTms/tmstrainloadingresults/selectLoadByResultId/{resultId}")
+    Map<String,Object> selectLoadByResultId(@PathVariable("resultId")BigDecimal resultId);
+
+    @PostMapping("api/v1/trainTms/tmstrainloadingresults/getTmstrainWagonLoadForConverted")
+    Map<String,Object> getTmstrainWagonLoadForConverted(@RequestBody(required=false)
+                                                        @RequestParam("apiId") Integer apiId,
+                                                        @RequestParam("pageNum") Integer pageNum,
+                                                        @RequestParam("pageSize") Integer pageSize,
+                                                        @RequestParam("con") String con);
+
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getPleasePlanByResultId/{resultId}")
+    Map<String,Object> getPleasePlanByResultId(@PathVariable("resultId")BigDecimal resultId);
+
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveByResultId/{resultId}")
+    Map<String,Object> getApproveByResultId(@PathVariable("resultId")BigDecimal resultId);
+
+    @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/selectWagonUnLoadResultForConverted")
+    Map<String,Object>  selectWagonUnLoadResultForConverted(
+                                                            @RequestParam("apiId") Integer apiId,
+                                                            @RequestParam("pageNum") Integer pageNum,
+                                                            @RequestParam("pageSize") Integer pageSize,
+                                                            @RequestParam("con") String con);
+
+    @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/selectTrainUnLoadResultForConverted")
+    Map<String,Object>  selectTrainUnLoadResultForConverted(
+                                                            @RequestParam("apiId") Integer apiId,
+                                                            @RequestParam("pageNum") Integer pageNum,
+                                                            @RequestParam("pageSize") Integer pageSize,
+                                                            @RequestParam("con") String con);
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonPleaseForNZ")
+    Map<String,Object> addPleaseForNZ(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/addTmsTrainUnloadResultForNZ")
+    Map<String, Object> addTmsTrainUnloadResultForNZ(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getMaterialAndCarByLoadingId")
+    Map<String, Object> getMaterialAndCarByLoadingId(
+            @RequestBody(required = false) Map<String, Object> mapValue,
+            @RequestParam("apiId") Integer apiId,
+            @RequestParam("pageNum") Integer pageNum,
+            @RequestParam("pageSize") Integer pageSize,
+            @RequestParam("loadingId")Integer loadingId,
+            @RequestParam("unloadingId")Integer unloadingId);
+
+    @ApiOperation(value = "国产矿导入")
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/importDomesticLoadResult")
+    Map<String, Object> importDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @ApiOperation(value = "进口矿导入")
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/importImportedLoadResult")
+    Map<String, Object> importImportedLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @ApiOperation(value = "国产矿物流新增装车")
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addDomesticLoadResult")
+    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @ApiOperation(value = "国产矿物流补录装车信息")
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/updateDomesticLoadResult")
+    Map<String, Object> updateDomesticLoadResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value = "添加火车计量委托")
+    @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/addTrainMeasureCommission")
+    Map<String, Object> addTrainMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/getLoadResultToSendMC")
+    Map<String, Object> getLoadResultToSendMC( @RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("resultType") Integer resultType,
+                                               @RequestParam("startTime") String startTime,
+                                               @RequestParam("endTime") String endTime,
+                                               @RequestParam("con") String con
+                                               );
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/getWeightResult")
+    Map<String, Object> getWeightResult( @RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("resultType") Integer resultType,
+                                               @RequestParam("startTime") String startTime,
+                                               @RequestParam("endTime") String endTime,
+                                               @RequestParam("con") String con
+    );
+
+    @ApiOperation(value = "批量新增计量委托")
+    @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
+    Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value = "根据物资名和外轮船名查询采购订单号")
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getPurchaseOrderList")
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                   @RequestParam("apiId")Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("materialName")String materialName,
+                                                   @RequestParam("resultForeignShipName")String resultForeignShipName,
+                                                   @RequestParam("supplierName")String supplierName);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addWarehouseOutResult")
+    Map<String, Object> addWarehouseOutResult(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/getWareHouseOutresult/{resultId}")
+    Map<String, Object> getWareHouseOutresult(@PathVariable("resultId")BigDecimal resultId);
+
+
+    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/updateWarehouseResult")
+    Map<String, Object> updateWarehouseResult(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/getResultType")
+    Map<String, Object> getResultType(@RequestBody(required = false)Map<String,Object> map,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("con") String con);
+
+    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/addShipLoadResult")
+    Map<String, Object> addShipLoadResult(@RequestBody(required = false) Map<String, Object> map);
+}

src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -0,0 +1,849 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/9/28 9:30
+ */
+
+@FeignClient(name = "dil-tms-truck-dev", url = "${openfeign.TmsTruckFeign.url}")
+public interface TmsTruckFeign {
+
+    /*
+    TmstruckLoadResultController
+     */
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/addLoadResultForConverted")
+    Map<String,Object> addLoadResultForConverted(@RequestBody(required=false) Map<String,Object> map);
+
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/getSaleOrderOnQueue")
+    public Map<String, Object> getSaleOrderOnQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("con") String con);
+
+    @ApiOperation(value="查询订单下的物资")
+    @GetMapping("api/v1/truckTms/dropDown/getOrderMaterial/{orderId}")
+    public Map<String, Object> getOrderMaterial(@PathVariable("orderId") Integer orderId);
+
+    @ApiOperation(value="查询仓库下所有月台")
+    @GetMapping("api/v1/truckTms/dropDown/getPlatformIdByWarehouse/{warehouseId}")
+    public Map<String, Object> getPlatformIdByWarehouse(@PathVariable("warehouseId") Integer warehouseId);
+
+    @ApiOperation(value="修改装车点和装车顺序：销售钢材专用 ")
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadingIdAndLoadSq")
+    public Map<String, Object> updateLoadingIdAndLoadSq(@RequestBody(required=false) Map<String, Object> map);
+
+    @ApiOperation(value="根据运输订单号查询装/卸点、卸货物资、装机备注信息：后台管理 ")
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadingIdRemark")
+    Map<String, Object> selectLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map);
+
+    @ApiOperation(value="修改装/卸点、卸货物资、装机备注等：后台管理 ")
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadingIdRemark")
+    Map<String, Object> updateLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/getAllLoadResult")
+    public Map<String, Object> getAllLoadResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("status") Integer status ,
+                                          @RequestParam("orderType") Integer orderType,
+                                          @RequestParam("con")   String con,
+                                          @RequestParam("userId") String userId,
+                                          @RequestParam("userIds") String userIds,
+                                                @RequestParam("startTime") String startTime,
+                                                @RequestParam("endTime") String endTime
+    );
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadResultForConverted")
+    public Map<String,Object> selectLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/getLoadResultByResultId/{resultId}")
+    public Map<String,Object> getLoadResultByResultId(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/addUnLoadResultForconverted")
+    public Map<String,Object> addUnLoadResultForconverted(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/addCGLoadResult")
+    public Map<String, Object> addCGLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/addSaleLoadResult")
+    public Map<String, Object> addSaleLoadResult(@RequestBody(required=false) Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/addSale2LoadResult")
+    public Map<String, Object> addSale2LoadResult(@RequestBody(required=false) Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadResult")
+    public Map<String, Object> updateLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/getLoadResultById/{resultId}")
+    public Map<String, Object> getLoadResultById(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/deleteLoadResult/{resultId}")
+    public Map<String, Object> deleteLoadResult(@PathVariable("resultId")Integer resultId);
+    /*
+        TmstruckEnfactoryResultController
+     */
+
+    @ApiOperation(value="查询所有的进厂实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(99)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getAllEnFactoryResult")
+    public Map<String, Object> getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     @RequestParam("apiId")     Integer apiId,
+                                                     @RequestParam("pageNum")   Integer pageNum,
+                                                     @RequestParam("pageSize")  Integer pageSize,
+                                                     @RequestParam("orderType") Integer orderType,
+                                                     @RequestParam("startTime") String startTime,
+                                                     @RequestParam("endTime") String endTime,
+                                                     @RequestParam("userId")    String userId,
+                                                     @RequestParam("userIds")   String userIds
+    );
+    @GetMapping("api/v1/truckTms/tmstruckenfactoryresults/getMaterial")
+    public Map<String , Object> getMaterial(@RequestParam("orderId")  Integer orderId);
+
+    @ApiOperation(value="通过采集系统传来的数据新增进厂作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/addEnFactoryResult")
+    public Map<String, Object> addEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    @ApiOperation(value="PDA扫描更新进厂作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/enFactoryResultByPDA")
+    Map<String, Object> enFactoryResultByPDA(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    /*
+        TmstruckWeightResultController
+     */
+
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiMaoResult")
+    public Map<String, Object> getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 @RequestParam("apiId") Integer apiId,
+                                                 @RequestParam("pageNum") Integer pageNum,
+                                                 @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("orderType") Integer orderType,
+                                                 @RequestParam("con")     String con,
+                                                 @RequestParam("userId")  String userId,
+                                                 @RequestParam("userIds") String userIds,
+                                                 @RequestParam("startTime")String startTime,
+                                                 @RequestParam("endTime")String endTime
+                                                 );
+
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
+    public Map<String, Object> getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("pageNum") Integer pageNum,
+                                                @RequestParam("pageSize") Integer pageSize,
+                                                @RequestParam("orderType") Integer orderType,
+                                                @RequestParam("con") String con,
+                                                @RequestParam("userId")String userId,
+                                                @RequestParam("userIds")String userIds,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
+
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
+    public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiPiResult")
+    public Map<String, Object> addJiPiResult(@RequestBody Map<String, Object> mapValue);
+
+
+    /*
+     TmstruckUnloadResultController
+     */
+
+    @PostMapping("api/v1/truckTms/tmstruckunloadresult/getUnloadResult")
+    public Map<String, Object> getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("orderType") Integer orderType,
+                                               @RequestParam("con")      String con,
+                                               @RequestParam("userId") String userId,
+                                               @RequestParam("userIds") String userIds,
+                                               @RequestParam("startTime")String startTime,
+                                               @RequestParam("endTime")String endTime
+    );
+
+    @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
+    public Map<String, Object> addUnloadResult(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/truckTms/tmstruckunloadresult/updateUnloadResult")
+    public Map<String, Object> updateUnloadResult(@RequestBody Map<String, Object> mapValue);
+
+    /*
+    TmstruckReceiptResultController
+     */
+
+
+    @PostMapping("api/v1/truckTms/tmstruckreciveresult/getReceiveResult")
+    public Map<String, Object> getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("orderType") Integer orderType,
+                                          @RequestParam("con")  String con,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
+
+    /*
+    TmstruckLeaveFactoryResultController
+     */
+
+
+    @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/getLeaveFactoryResult")
+    public Map<String, Object> getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("orderType") Integer orderType,
+                                               @RequestParam("con") String con,
+                                               @RequestParam("carrierSsoId")String carrierSsoId,
+                                               @RequestParam("userId") String userId,
+                                               @RequestParam("userIds") String userIds,
+                                               @RequestParam("startTime") String startTime,
+                                               @RequestParam("endTime") String endTime
+    );
+
+    @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")
+    public Map<String, Object> addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    /*
+    TmstruckMeasureCommissionController
+     */
+
+    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/getAllMeasureCommission")
+    public Map<String, Object> getAllMeasureCommission(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("con")String con);
+
+
+    /*
+    TmstruckQualityResultController
+     */
+    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResult")
+    public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("orderType") Integer orderType,
+                                          @RequestParam("con")String con,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
+
+
+    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResultById/{resultId}")
+    public Map<String, Object> getQualityResultById(@PathVariable("resultId") Integer resultId);
+
+
+    @PostMapping("api/v1/truckTms/tmstruckqualityresults/updateQualityResult")
+    public Map<String, Object> updateQualityResult(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    //查询质检实绩
+    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResult")
+    Map<String,Object> selectQualityResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       @RequestParam("apiId")    Integer apiId,
+                                                       @RequestParam("pageNum")  Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize);
+
+    /**
+     * TmstruckTotalResult
+     */
+    @PostMapping("api/v1/truckTms/tmstrucktotalresults/selectCountList")
+    Map<String,Object> selectCountList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       @RequestParam("apiId")    Integer apiId,
+                                                       @RequestParam("pageNum")  Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize);
+
+    /**
+     * 下拉框
+     */
+    @GetMapping("api/v1/truckTms/dropDown/getDilBatch")
+    Map<String, Object> getDilBatch();
+
+    @GetMapping("api/v1/truckTms/dropDown/getCarrier")
+    Map<String, Object> getCarrier();
+
+    @GetMapping("api/v1/truckTms/dropDown/getLine")
+    Map<String, Object> getLine();
+
+    @GetMapping("api/v1/truckTms/dropDown/getWarehouse")
+    Map<String, Object> getWarehouse();
+
+    @GetMapping("api/v1/truckTms/dropDown/getGatepost")
+    Map<String, Object> getGatepost();
+
+    @GetMapping("api/v1/truckTms/dropDown/getAPO")
+    Map<String, Object> getAPO();
+
+    @GetMapping("api/v1/truckTms/dropDown/getFuCapacityId")
+    Map<String, Object> getFuCapacityId();
+
+    @GetMapping("api/v1/truckTms/dropDown/getPort")
+    Map<String, Object> getPort();
+
+    @GetMapping("api/v1/truckTms/dropDown/getFuMaterial/{type}")
+    Map<String, Object> getFuMaterial(@PathVariable("type")Integer type);
+
+    @GetMapping("api/v1/truckTms/dropDown/getUnloadPoint/{type}")
+    Map<String, Object> getUnloadPoint(@PathVariable("type") Integer type);
+    /**
+     * 包月总实绩
+     */
+    @PostMapping("api/v1/truckTms/tmstrucktotalresults/getTmstruckMonthResult")
+    Map<String,Object> getTmstruckMonthResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                       @RequestParam("apiId")    Integer apiId,
+                                       @RequestParam("pageNum")  Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize);
+    /**
+     *通过运输订单判断下一步是否需要计量,更新汽车衡到计量实绩中
+     */
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/{orderId}")
+    Map<String,Object> isNextNeedJl(@PathVariable("orderId") Integer orderId);
+
+
+    /**
+     *查询短信实绩
+     */
+    @PostMapping("api/v1/truckTms/tmstrucksmsrusults/getSmsResult")
+    Map<String,Object> getSmsResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("con") String con);
+
+    @ApiOperation(value="APP查询进厂实绩")
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getEnfactoryResultList")
+    Map<String, Object> getEnfactoryResultList();
+
+    @ApiOperation(value="APP通过运输订单id查询进厂实绩")
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getEnfactoryMessageByOrderId")
+    Map<String, Object> getEnfactoryMessageByOrderId(@RequestParam String orderNumber);
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/getAllTimeTaskResult")
+    public RESTfulResult getAllTimeTaskResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con") String con,
+                                              @RequestParam("userId") String userId,
+                                              @RequestParam("startTime") String startTime,
+                                              @RequestParam("endTime") String endTime,
+                                              @RequestParam("orderType")Integer orderType);
+
+    @PostMapping("api/v1/truckTms/tmstrucktotalresults/getAllReverseResult")
+    RESTfulResult getAllReverseResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con") String con,
+                                              @RequestParam("userId") String userId,
+                                              @RequestParam("startTime") String startTime,
+                                              @RequestParam("endTime") String endTime);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
+    Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
+
+    @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/addSteelNzReceiptResult")
+    public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/updateTruckWeight")
+    public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList);
+
+    @PostMapping("api/v1/truckTms/tmstruckreturnresults/getAllReturnResult")
+    public Map<String, Object>  getAllReturnResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("orderType") Integer orderType,
+                                                   @RequestParam("con") String con);
+
+    @PostMapping("api/v1/truckTms/selfMachine/getBillOrder")
+    Map<String, Object> getBillOrder(@RequestParam String orderNumber);
+
+    @PostMapping("api/v1/truckTms/selfMachine/getDeliveryOrder")
+    Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber);
+
+    @PostMapping("api/v1/truckTms/selfMachine/queryNumber")
+    Map<String, Object> queryNumber(@RequestParam String orderNumber);
+
+    @PostMapping("api/v1/truckTms/selfMachine/changeNumber")
+    Map<String, Object> changeNumber(@RequestParam String orderNumber);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getRLFLReport")
+    Map<String, Object> getRLFLReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("startTime") String startTime,
+                                      @RequestParam("endTime")   String endTime,
+                                      @RequestParam("orderType") Integer orderType,
+                                      @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/cgNzLoadingResult")
+    Map<String, Object> cgNzLoadingResult(@RequestBody(required = false) Map<String, Object> mapval,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer orderType,
+                                          @RequestParam Integer orderStatus);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReport")
+    Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime")   String endTime,
+                                      @RequestParam("carrierSsoId")   String carrierSsoId,
+                                         @RequestParam("orderType") Integer orderType,
+                                         @RequestParam("shipperId") Integer shipperId,
+                                         @RequestParam("receiveName") String receiveName,
+                                         @RequestParam String materialName,
+                                         @RequestParam String wareHouse
+    );
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")
+    Map<String, Object> getAllSaleReportTotal(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime")   String endTime,
+                                         @RequestParam("carrierSsoId")   String carrierSsoId
+    );
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport1")
+    Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("startTime") String startTime,
+                                                   @RequestParam("endTime") String endTime,
+                                                   @RequestParam("carrierSsoId") String carrierSsoId,
+                                                   @RequestParam("userId") String userId,
+                                                   @RequestParam("userIds") String userIds,
+                                                   @RequestParam("con") String con,
+                                                   @RequestParam("orderType") Integer orderType
+    );
+    @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport2")
+    Map<String, Object> getSporadicSuppliesReport2(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("startTime") String startTime,
+                                                   @RequestParam("endTime") String endTime,
+                                                   @RequestParam("carrierSsoId") String carrierSsoId,
+                                                   @RequestParam("userId") String userId,
+                                                   @RequestParam("userIds") String userIds,
+                                                   @RequestParam("con") String con,
+                                                   @RequestParam("orderType") Integer orderType
+    );
+    //内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getAllInwardResult")
+    Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime")   String endTime,
+                                         @RequestParam("carrierSsoId")   String carrierSsoId
+    );
+
+    //采购内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getPurInwardReport")
+    Map<String, Object> getPurInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
+//内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReport")
+    Map<String, Object> getInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
+
+    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
+    Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
+
+
+    //发送留皮计量委托
+    @GetMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendLiuPiMeasureCommission")
+    Map<String, Object> sendLiuPiMeasureCommission(@RequestParam("capacityNumber")String capacityNumber);
+
+
+    //新增计时作业实绩
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/addTimeTaskResult")
+    Map<String, Object> addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLoading")
+    Map<String, Object> getLoading(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam Integer apiId,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize,
+                                   @RequestParam String startTime,
+                                   @RequestParam String endTime);
+
+
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLoaderForResultDetail")
+    Map<String, Object> getLoaderForResultDetail(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam("apiId") Integer apiId,
+                                   @RequestParam("pageNum") Integer pageNum,
+                                   @RequestParam("pageSize") Integer pageSize,
+                                   @RequestParam("startTime") String startTime,
+                                   @RequestParam("endTime") String endTime, @RequestParam("con") String con, @RequestParam("isPage") String  isPage);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getUnLoading")
+    Map<String, Object> getUnLoading(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
+
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLoaderResult")
+    Map<String, Object> getLoaderResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
+
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTask")
+    Map<String, Object> JudgeTimeTask(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/unitSureEndTimeout")
+    Map<String, Object> unitSureEndTimeout(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTaskPause")
+    Map<String, Object> JudgeTimeTaskPause(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLXInwardReport")
+    Map<String, Object> getLXInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime,
+                                          @RequestParam String con);
+
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReportForAssemble")
+    Map<String, Object> getInwardReportForAssemble(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam String startTime,
+                                          @RequestParam String endTime,
+                                                   @RequestParam BigDecimal orderType,
+                                                   @RequestParam String index,
+                                                   @RequestParam String isPage,
+                                                   @RequestParam String orgCode);
+
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getCapacityByDefend")
+    Map<String, Object> getCapacityByDefend(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime,
+                                          @RequestParam String con,
+                                            @RequestParam String yes
+                                         );
+
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptResult")
+    Map<String, Object> getReceiptResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime
+    );
+
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptPhoto")
+    String getReceiptPhoto(@RequestParam String orderNumber);
+
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceivingResult")
+    Map<String, Object> getReceivingResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam String con,
+                                         @RequestParam String startTime,
+                                         @RequestParam String endTime
+    );
+
+    @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhoto")
+    Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber);
+    @PostMapping("/api/v1/truckTms/pathDisplay/fullPathVisualizationByCarNumber")
+    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue);
+    @PostMapping("/api/v1/truckTms/pathDisplay/fullPath")
+    public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception;
+    @PostMapping("/api/v1/truckTms/pathDisplay/getInTransitTransportation")
+    public RESTfulResult getInTransitTransportation(@RequestBody Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
+    @PostMapping(value = "/api/v1/truckTms/tmstruckarrivalresults/addtmstruckArrivalResult",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber")String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestPart("file") MultipartFile file);
+
+    @PostMapping(value = "/api/v1/truckTms/pathDisplay/addTmstruckReceiptResult")
+    public  RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object>  mapValaue  , @RequestParam("num") Integer num, @RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, @RequestParam("imgcount3") Integer imgcount3, @RequestParam("imgcount4")Integer imgcount4);
+
+    @PostMapping(value = "/api/v1/truckTms/tmstruckarrivalresults/uploadImage",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public String uploadImage(@RequestParam("orderNumber")String orderNumber,@RequestPart("file") MultipartFile file);
+
+//    @PostMapping(value = "/api/v1/truckTms/pathDisplay/addTmstruckReceiptResult", headers = "content-type=multipart/form-data",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+//    public  RESTfulResult addTmstruckReceiptResult(@RequestPart("file")MultipartRequest request,@RequestParam("num") Integer num,@RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestParam("imgcount3") Integer imgcount3, @RequestParam("imgcount4")Integer imgcount4);
+    @PostMapping("/api/v1/truckTms/pathDisplay/getFinishTruckOrderInfo")
+    public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
+                                                 @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                 @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
+                                                 @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
+    );
+
+    @PostMapping(value = "/api/v1/truckTms/pathDisplay/selectWarnSwitch")
+    public RESTfulResult selectWarnSwitch();
+
+    @PostMapping(value = "/api/v1/truckTms/pathDisplay/inTransitWarn")
+    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio);
+
+    @PostMapping("/api/v1/truckTms/pathDisplay/offLineWarn")
+    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
+    @PostMapping("/api/v1/truckTms/pathDisplay/parkWarn")
+    public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception;
+    @PostMapping("/api/v1/truckTms/pathDisplay/abnormalLineWarn")
+    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
+
+    @PostMapping("/api/v1/truckTms/pathDisplay/getHaveAbnormalTruckOrderInfo")
+    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
+    @PostMapping("/api/v1/truckTms/pathDisplay/getTransportAbnormalInfo")
+    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
+                                                  @RequestParam(name = "pageNum") Integer pageNum,
+                                                  @RequestParam(name = "pageSize") Integer pageSize);
+
+
+    @ApiOperation(value = "获取收货作业照片")
+    @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhotoByUrl")
+    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber);
+
+
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseInwardList")
+    Map<String, Object> getPurchaseInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("startTime") String startTime,
+                                      @RequestParam("endTime") String endTime,
+                                      @RequestParam("orgCode") String orgCode,
+                                      @RequestParam("isPage") String isPage,
+                                      @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseOrderList")
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("startTime") String startTime,
+                                              @RequestParam("endTime") String endTime,
+                                              @RequestParam("orgCode") String orgCode,
+                                              @RequestParam("isPage") String isPage,
+                                             @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleOrderList")
+    Map<String, Object> getSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime") String endTime,
+                                         @RequestParam("orgCode") String orgCode,
+                                         @RequestParam("isPage") String isPage,
+                                         @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardInFactory")
+    Map<String, Object> getInwardInFactory(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("startTime") String startTime,
+                                           @RequestParam("endTime") String endTime,
+                                           @RequestParam("orgCode") String orgCode,
+                                           @RequestParam("isPage") String isPage,
+                                           @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getOutFactoryInwardList")
+    Map<String, Object> getOutFactoryInwardList(@RequestBody(required = false)Map<String, Object> mapValue,
+                                                @RequestParam("apiId")Integer apiId,
+                                                @RequestParam("pageNum")Integer pageNum,
+                                                @RequestParam("pageSize")Integer pageSize,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime,
+                                                @RequestParam("orgCode")String orgCode,
+                                                @RequestParam("isPage")String isPage,
+                                                @RequestParam("index")String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReport")
+    Map<String, Object> getSaleSteelReport(@RequestBody(required = false)Map<String, Object> map,
+                                           @RequestParam("startTime")String startTime,
+                                           @RequestParam("endTime")String endTime,
+                                           @RequestParam("carrierSsoId")String carrierSsoId,
+                                           @RequestParam("receiveName")String receiveName,
+                                           @RequestParam("materialName")String materialName,
+                                           @RequestParam("specification")String specification,
+                                           @RequestParam("remark")String remark,
+                                           @RequestParam("capacityNo") String capacityNo,
+                                           @RequestParam("carrierName") String carrierName,
+                                           @RequestParam("consigneeName") String consigneeName,
+                                           @RequestParam("saler") String saler,
+                                           @RequestParam("easPrimaryId") String easPrimaryId
+                                           );
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelSpellingReport")
+    Map<String, Object> getSaleSteelSpellingReport(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReportNew")
+    Map<String, Object> getSaleSteelReportNew(@RequestBody(required = false)Map<String, Object> map,
+                                           @RequestParam("startTime")String startTime,
+                                           @RequestParam("endTime")String endTime,
+                                           @RequestParam("carrierSsoId")String carrierSsoId,
+                                           @RequestParam("receiveName")String receiveName,
+                                           @RequestParam("materialName")String materialName,
+                                           @RequestParam("specification")String specification,
+                                           @RequestParam("remark")String remark,
+                                           @RequestParam("capacityNo") String capacityNo,
+                                           @RequestParam("carrierName") String carrierName,
+                                           @RequestParam("consigneeName") String consigneeName,
+                                           @RequestParam("saler") String saler,
+                                           @RequestParam("easPrimaryId") String easPrimaryId
+    );
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSettledSaleSteelReportNew")
+    Map<String, Object> getSettledSaleSteelReportNew(@RequestBody(required = false)Map<String, Object> map,
+                                              @RequestParam("startTime")String startTime,
+                                              @RequestParam("endTime")String endTime,
+                                              @RequestParam("carrierSsoId")String carrierSsoId,
+                                              @RequestParam("receiveName")String receiveName,
+                                              @RequestParam("materialName")String materialName,
+                                              @RequestParam("specification")String specification,
+                                              @RequestParam("remark")String remark,
+                                              @RequestParam("capacityNo") String capacityNo,
+                                              @RequestParam("carrierName") String carrierName,
+                                              @RequestParam("consigneeName") String consigneeName,
+                                              @RequestParam("saler") String saler,
+                                              @RequestParam("easPrimaryId") String easPrimaryId
+    );
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/loadingSaleSteelReport")
+    Map<String, Object> loadingSaleSteelReport(@RequestBody(required = false)Map<String, Object> map,
+                                           @RequestParam("startTime")String startTime,
+                                           @RequestParam("endTime")String endTime,
+                                           @RequestParam("carrierSsoId")String carrierSsoId,
+                                           @RequestParam("receiveName")String receiveName,
+                                           @RequestParam("materialName")String materialName,
+                                           @RequestParam("specification")String specification,
+                                           @RequestParam("remark")String remark,
+                                           @RequestParam("capacityNo") String capacityNo,
+                                           @RequestParam("carrierName") String carrierName,
+                                           @RequestParam("consigneeName") String consigneeName,
+                                           @RequestParam("saler") String saler,
+                                           @RequestParam("easPrimaryId") String easPrimaryId
+    );
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelReport")
+    Map<String, Object> getInwardSaleSteelReport(@RequestBody(required = false) Map<String, Object> map,
+                                                 @RequestParam("startTime") String startTime,
+                                                 @RequestParam("endTime") String endTime,
+                                                 @RequestParam("carrierSsoId") String carrierSsoId,
+                                                 @RequestParam("receiveName") String receiveName,
+                                                 @RequestParam("materialName") String materialName,
+                                                 @RequestParam("specification") String specification,
+                                                 @RequestParam("remark") String remark,
+                                                 @RequestParam("capacityNo") String capacityNo,
+                                                 @RequestParam("carrierName") String carrierName,
+                                                 @RequestParam("consigneeName") String consigneeName,
+                                                 @RequestParam("saler") String saler);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelOrder")
+    Map<String, Object> getInwardSaleSteelOrder(@RequestBody(required = false) Map<String, Object> map,
+                                                 @RequestParam("startTime") String startTime,
+                                                 @RequestParam("endTime") String endTime,
+                                                 @RequestParam("remark") String remark,
+                                                 @RequestParam("capacityNo") String capacityNo,
+                                                 @RequestParam("consigneeName") String consigneeName
+                                                 );
+
+    @PostMapping("/api/v1/truckTms/tmstrucksmsrusults/sendMeaage")
+    Map<String, Object> sendMeaage(@RequestParam String mobile,
+                                   @RequestParam String content);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSteelReportDetailsBySmId")
+    Map<String, Object> getSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId);
+
+
+    @PostMapping("api/v1/truckTms/tmstrucktotalresults/changeOrderLine")
+    Map<String, Object> changeOrderLine(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReportForFinance")
+    Map<String, Object> getSaleSteelReportForFinance(BigDecimal saleOrderMaterialId);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/steelTransportReport")
+    Map<String, Object> steelTransportReport(@RequestBody(required = false) Map<String, Object> map, @RequestParam String startTime,@RequestParam String endTime);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/yawnReport")
+    Map<String, Object> yawnReport(@RequestBody(required = false) Map<String, Object> map);
+}
+
+
+
+
+
+

src/main/java/com/steerinfo/dil/feign/TmsshipFeign.java

@@ -0,0 +1,878 @@
+package com.steerinfo.dil.feign;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/23 8:46
+ * @Version:V2.0
+ */
+@FeignClient(value = "DIL-SHIPTMS-API-DEV", url = "${openfeign.TmsshipFeign.url}")
+public interface TmsshipFeign {
+
+    /**
+     * 展示驳船
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/getBargeOperationList")
+    Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId);
+
+    /**
+     * 查询驳船作业信息
+     *
+     * @param bargeOperationId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/getBargeOperation/{bargeOperationId}")
+    Map<String, Object> getBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
+
+    /**
+     * 查询驳船作业信息
+     *
+     * @param bargeOperationId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/selectBargeOperation/{bargeOperationId}")
+    Map<String, Object> selectBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
+
+    /**
+     * 删除驳船作业信息
+     *
+     * @param bargeOperationId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/deleteBargeOperation/{bargeOperationId}")
+    Map<String, Object> deleteBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
+
+    /**
+     * 修改驳船作业信息
+     *
+     * @param tmsshipBargeOperation
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/updateBargeOperation")
+    Map<String, Object> updateBargeOperation(@RequestBody Map<String, Object> tmsshipBargeOperation);
+
+    /**
+     * 新增驳船作业
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/addBargeOperation")
+    Map<String, Object> addBargeOperation(@RequestBody Map<String, Object> map);
+
+    /**
+     * 新增抵达实绩
+     *
+     * @param mapVal
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipentrywharyresults/addTmsShipEntryWharyResult")
+    Map<String, Object> addTmsShipEntryWharyResult(@RequestBody Map<String, Object> mapVal);
+
+    /**
+     * 新增离港实绩
+     *
+     * @param mapVal
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipoutwharyresults/addTmsShipOutWharyResult")
+    Map<String, Object> addTmsShipOutWharyResult(@RequestBody Map<String, Object> mapVal);
+
+    /**
+     * 展示装船作业信息列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/getLoadShipList")
+    Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("status") Integer status,
+                                        @RequestParam(required = false) String con,
+                                        @RequestParam("startTime") String startTime,
+                                        @RequestParam("endTime") String endTime);
+
+    /**
+     * 查询装船作业表单
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/getLoadShip/{resultId}")
+    Map<String, Object> getLoadShip(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 查询装船作业信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/selectLoadShip/{resultId}")
+    Map<String, Object> selectLoadShip(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 删除装船作业信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/deleteLoadShip/{resultId}")
+    Map<String, Object> deleteLoadShip(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 修改装船作业信息
+     *
+     * @param tmsshipLoadShipResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/updateLoadShip")
+    Map<String, Object> updateLoadShip(@RequestBody Map<String, Object> tmsshipLoadShipResult);
+
+    /**
+     * 修改三程船装船信息
+     * @param mapVal
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/updateThreeSectionDetails")
+    Map<String, Object> updateThreeSectionDetails(@RequestBody(required = false)Map<String, Object> mapVal);
+
+    /**
+     * 新增装船作业
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/addLoadShip")
+    Map<String, Object> addLoadShip(@RequestBody Map<String, Object> map);
+
+    /**
+     * 展示位置作业信息列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationList")
+    Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam Integer apiId,
+                                            @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationList")
+    Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam String con
+                                            );
+
+
+    /**
+     * 查询位置作业信息
+     *
+     * @param locationId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocation/{locationId}")
+    Map<String, Object> getShipLocation(@PathVariable("locationId") BigDecimal locationId);
+
+    /**
+     * 查询位置作业信息
+     *
+     * @param locationId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/selectShipLocation/{locationId}")
+    Map<String, Object> selectShipLocation(@PathVariable("locationId") BigDecimal locationId);
+
+    /**
+     * 删除位置作业信息
+     *
+     * @param locationId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/deleteShipLocation/{locationId}")
+    Map<String, Object> deleteShipLocation(@PathVariable("locationId") BigDecimal locationId);
+
+    /**
+     * 修改位置作业信息
+     *
+     * @param tmsshipShipLocation
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/updateShipLocation")
+    Map<String, Object> updateShipLocation(@RequestBody Map<String, Object> tmsshipShipLocation);
+
+    /**
+     * 新增位置作业
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/addShipLocation")
+    Map<String, Object> addShipLocation(@RequestBody Map<String, Object> map);
+
+    /**
+     * 展示水路货物运单列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/listAllOrders")
+    Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
+                                @RequestParam Integer pageNum,
+                                @RequestParam Integer pageSize,
+                                @RequestParam Integer apiId,
+                                      @RequestParam String con);
+
+    /**
+     * 展示船只信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getCapacityList")
+    Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam String con);
+
+    /**
+     * 展示卸船作业信息列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/getUnLoadShipList")
+    Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam(required = false) String con);
+
+    /**
+     * 查询卸船作业信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/getUnloadShip/{resultId}")
+    Map<String, Object> getUnloadShip(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 查询卸船作业信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/selectUnLoadShip/{resultId}")
+    Map<String, Object> selectUnLoadShip(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 删除卸船作业信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/deleteUnLoadShip/{resultId}")
+    Map<String, Object> deleteUnLoadShip(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 修改卸船作业信息
+     *
+     * @param tmsshipUnloadShipResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/updateUnLoadShip")
+    Map<String, Object> updateUnLoadShip(@RequestBody Map<String, Object> tmsshipUnloadShipResult);
+
+    /**
+     * 新增卸船作业
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/addUnLoadShip")
+    Map<String, Object> addUnLoadShip(@RequestBody Map<String, Object> map);
+
+    /**
+     * 展示水分质检信息列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/getWaterQualityResultList")
+    Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                                  @RequestParam(required = false) String con);
+
+    /**
+     * 查询水分质检信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/getWaterQuality/{resultId}")
+    Map<String, Object> getWaterQuality(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 查询水分质检信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/selectWaterQualityResult/{resultId}")
+    Map<String, Object> selectWaterQualityResult(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 删除水分质检信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/deleteWaterQualityResult/{resultId}")
+    Map<String, Object> deleteWaterQualityResult(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 修改水分质检作业信息
+     *
+     * @param tmsshipWaterQualityResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/updateWaterQualityResult")
+    Map<String, Object> updateWaterQualityResult(@RequestBody Map<String, Object> tmsshipWaterQualityResult);
+
+    /**
+     * 新增水分质检作业
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/addWaterQualityResult")
+    Map<String, Object> addWaterQualityResult(@RequestBody Map<String, Object> map);
+
+    /**
+     * 展示船只信息列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getCapacities")
+    Map<String, Object> getCapacities(@RequestParam BigDecimal instructionsId,
+                                @RequestBody(required = false) Map<String, Object> mapValue,
+                                @RequestParam Integer pageNum,
+                                @RequestParam Integer pageSize,
+                                @RequestParam Integer apiId);
+
+    /**
+     * 新增船只
+     *
+     * @param omsshipInstructionsCapacity
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/addInstructionsCapacity")
+    Map<String, Object> addInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity);
+
+    /**
+     * 查询船只
+     *
+     * @param instructionsCapacityId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getInstructionsCapacity/{instructionsCapacityId}")
+    Map<String, Object> getInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId);
+
+    /**
+     * 逻辑删除船只
+     *
+     * @param instructionsCapacityId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/deleteInstructionsCapacity/{instructionsCapacityId}")
+    Map<String, Object> deleteInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId);
+
+    /**
+     * 修改船只信息
+     *
+     * @param omsshipInstructionsCapacity
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/updateInstructionsCapacity")
+    Map<String, Object> updateInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity);
+
+    /**
+     * 展示装船指令
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getShipMentInstructionsList")
+    Map<String, Object> getShipMentInstructionsList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer apiId,
+                                                    @RequestParam String status,
+                                                    @RequestParam String con);
+
+    /**
+     * 查询装船指令
+     *
+     * @param instructionsId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getShipmentInstructions/{instructionsId}")
+    Map<String, Object> getShipmentInstructions(@PathVariable("instructionsId") BigDecimal instructionsId);
+
+    /**
+     * 查询装船指令
+     *
+     * @param shipmentInstructionsId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/sendShipmentInstructionsStatus/{shipmentInstructionsId}")
+    Map<String, Object> sendShipmentInstructionsStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId);
+
+    /**
+     * 删除装船指令
+     *
+     * @param instructionsId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/deleteByPrimaryKey/{instructionsId}")
+    Map<String, Object> deleteByPrimaryKey(@PathVariable("instructionsId") BigDecimal instructionsId);
+
+    /**
+     * 修改装船指令
+     *
+     * @param omsshipShipmentInstructions
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/updateShipmentInstructions")
+    Map<String, Object> updateShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions);
+
+    /**
+     * 新增装船指令
+     *
+     * @param omsshipShipmentInstructions
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/addShipmentInstructions")
+    Map<String, Object> addShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions);
+
+    /**
+     * 下拉框
+     * @return
+     */
+    @GetMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getGroupId")
+    Map<String, Object> getGroupId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getCargoId")
+    Map<String, Object> getCargoId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/insertBetchId")
+    Map<String, Object> insertBetchId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getAttorneyId")
+    Map<String, Object> getAttorneyId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getNoticeId")
+    Map<String, Object> getNoticeId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getPortName")
+    Map<String, Object> getPortName();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getPortId")
+    Map<String, Object> getPortId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getRmRawId")
+    Map<String, Object> getRmRawId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getPierId")
+    Map<String, Object> getPierId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getResultNumber")
+    Map<String, Object> getResultNumber();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getCarrier")
+    Map<String, Object> getCarrier();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getShipper")
+    Map<String, Object> getShipper();
+
+    @GetMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getOrderId")
+    Map<String, Object> getTask();
+
+    @GetMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getCapacityId")
+    Map<String, Object> getCapacityId();
+
+    @GetMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getBatchId")
+    Map<String, Object> getBatchId();
+
+
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchList")
+    Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId);
+
+
+
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchListForAttorney")
+    Map<String, Object> getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchListForInstruction")
+    Map<String, Object> getBatchListForInstruction(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchIdByForeign")
+    Map<String, Object> getBatchIdByForeign(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String con);
+
+    //获取船运物资id
+    @GetMapping("/api/v1/shipTms/amsshipcargotransferresults/getMaterialId")
+    Map<String,Object> getMaterialId();
+
+    //船舶动态表
+    @PostMapping("api/v1/shipTms/shipdynamics/selectAllShipDynamaics")
+    Map<String, Object> selectAllShipDynamaics(@RequestBody(required = false) Map<String,Object> map,
+                                               @RequestParam("con") String con);
+
+    //万州港装车数据
+    @PostMapping("api/v1/shipTms/shipdynamics/getLoadData")
+    Map<String, Object> getLoadData(@RequestBody(required = false) Map<String,Object> map);
+
+    //万州港卸船数据
+    @PostMapping("api/v1/shipTms/shipdynamics/getUnloadData")
+    Map<String, Object> getUnloadData(@RequestBody(required = false) Map<String,Object> map);
+
+    //游港口船舶动态表
+    @PostMapping("api/v1/shipTms/shipdynamics/getDownShipDynamaics")
+    Map<String, Object> getDownShipDynamaics(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping(value = "/api/v1/shipTms/shipdynamics/getControlLines")
+    Map<String, Object> getControlLines(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/shipTms/shipdynamics/updateControlLine")
+    Map<String, Object> updateControlLine(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/shipTms/shipdynamics/getControlLinesTable")
+    Map<String, Object> getControlLinesTable(@RequestBody Map<String, Object> map);
+    /**
+     * 展示货权转移
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getAmsshipCargoTranferResultList")
+    Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                         @RequestParam Integer pageNum,
+                                                         @RequestParam Integer pageSize,
+                                                         @RequestParam Integer apiId);
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/selectShippeByName")
+    Map<String, Object>   selectShippeByName(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam String con);
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getMaterialList")
+       Map<String, Object>  getMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getGroupList")
+      Map<String, Object> getGroupList (@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam String con);
+    /**
+     * 新增货权转移
+     *
+     * @param amsshipCargoTransferResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/insertamsshipCargoTransferResult")
+    Map<String, Object> insertamsshipCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult);
+
+    /**
+     * 逻辑删除货权转移
+     *
+     * @param cargoTransferResultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/deleteByCargoId/{cargoTransferResultId}")
+    Map<String, Object> deleteByCargoId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId);
+
+    /**
+     * 修改货权转移
+     *
+     * @param amsshipCargoTransferResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/editCargoTransferResult")
+    Map<String, Object> editCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult);
+
+    /**
+     * 查询货权转移
+     *
+     * @param cargoTransferResultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/selectByCargoTranferResultId/{cargoTransferResultId}")
+    Map<String, Object> selectByCargoTranferResultId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId);
+
+    /**
+     * 展示提货委托
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getAmsshipDeliveryAttroneyList")
+    Map<String, Object> getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam Integer status,
+                                                       @RequestParam String con);
+
+    /**
+     * 新增提货委托
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/insertshipDeliveryAttorney")
+    Map<String, Object> insertshipDeliveryAttorney(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 逻辑删除提货委托
+     *
+     * @param attorneyId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/deleteByAttorneyId/{attorneyId}")
+    Map<String, Object> deleteByAttorneyId(@PathVariable("attorneyId") Integer attorneyId);
+
+    /**
+     * 修改提货委托
+     *
+     * @param amsshipDeliveryAttorney
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/editDeliveryAttroney")
+    Map<String, Object> editDeliveryAttroney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
+
+    /**
+     * 查询提货委托
+     *
+     * @param attorneyId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getDeliveryAttorneyId/{attorneyId}")
+    Map<String, Object> getDeliveryAttorneyId(@PathVariable("attorneyId") Integer attorneyId);
+
+    /**
+     * 下发提货委托
+     *
+     * @param attorneyId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/sendDeliveryAttorneyStatus/{attorneyId}")
+    Map<String, Object> sendDeliveryAttorneyStatus(@PathVariable("attorneyId") Integer attorneyId);
+
+    /**
+     * 展示放货通知
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getshipDeliveryNoticeList")
+    Map<String, Object> getshipDeliveryNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer  status,
+                                                  @RequestParam(required = false) String con,
+                                                  @RequestParam String startTime,
+                                                  @RequestParam String endTime);
+
+    /**
+     * 新增放货通知
+     *
+     * @param amsshipDeliveryNotice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/insertDeliveryNotice")
+    Map<String, Object> insertDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice);
+
+    /**
+     * 逻辑删除放货通知
+     *
+     * @param noticeId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/deleteByNoticeId/{noticeId}")
+    Map<String, Object> deleteByNoticeId(@PathVariable("noticeId") Integer noticeId);
+
+    /**
+     * 修改放货通知
+     *
+     * @param amsshipDeliveryNotice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/editDeliveryNotice")
+    Map<String, Object> editDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice);
+
+    /**
+     * 查询放货通知
+     *
+     * @param noticeId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/selectByNoticeId/{noticeId}")
+    Map<String, Object> selectByNoticeId(@PathVariable("noticeId") Integer noticeId);
+
+    /**
+     * 下发放货通知
+     *
+     * @param noticeId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/sendDeliveryNotice/{noticeId}")
+    Map<String, Object> sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId);
+
+    //船舶动态表
+    @PostMapping("api/v1/shipTms/shipdynamics/selectAllShipDynamaics")
+    Map<String, Object> selectAllShipDynamaics();
+
+
+    //获取合同水分值，实装吨位，水分吨位
+    @PostMapping("api/v1/shipTms/tmsshipwaterqualityresults/getMoistureAndInstallations")
+    Map<String,Object> getMoistureAndInstallations(Map<String,Object> map);
+
+    //    模糊查询江船名
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
+    Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
+
+    //  根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话
+    @PostMapping("/api/v1/shipTms/dilbatchs/getPersonByName")
+    Map<String, Object> getPersonByName(@RequestParam(value ="personName")String personName);
+
+    @ApiOperation("value=查询船舶状态")
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationStatus")
+    Map<String, Object> getShipLocationStatus(@RequestParam("shipLocation") String shipLocation);
+
+
+    @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/downLoadDeilveryNotice")
+    Map<String, Object> downLoadDeilveryNotice(@RequestParam("noticeId") Integer noticeId);
+
+    @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/uploadCargoPic" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    String uploadCargoPic(@RequestPart("file") MultipartFile multipartFile);
+
+
+    @PostMapping(value =  "api/v1/shipTms/dilbatchs/getNoticeContactNumberByPerson")
+    Map<String, Object> getNoticeContactNumberByPerson(@RequestParam("personName") String personName);
+
+
+    @PostMapping("/api/v1/shipTms/tmsshiptotalresults/addPleaseResult")
+    Map<String,Object> addPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    @PostMapping("/api/v1/shipTms/tmsshiptotalresults/editPleaseResult")
+    Map<String,Object> editPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    @PostMapping("/api/v1/shipTms/tmsshiptotalresults/getAllPleaseResult")
+    Map<String,Object> getAllPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam String con,
+                                          @RequestParam String startTime,
+                                          @RequestParam String endTime);
+
+    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getPleaseResult/{resultId}")
+    Map<String, Object> getPleaseResult(@PathVariable("resultId") BigDecimal resultId);
+
+    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getRealNumber")
+    Map<String, Object> getRealNumber(Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/shipTms/shipdynamics/getWagonWork")
+    Map<String, Object> getWagonWork(Map<String, Object> map);
+
+    @ApiOperation(value = "查询待绑定的批次id")
+    @PostMapping(value = "api/v1/shipTms/dilbatchs/findBatchForBind")
+    Map<String, Object> findBatchForBind(@RequestBody(required = false) Map<String, Object> map,
+                                         @RequestParam("apiId")Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("materialName")String materialName,
+                                         @RequestParam("foreignShipName")String foreignShipName);
+
+    @ApiOperation(value = "绑定批次")
+    @PostMapping(value = "api/v1/shipTms/dilbatchs/bindBatch")
+    Map<String, Object> bindBatch(@RequestBody(required = false) Map<String, Object> map);
+}

src/main/java/com/steerinfo/dil/feign/WMSFeign.java

@@ -0,0 +1,945 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-09-17 14:13
+ */
+@FeignClient(value = "DAL-DAZHOU-WMS-DEV",url = "${openfeign.WMSFeign.url}")
+public interface WMSFeign {
+    /**
+     * 钢材入库实绩
+     *
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResult", method = RequestMethod.POST)
+    Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResultStatistics", method = RequestMethod.POST)
+    Map<String, Object> getWmsInboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+    /**
+     * 展示真实入库实绩
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResults", method = RequestMethod.POST)
+    Map<String, Object> getWmsInboundResults(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+
+
+    /**
+     * 展示预留入库实绩信息
+     *
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsReservedResult", method = RequestMethod.POST)
+    Map<String, Object> getWmsReservedResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String con);
+    /**
+     * 展示出库实绩
+     *
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/getWmspOutboundResult", method = RequestMethod.POST)
+    Map<String, Object> getWmspOutboundResult(@RequestBody(required = false) Map<String, Object> map,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer warehouseId,
+                                              @RequestParam String  startTime,
+                                              @RequestParam String  endTime);
+
+    /**
+     * 新增出库实绩
+     *
+     * @param mapval
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/insertWmspOutBoundResult", method = RequestMethod.POST)
+    Map<String, Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval);
+
+    /**
+     * 逻辑删除出库单
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/deletewmspOutboundResult")
+    Map<String, Object> deleteWmspOutboundResult(@RequestParam Integer resultId);
+
+    /**
+     * 新增出库扫描实绩
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertwmspOutboundScanResult")
+    Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 复制新增出库扫描
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/copyWmspOutboundScanResult")
+    Map<String, Object> copyWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 删除出库扫描
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/deleteWmspOutboundScanResult")
+    Map<String, Object> deleteWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 装卸工PDA前端点击出库
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping("/api/v1/wms/wmspoutboundresults/outbountResultToSuccess")
+    Map<String, Object> outbountResultToSuccess(@RequestParam Integer resultId);
+
+    /**
+     * 更新出库状态
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/updataResultStatus")
+    Map<String, Object> updataResultStatus(@RequestBody(required = false) Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/getRmsMaterial")
+    Map<String, Object> getRmsMaterial(@RequestBody(required = false) Map<String, Object> mapval);
+
+    /**
+     * 展示实时库存数据
+     *
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialList", method = RequestMethod.POST)
+    Map<String, Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> map,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam String warehouseId,
+                                               @RequestParam String time,
+                                               @RequestParam String con);
+
+    /**
+     * 展示实时库存数据
+     *
+     * @param
+     * @param
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/getGridMaterialAgeList", method = RequestMethod.POST)
+    Map<String, Object> getGridMaterialAgeList(@RequestBody(required = false) Map<String, Object> map,
+                                               @RequestParam Integer warehouseId);
+
+    /**
+     * 通过成品仓库网格ID查询实时库存数据
+     *
+     * @param gridId
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialListByGridId", method = RequestMethod.POST)
+    Map<String, Object> selectGridMaterialListByGridId(@RequestParam BigDecimal gridId);
+
+    /**
+     * 修改物资钢材表的质量是否合格字段和逻辑删除
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspgridmaterials/updateRmsMaterialSteelDemotion")
+    Map<String, Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String, Object> map);
+
+    /**
+     * 钢材异地库出库扫描
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/OutScanResultTag")
+    Map<String, Object> OutScanResultTag(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 获取钢材异地库出库数据
+     *
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/getWmsOffsiteLibaryOutboundList", method = RequestMethod.POST)
+    Map<String, Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String, Object> map,
+                                                        @RequestParam("pageNum") Integer pageNum,
+                                                        @RequestParam("pageSize") Integer pageSize,
+                                                        @RequestParam("apiId") Integer apiId,
+                                                        @RequestParam("con") String con);
+
+    /**
+     * 展示钢材异地库入库实绩表
+     *
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/getWmsOffsiteLibaryInboundList", method = RequestMethod.POST)
+    Map<String, Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String, Object> map,
+                                                       @RequestParam Integer apiId,
+                                                       @RequestParam Integer pageNum,
+                                                       @RequestParam Integer pageSize,
+                                                       @RequestParam String con);
+
+    /**
+     * 钢材异地库入库扫描新增异地库入库实绩
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/insertOffsiteLibraryInbound")
+    Map<String, Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * //展示在途库存列表
+     *
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspintransitinventorys/getWmspIntransitInventory", method = RequestMethod.POST)
+    Map<String, Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapval,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam String con);
+
+
+    /**
+     * 新增倒库出库实绩
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertOutBoundResult")
+    Map<String, Object> insertOutBoundResult(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * //新增倒库出库扫描实绩
+     *
+     * @param mapval
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/AddWmspOutboundScanResult")
+    Map<String, Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval);
+
+    /**
+     * 通过下拉框筛选数据
+     *
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @param warehouseid
+     * @param gradtionNumber
+     * @param stackingId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/getWmspRestackMakeResultList")
+    Map<String, Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                     @RequestParam Integer apiId,
+                                                     @RequestParam Integer pageNum,
+                                                     @RequestParam Integer pageSize,
+                                                     @RequestParam Integer warehouseid,
+                                                     @RequestParam Integer stackingId,
+                                                     @RequestParam Integer gradtionNumber
+    );
+
+    /**
+     * 添加倒垛单实绩
+     *
+     * @param mapval
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/addRestackMakeResult")
+    Map<String, Object> addRestackMakeResult(@RequestBody Map<String, Object> mapval);
+
+
+    @PostMapping("/api/v1/wms/wmsprestackdrivingresults/updateInstruction")
+    Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map);
+
+
+    /**
+     * 删除倒垛单
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/deleteByResultId/{resultId}")
+    Map<String, Object> deleteByResultId(@PathVariable String resultId);
+
+    /**
+     * 下发倒垛单pc端
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/dispatchDistrubtionStatus/{resultId}")
+    Map<String, Object> dispatchDistrubtionStatus(@PathVariable String resultId);
+
+    /**
+     * 下拉框获取层次
+     *
+     * @param warehouseid
+     * @param stackingId
+     * @return
+     */
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectGardationNumber")
+    Map<String, Object> selectGardationNumber(@RequestParam Integer warehouseid,
+                                              @RequestParam Integer stackingId);
+
+    /**
+     * 下拉框获取垛位
+     *
+     * @param warehouseid
+     * @return
+     */
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectStackingId")
+    Map<String, Object> selectStackingId(@RequestParam Integer warehouseid);
+
+    /**
+     * 下拉框获取仓库名称
+     *
+     * @return
+     */
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectWarehouse")
+    Map<String, Object> selectWarehouse();
+
+    /**
+     * 展示倒垛单
+     *
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @param DistrubtionStatus
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
+    Map<String, Object> selectRestackList(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer DistrubtionStatus
+    );
+
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList2")
+    Map<String, Object> selectRestackList2(@RequestBody(required = false) Map<String, Object> map,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer DistrubtionStatus
+    );
+
+    /**
+     * 修改倒垛单
+     *
+     * @param mapval
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/editRestackMakeResult")
+    Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapval);
+
+    /**
+     * 渲染倒垛后的仓库信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterWarehouseByResultId/{resultId}")
+    Map<String, Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId);
+
+    /**
+     * 渲染倒垛后的垛位信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterstackingByResultId/{resultId}")
+    Map<String, Object> selectAfterstackingByResultId(@PathVariable Integer resultId);
+
+    /**
+     * PDA展示倒垛单
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackForPDA")
+    Map<String, Object> selectRestackForPDA(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/getRestackInfoByResultId")
+    public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam Integer apiId
+
+    );
+
+    /**
+     * PDA根据实绩id查找物资信息
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectMaterialInfoByResultId")
+    Map<String, Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * PDA根据仓库id查找倒垛单
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackByWarehouseId")
+    Map<String, Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 库管员扫描吊牌添加扫描实绩
+     *
+     * @param mal
+     * @return
+     */
+
+    @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/ScanTagResult")
+    Map<String, Object> ScanTagResult(@RequestBody(required = false) Map<String, Object> mal);
+
+
+    @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
+    Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/wms/inboundResult/getFurnaceNoAmount")
+    Map<String, Object> getFurnaceNoAmount(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 库管员下发倒垛单
+     *
+     * @param mapList
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/Issue")
+    Map<String, Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList);
+
+    /**
+     * 展示退库实绩
+     *
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getWmsReboundResult", method = RequestMethod.POST)
+    RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam String con);
+
+
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/selectScanResultByIboundResultId", method = RequestMethod.POST)
+    RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @RequestParam Integer inboundId
+    );
+
+    //根据物资信息查找暂存的垛位
+    @PostMapping("/api/v1/wms/reboundResult/selectInfoByMaterialCode")
+    Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal);
+
+    //根据仓库id查询未接收的垛位
+    @PostMapping("/api/v1/wms/inboundScanResult/selectStackingInfoByWarehouseId")
+    Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal);
+
+    //更新垛位
+    @PostMapping("/api/v1/wms/inboundScanResult/updateStatus")
+    Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> mal);
+
+    /**
+     * 展示倒库实绩
+     *
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsIvboundResult", method = RequestMethod.POST)
+    RESTfulResult getWmsIvboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize);
+
+
+    /**
+     * 展示倒库物资实绩
+     *
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getWmsIvboundMaterial", method = RequestMethod.POST)
+    RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
+
+    /**
+     * 库存盘点实绩
+     */
+    @RequestMapping(value = "/api/v1/wms/inventoryCheck/getInventoryCheck", method = RequestMethod.POST)
+    RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
+
+
+    /**
+     * 库存结转
+     *
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inventoryClose/getInventoryClose", method = RequestMethod.POST)
+    RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String value);
+
+    //库存结转定时器
+    @PostMapping(value = "/api/v1/wms/inventoryClose/addInventoryClose")
+    RESTfulResult addInventoryClose();
+
+    /**
+     * 收发存报表
+     */
+    @RequestMapping(value = "/api/v1/wms/sendReceive/getSendReceive", method = RequestMethod.POST)
+    RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam Integer apiId,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize,
+                                 @RequestParam String con,
+                                 @RequestParam String startTime,
+                                 @RequestParam String endTime
+                                 );
+
+    /**
+     * 展示未下发吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/inboundScanResult/getTagResult")
+    Map<String, Object> getTagResult();
+
+    /**
+     * 展示已入库吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIssuedTagResult", method = RequestMethod.POST)
+    Map<String, Object> getIssuedTagResult();
+
+    /**
+     * 展示异常入库吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIssuedTagNoResult", method = RequestMethod.POST)
+    Map<String, Object> getIssuedTagNoResult();
+
+    /**
+     * 展示退库已下发吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getReIssuedResult", method = RequestMethod.POST)
+    Map<String, Object> getIssuedResult();
+
+    /**
+     * 展示未下发退库吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getReTagResult", method = RequestMethod.POST)
+    Map<String, Object> getReTagResult();
+
+    /**
+     * 展示已倒库入库吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIvIssuedResult", method = RequestMethod.POST)
+    Map<String, Object> getIvIssuedResult();
+
+    /**
+     * 展示倒库入库未下发退库吊钢工扫描吊牌实绩
+     *
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIvTagResult", method = RequestMethod.POST)
+    Map<String, Object> getIvTagResult();
+
+    /**
+     * 新增入库实绩，返回选择垛位
+     *
+     * @param mapList
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/insertInboundResult", method = RequestMethod.POST)
+    Map<String, Object> insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
+
+    /**
+     * 新增退库实绩，返回选择垛位
+     *
+     * @param mapList
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/reboundResult/insertReboundResult", method = RequestMethod.POST)
+    String insertReboundResult(@RequestBody List<Map<String, Object>> mapList);
+
+    /**
+     * 新增倒库入库实绩，返回选择垛位
+     *
+     * @param mapList
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/insertIvboundResult", method = RequestMethod.POST)
+    String insertIvboundResult(@RequestBody List<Map<String, Object>> mapList);
+
+    /**
+     * 行车工查看垛位
+     *
+     * @param DriverId
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundStack/getInboundStack", method = RequestMethod.POST)
+    Integer getInboundStack(@RequestParam Integer DriverId);
+
+
+    /**
+     * 新增库存盘点
+     *
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundStack/getInboundStack", method = RequestMethod.POST)
+    Map<String, Object> inventoryCheck(@RequestBody Map<String, Object> map);
+
+
+    /**
+     * 新增入库扫描实绩
+     *
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertResult", method = RequestMethod.POST)
+    Map<String, Object> insertResult(@RequestBody Map<String, Object> map);
+
+
+    /**
+     * 新增退库扫描实绩
+     *
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertReboundScanResult", method = RequestMethod.POST)
+    Map<String, Object> insertReboundScanResult(@RequestBody Map<String, Object> map);
+
+
+    /**
+     * 新增倒库入库扫描实绩
+     *
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertIvboundScanResult", method = RequestMethod.POST)
+    Map<String, Object> insertIvboundScanResult(@RequestBody Map<String, Object> map);
+
+    /**
+     * 根据实绩id查找物资是否稽核完成
+     */
+    @PostMapping(value = "/api/vi/wms/wmsprestackscanresults/selectMaterialSteelIdByReusltId")
+    Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map);
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId", method = RequestMethod.POST)
+    RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize);
+
+    @RequestMapping(value = "/api/v1/wms/wmspivboundmakeresult/getIvboundMakeResultList", method = RequestMethod.POST)
+    RESTfulResult getIvboundMakeResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/addIvboundMakeResult")
+    Map<String, Object> addIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/deleteIvboundMakeResult/{resultId}")
+    Map<String, Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/selectIvboundMakeResult/{resultId}")
+    List<Map<String, Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/updateIvboundMakeResult")
+    Map<String, Object> updateIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
+
+
+    //下发给行车工
+    @PostMapping("/api/v1/wms/reboundResult/IssueToCrane")
+    Map<String, Object> IssueToCrane(@RequestBody Map<String, Object> map);
+
+    //创建组
+    @PostMapping(value = "/api/v1/wms/wmspinboundgroups/createGrop", produces = "application/json;charset=UTF-8")
+    public RESTfulResult createGrop(@RequestBody Map mapValue);
+
+    //
+    @PostMapping("/api/v1/wms/inboundScanResult/insertResult")
+    public RESTfulResult insertScanResult(@RequestBody(required = false) Map<String, Object> map) throws ParseException;
+
+    //新增入库实绩
+    @PostMapping("/api/v1/wms/inboundResult/insertInboundResult")
+    public RESTfulResult addInvoice(@RequestParam("userName") String userName, @RequestParam("groupId") BigDecimal groupId, @RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList);
+
+    //加入分组
+    @PostMapping(value = "/api/v1/wms/wmspinboundgroups/joinGroup", produces = "application/json;charset=UTF-8")
+    public RESTfulResult joinGroup(@RequestBody Map mapValue);
+
+    //获得抢单信息
+    @PostMapping("/api/v1/wms/wmspinbounddistributes/grabDistribute")
+    public RESTfulResult grabDistribute(@RequestBody Map<String, Object> mapValue);
+
+    //抢单
+    @GetMapping("/api/v1/wms/wmspinbounddistributes/getNewDistribute")
+
+    public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
+
+
+//
+//    @PostMapping("/api/v1/wms/wmsprestackmakeresults/createRestackMakeResult")
+//    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+//                                                  @RequestParam("beforeLevel")BigDecimal  beforeLevel,
+//                                                  @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
+//                                                  @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
+//                                                  @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+//                                                  @RequestParam("resultRemark")String resultRemark,
+//                                                  @RequestBody(required = false) List<Map<String,Object>> mps);
+    @GetMapping("/api/v1/wms/wmsprestackmakeresults/selectRestackByWarehouseIds")
+    public  Map<String, Object> selectRestackByWarehouseIds(@RequestParam(required = true) String warehouseid);
+    @GetMapping("/api/v1/wms/wmsprestackmaketyperesults/getRestackMakeTypeResult")
+    public Map<String, Object> getRestackMakeTypeResult(@RequestParam("restackMake") String restackMake,@RequestParam("context")String context);
+
+    @PostMapping(value = "/api/v1/wms/wmspgridmaterials/getMaterialTypeList")
+    Map<String, Object> getMaterialTypeList(@RequestParam("warehouseid") String warehouseid,
+                                            @RequestParam("stackingId") BigDecimal stackingId,
+                                            @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
+                                            @RequestParam(name = "pageNum") Integer pageNum,
+                                            @RequestParam(name = "pageSize") Integer pageSize,
+                                            @RequestParam("apiId") Integer apiId);
+
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/createRestackMakeResult")
+    Map<String, Object> createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+                                                @RequestParam("beforeLevel") BigDecimal beforeLevel,
+                                                @RequestParam(name = "afterStackingId", defaultValue = "20") BigDecimal afterStackingId,
+                                                @RequestParam("afterWarehouseId") BigDecimal afterWarehouseId,
+                                                @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+                                                @RequestParam("resultRemark")String resultRemark,
+                                                @RequestBody(required = false) List<Map<String,Object>> mps);
+    @GetMapping("/api/v1/wms/wmspoutboundresults/getInitOutboundScanResultMaterialInfo")
+    public RESTfulResult getInitOutboundScanResultMaterialInfo(@RequestParam(value = "resultId",required = true) BigDecimal resultId);
+    @PostMapping("/api/v1/wms/wmspoutboundresults/deleteGridMaterial")
+    public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode);
+
+
+
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/changeRestackMakeResult")
+    int changeRestackMakeResult(@RequestParam("restackMake") String restackMake);
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/updateWmspGridMaterialForRestack")
+    Map<String,Object> updateWmspGridMaterialForRestack(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/insertStockTaking")
+    Map<String,Object> insertStockTaking(@RequestParam(value = "warehouseId") String warehouseId,
+                                         @RequestParam(value = "materialCode") String materialCode,
+                                         @RequestParam(value = "quantity") Integer quantity);
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/insertReserved")
+    Map<String,Object> insertReserved(@RequestParam(value = "warehouseId") String warehouseId,
+                                      @RequestParam(value = "materialCode") String materialCode,
+                                      @RequestParam(value = "materialSpecification") String materialSpecification,
+                                      @RequestParam(value = "materialModel") String materialModel,
+                                      @RequestParam(value = "quantity") Integer quantity,
+                                      @RequestParam(value = "actuallyWeight") String actuallyWeight,
+                                      @RequestParam(value = "materialTheWeight") String materialTheWeight,
+                                      @RequestParam(value = "remark") String remark);
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/insertInbounds")
+    Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
+                                      @RequestParam(value = "materialCode") String materialCode,
+                                      @RequestParam(value = "materialSpecification") String materialSpecification,
+                                      @RequestParam(value = "materialModel") String materialModel,
+                                      @RequestParam(value = "quantity") Integer quantity);
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getStockTakingList")
+    Map<String,Object> getStockTakingList(@RequestParam(value = "pageNum") Integer pageNum,
+                                          @RequestParam(value = "pageSize") Integer pageSize,
+                                          @RequestParam(value = "apiId") Integer apiId);
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialList")
+    Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String con);
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelWarehouseList")
+    Map<String,Object> getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con);
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialModelList")
+    Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @RequestParam(value = "pageNum") Integer pageNum,
+                                                @RequestParam(value = "pageSize") Integer pageSize,
+                                                @RequestParam(value = "apiId") Integer apiId,
+                                                 @RequestParam(value = "warehouseId") Integer warehouseId,
+                                                 @RequestParam(value = "status") Integer status,
+                                                 @RequestParam(value = "startTime",required = false)String startTime,
+                                                 @RequestParam(value = "endTime",required = false)String endTime,
+                                                 @RequestParam(value = "con") String con);
+
+
+    @PostMapping("/api/v1/wms/inboundResult/changeReserved")
+    int changeReserved(@RequestBody(required = false) List<Map<String, Object>> mapList);
+
+    //出库炉号对应的数量
+    @PostMapping("/api/v1/wms/wmspoutboundresults/getWmsOutboundResultStatistics")
+    RESTfulResult getWmsOutboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam Integer apiId,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize,
+                                 @RequestParam Integer warehouseId,
+                                 @RequestParam String con,
+                                 @RequestParam String startTime,
+                                 @RequestParam String endTime);
+
+    @PostMapping("/api/v1/wms/inboundResult/undoInbound")
+    Map<String, Object> undoInbound(@RequestParam BigDecimal inboundId);
+
+    @PostMapping("/api/v1/wms/wmspoutboundresults/disorderlyOutbound")
+    Map<String, Object> disorderlyOutbound(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/wms/wmshgridmaterials/gePortStockList")
+    Map<String, Object> gePortStockList(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    @PostMapping("/api/v1/wms/platformWarehouse/platformInbound")
+    Map<String, Object> platformInbound(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/wms/platformWarehouse/afterInwardOutbound")
+    Map<String, Object> afterInwardOutbound(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getTheoreticalByInfo")
+    Map<String, Object> getTheoreticalByInfo(@RequestParam String warehouseId,
+                                             @RequestParam String materialCode,
+                                             @RequestParam String materialSpecification,
+                                             @RequestParam String materialModel,
+                                             @RequestParam Integer status,
+                                             @RequestParam Integer num);
+
+    @PostMapping("/api/v1/wms/inboundEas/getInboundEasInfo")
+    Map<String, Object> getInboundEasInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer warehouseId,
+                                          @RequestParam String startTime,
+                                          @RequestParam String endTime);
+
+    @PostMapping("/api/v1/wms/inboundEas/reduceInboundEas")
+    Map<String, Object> reduceInboundEas(@RequestParam Integer inboundEasId);
+
+    @PostMapping("/api/v1/wms/platformWarehouse/listAfterInwardOutbound")
+    Map<String, Object> listAfterInwardOutbound(@RequestBody List<Map<String, Object>> mapList);
+
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/deleteInboundMaterial")
+    Map<String, Object> deleteInboundMaterial(@RequestParam("warehouseId") String warehouseId,
+                                              @RequestParam("materialCode") String materialCode,
+                                              @RequestParam("materialSpecification") String materialSpecification,
+                                              @RequestParam("materialModel") String materialModel,
+                                              @RequestParam("quantity") Integer quantity);
+
+    @PostMapping("/api/v1/wms/inboundScanResult/recordScanResult")
+    Map<String, Object> recordScanResult(@RequestBody Map<String, Object> map);
+
+}

src/main/java/com/steerinfo/dil/feign/WMSHFeign.java

@@ -0,0 +1,162 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/12 9:54
+ * @Version:V2.0
+ */
+@FeignClient(value = "dil-wmsh-api", url = "${openfeign.WMSHFeign.url}")
+public interface WMSHFeign {
+
+    /**
+     * 展示下游港口港存库库存列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getUnloadPortStockList")
+    RESTfulResult getUnloadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId);
+
+    /**
+     * 展示万州港港存库库存列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getLoadPortStockList")
+    RESTfulResult getLoadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam Integer pageNum,
+                                       @RequestParam Integer pageSize,
+                                       @RequestParam Integer apiId,
+                                       @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getDownPortStockList")
+    RESTfulResult getDownPortStockList(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getRunStockList")
+    RESTfulResult getRunStockList(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    /**
+     * 查询所有港存库入库实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/getInBoundResult")
+    RESTfulResult getInBoundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                               @RequestParam Integer apiId,
+                               @RequestParam Integer pageNum,
+                               @RequestParam Integer pageSize);
+
+    /**
+     * 新增港存库入库实绩
+     *
+     * @param wmshInboundResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/addWarehousingResult")
+    RESTfulResult addWarehousingResult(@RequestBody(required = false) Map<String, Object> wmshInboundResult);
+
+    /**
+     * 通过实绩Id查询实绩
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/getResultById/{resultId}")
+    RESTfulResult getResultById(@PathVariable("resultId") Integer resultId);
+
+    /**
+     * 逻辑删除港存库入库实绩
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/deleteWareHosingResult/{resultId}")
+    RESTfulResult deleteWareHosingResult(@PathVariable("resultId") Integer resultId);
+
+    /**
+     * 修改港存库入库实绩
+     *
+     * @param wmshInboundResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/updateWareHosingResult")
+    RESTfulResult updateWareHosingResult(@RequestBody Map<String, Object> wmshInboundResult);
+
+    /**
+     * 查询所有港存库出库实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshoutboundresults/getOutBoundResult")
+    RESTfulResult getOutBoundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                               @RequestParam Integer apiId,
+                               @RequestParam Integer pageNum,
+                               @RequestParam Integer pageSize);
+
+    /**
+     * 添加港存库出库实绩
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshoutboundresults/addResult")
+    RESTfulResult addResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/findInboundDetail")
+    RESTfulResult findInboundDetail(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/wmsh/wmshoutboundresults/findOutboundDetail")
+    RESTfulResult findOutboundDetail(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/clearWmshGridMaterial")
+    RESTfulResult clearWmshGridMaterial(@RequestBody(required = false) Map<String, Object> wmshInboundResult);
+
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getLoadPortStockByMaterialName")
+    RESTfulResult getLoadPortStockByMaterialName(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 @RequestParam("pageNum") Integer pageNum,
+                                                 @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("apiId") Integer apiId,
+                                                 @RequestParam("con")String con);
+
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getUnLockPortStock")
+    RESTfulResult getUnLockPortStock(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("con") String con ,
+                                     @RequestParam("activeName")String activeName,
+                                     @RequestParam("startTime")String startTime,
+                                     @RequestParam("endTime")String endTime);
+
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/selectLoadResult")
+    Map<String,Object> selectLoadResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam("con") String con);
+}

src/main/java/com/steerinfo/dil/interceptors/MyLocaleChangeInterceptor.java

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.interceptors;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/4/23 8:19
+ * @Version 1.0
+ */
+
+@Configuration
+public class MyLocaleChangeInterceptor {
+
+    //国际化配置
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor(){
+        return new LocaleChangeInterceptor();
+    }
+
+}

src/main/java/com/steerinfo/dil/mapper/BackgroundProcessingMapper.java

@@ -0,0 +1,82 @@
+package com.steerinfo.dil.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.mapstruct.Mapper;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface BackgroundProcessingMapper {
+    //通过采购订单号关闭一车多趟
+    int closePurOrderMoreTrips(String purchaseOrderNo);
+
+    Integer getOrderType(Map<String, Object> map);
+
+    int updatePurOrderOrgId(Map<String, Object> map);
+
+    Map<String, Object> getOrderMesByOrderNum(String orderNumber);
+
+    ArrayList<Integer> getAllPurOrder(String purchaseOrderNo);
+
+    int deleteOrders(ArrayList<Integer> list);
+
+    int deleteOrderMaterials(ArrayList<Integer> list);
+
+    int batchByOrderIdForTotalDelete(ArrayList<Integer> list);
+
+    List<Integer> enFactoryCheck(BigDecimal resultTotalId);
+    List<Integer> loadCheck(BigDecimal resultTotalId);
+    List<Integer> unloadCheck(BigDecimal resultTotalId);
+    List<Integer> weightCheck(BigDecimal resultTotalId);
+    List<Integer> outFactoryCheck(BigDecimal resultTotalId);
+
+    List<Map<String, Object>> getEnFactoryResult(@Param("resultTotalId") BigDecimal resultTotalId,@Param("sqe") Integer sqe);
+
+    List<Map<String, Object>> loadResult(@Param("resultTotalId") BigDecimal resultTotalId,@Param("sqe") Integer sqe);
+
+    List<Map<String, Object>> unloadResult(@Param("resultTotalId") BigDecimal resultTotalId,@Param("sqe") Integer sqe);
+
+    List<Map<String, Object>> weightResult(@Param("resultTotalId") BigDecimal resultTotalId,@Param("sqe") Integer sqe);
+
+    List<Map<String, Object>> outFactoryResult(@Param("resultTotalId") BigDecimal resultTotalId,@Param("sqe") Integer sqe);
+
+    int deleteEnFactoryUnnecessaryResult(@Param("list") List<Integer> list);
+
+    int deleteLoadUnnecessaryResult(@Param("list") List<Integer> list);
+
+    int deleteUnloadUnnecessaryResult(@Param("list") List<Integer> list);
+
+    int deleteWeightUnnecessaryResult(@Param("list") List<Integer> list);
+
+    int deleteOutFactoryUnnecessaryResult(@Param("list") List<Integer> list);
+
+    int allowEnfactory(String orderNumber);
+
+    int updateOrderCanWork(String orderNumber);
+
+    int updateOrderStatus(Map<String, Object> map);
+
+    //根据总实绩无差别删除多余计量实绩，仅保留一条
+    int deleteExtraWeight(BigDecimal resultTotalId);
+
+    //根据总实绩无差别删除多余装货实绩，仅保留一条
+    int deleteExtraLoad(BigDecimal resultTotalId);
+
+    //根据总实绩无差别删除多余卸货实绩，仅保留一条
+    int deleteExtraUnload(BigDecimal resultTotalId);
+
+    //插入待传金蝶表格
+    int insertNotUpload(Map<String,Object> map);
+
+    //重置钢材打印数量
+    int resetPrintNumber(Map<String,Object> map);
+
+    //查询钢材车辆进厂并且没有净重的总实绩
+    Map<String,Object> getDetailsForEnAndQue(Map<String,Object> map);
+
+    //清空进厂信息
+    int clearEnDetails(Map<String,Object> map);
+}

src/main/java/com/steerinfo/dil/mapper/DilCidCapacityMapper.java

@@ -0,0 +1,16 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.DilCidCapacity;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface DilCidCapacityMapper extends IBaseMapper<DilCidCapacity, BigDecimal> {
+
+    @Select("select seq_dil_cid_capacityNo.nextval from dual")
+    BigDecimal getCidMax();
+
+    Integer selectByCidAndCapacityNo(String cid, String capacityNo);
+}

src/main/java/com/steerinfo/dil/mapper/DilRoleOrgcodeTableMapper.java

@@ -0,0 +1,21 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.DilRoleOrgcodeTable;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+@Mapper
+public interface DilRoleOrgcodeTableMapper extends IBaseMapper<DilRoleOrgcodeTable, BigDecimal> {
+
+    @Select("select seq__dilTableColumn.nextval from dual")
+    BigDecimal getPrimaryId();
+
+    int updateEnableStatus(Map<String, Object> map);
+
+    int deleteSchmenLColumnData(Map<String, Object> map);
+
+}

src/main/java/com/steerinfo/dil/mapper/DilTableColumnRoleMapper.java

@@ -0,0 +1,13 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.DilTableColumnRole;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface DilTableColumnRoleMapper extends IBaseMapper<DilTableColumnRole, BigDecimal> {
+    BigDecimal selectColumnId(String s, String tableName);
+
+}

src/main/java/com/steerinfo/dil/mapper/DilVersionMapper.java

@@ -0,0 +1,25 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.DilVersion;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface DilVersionMapper extends IBaseMapper<DilVersion, BigDecimal> {
+
+    //查询最大主键
+    @Select("select max(DV.VERSION_ID) + 1 from DIL_VERSION DV")
+    BigDecimal selectMaxId();
+
+    //查询最新的APP版本号
+    String getAppVersion();
+
+    //查询最新的PDA版本号
+    String getPDAVersion();
+
+    //查询版本号是否已存在
+    Integer getVersionId(String version);
+}

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -0,0 +1,404 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.OmstruckOrder;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecimal> {
+    //根据销售订单id查找销售订单信息
+    List<Map<String, Object>> selectSaleNumberForCarrier(Integer saleOrderId);
+
+    //查询已接收的焦炭发运计划
+    List<Map<String, Object>> selectCokeDayPlanAndRecived(Map<String, Object> map);
+
+    //查询已接收的水渣发运计划
+    List<Map<String, Object>> selectWaterSlagDayPlanAndRecived(Integer carrierId);
+
+    //查询所有运输订单信息 状态：3
+    //查询所有已下发运输订单 状态：4
+    List<Map<String, Object>> getAllTruckOrder(Map<String, Object> map);
+
+    //查询最大主键Id
+    @Select("select seq_omstruck_order.nextval from dual")
+    BigDecimal selectMaxId();
+
+    //通过运输订单Id查询运输订单号
+    String getOrderNumberByOrderId(Integer orderId);
+
+    //通过运输订单号查询运输订单ID
+    Integer getOrderIdByOrderNumber(String orderNumber);
+
+    //查询所有运力信息
+    List<Map<String, Object>> getAllCapacity(Map<String, Object> map);
+
+    //通过运力Id 或 车牌号 修改运输状态
+    int updateCapacityByCarIdOrNum(Map<String, Object> map);
+
+    int updateCapacityById(Map<String, Object> map);
+
+    //通过运输订单ID 或 运输订单号 查询运力Id
+    BigDecimal getCapacityIdByOrderOrNum(Map<String, Object> map);
+
+    //通过ID获取派单时间
+    Date getInsertTimeById(Integer orderId);
+
+    //通过车牌号查询运力id
+    BigDecimal getCapacityIdByCapacityNum(String capacityNumber);
+
+    //司机接单调用接口 通过运力Id匹配  /  通过运单ID查询运单信息 APP
+    //查询所有接单或拒绝接单的订单 PC -- 采购
+    List<Map<String, Object>>   getTruckOrderByCapacityNum(Map<String, Object> map);
+
+    //查询所有接单或拒绝接单的订单 PC -- 销售
+    List<Map<String, Object>> getSaleTruckOrderByCapacityNum(Map<String, Object> map);
+
+    //查询司机所有已拒绝过的订单
+    List<Map<String, Object>> getReceiveRefuseOrderByCapacityId(Map<String, Object> map);
+
+    //  通过运输订单号或运输订单ID查询总实绩ID和订单类型
+    Map<String, Object> getResultTotalIdByOrderNumAndId(Map<String, Object> map);
+
+    // 通过运输订单Id查询运输订单子表有几种物资 ：物资ID
+    List<Integer> getMaterialIdListByOrderId(Integer orderId);
+
+    // 查询实绩地点和时间
+    List<Map<String, Object>> selectPlaceAndTime(BigDecimal orderId);
+
+    //通过运单号查询运单信息
+    List<Map<String, Object>> getOrderByOrderId(BigDecimal orderId);
+
+    //通过运输订单号查询预设路径的作业点ID  及 总实绩ID
+    Map<String, Object> getPointIdByOrderNum(Map<String, Object> map);
+
+    //运输派单
+    List<Map<String, Object>> getTransportDispatch(Map<String, Object> map);
+
+    //查询已下发未接受的销售订单信息
+    List<Map<String, Object>> getOrderUnReceive(BigDecimal orderType);
+
+    //查询已下发已接受的销售订单信息
+    List<Map<String, Object>> getOrderReceived(BigDecimal orderType);
+
+    //通过销售订单物资ID查找物资理重和物资件数
+    Map<String, Object> selectTheoreticalWeightAndMaterialNumber(Integer saleOrderMaterialId);
+
+    //销售物流：展示已经形成订单的水渣发运计划
+    List<Map<String, Object>> selectWaterSlagForOrder(Map<String, Object> map);
+
+    //销售物流：展示已经形成订单的焦炭发运计划
+    List<Map<String, Object>> selectCokeRailPlanForOrder(Map<String, Object> map);
+
+    //通过车序号表id查找物资id
+    List<Map<String, Object>> selectMaterialIdBysaleOrderMaterialId(Integer saleOrderMaterialId);
+
+    //查找司机排班表信息
+    List<Map<String, Object>> selectCapacityAndDriver(Map<String, Object> map);
+
+    //通过用户id查找用户姓名
+    String selectPersonNameByPersonnelId(Integer personnelId);
+
+    //通过车牌号、承运商匹配最新的运力id
+    BigDecimal selectCapacityId(BigDecimal carrierId, String capacityNumber);
+
+    //通过运输订单ID查询数据 用于websocket推送数据
+    Map<String, Object> pushMesToWebsocket(Map<String, Object> map);
+
+    //通过物资id查询批次表匹配最新的批次，关联最新的采购订单号
+    Map<String, Object> selectNewOrderId(Map<String, Object> map);
+
+    //查询所有的收货单位
+    List<Map<String, Object>> getReceivingUnit();
+
+    //查询所有的发货单位
+    List<Map<String, Object>> getSupplier();
+
+    //通过采购订单号查找采购订单ID
+    BigDecimal getPurchaseOrderIdByNo(String purchaseOrderNo);
+
+
+    //App
+    //查询主干信息
+    Map<String, Object> getSaleTruckOrderByCapacityId(Map<String, Object> map);
+
+    //查询物资信息
+    List<Map<String, Object>> getSaleTruckOrderByCapacityNumMaterial(Map<String, Object> map);
+
+    //根据发运计划id查找物资id
+    Map<String, Object> selectMaterialIdAndWeightByDayPlanId(Integer dayPlanId);
+
+    //销售模块，查看所有订单
+    List<Map<String, Object>> selectAllOrderForSale(Map<String, Object> map);
+
+    //根据车序号id查找销售订单
+    List<Map<String, Object>> selectSaleBySaleOrderMaterialId(Integer saleOrderMaterialId);
+
+
+    //销售：接收运输订单展示pc端界面
+    List<Map<String, Object>> selectTransportOrderForSale(Map<String, Object> map);
+
+    List<Map<String, Object>> selectTransportOrderForSale1(Map<String, Object> map);
+
+    //销售：根据承运商查找承运商
+    List<Map<String, Object>> selectSaleMaterialIdByCarrierId(Integer carrierId);
+
+    //根据承运商查找销售订单
+    List<Map<String, Object>> selectSteelSaleForCarrier(Map<String, Object> map);
+
+    //根据销售订单id查找信息
+    List<Map<String, Object>> selectInfoBySaleOrderId(Integer saleOrderId);
+
+    //根据承运商查找发运计划
+    List<Map<String, Object>> selectCokeRailPlan(Map<String, Object> map);
+
+    //根据发运计划查找信息
+    List<Map<String, Object>> selectInfoByDayPlanId(Map<String, Object> map);
+
+    // 车牌号下拉
+    List<Map<String, Object>> getDriverCapacity();
+
+    // 派单信息
+    Map<String, Object> getTruckNoDispatchMap(BigDecimal dispatchId);
+
+    // 物资信息
+    List<Map<String, Object>> getMaterialMessages(BigDecimal dispatchId);
+
+    // 得到销售订单与物资中间表id
+    BigDecimal getSaleMaterialId(BigDecimal dispatchId);
+
+    // 根据车牌号查询运力id
+    BigDecimal getCapacityId(String capacityNumber);
+
+    // 根据运力id查询司机排班id
+    BigDecimal getDriverCapacityId(BigDecimal capacityId);
+
+    List<Map<String,Object>> getCapacityAndDriver(Map<String,Object> mapValue);
+
+    List<BigDecimal> getNullOrNotNull(BigDecimal dispatchId);
+
+    BigDecimal getInwardMaterial(BigDecimal planId);
+
+    List<Map<String, Object>> getInwardOrderList(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getResultList(BigDecimal driverCapacityId);
+
+    Map<String, Object> sendOrderToApp(Map<String, Object> map);
+
+    Map<String, Object> getSaleOrderMap(BigDecimal orderId);
+
+    Map<String, Object> getSteelInwardOrderMap(BigDecimal orderId);
+
+    Map<String, Object> getPurchaseOrderMap(BigDecimal orderId);
+
+    Map<String, Object> getInwardOrderMap(BigDecimal orderId);
+
+    //通过订单Id查询该订单下所有的物资
+    List<Map<String,Object>> getMaterialMes(@Param("orderId") BigDecimal orderId, @Param("steelJudge") String steelJudge);
+
+    //通过订单Id查询该订单下所有的物资
+    List<Map<String,Object>> getMaterialMesForGrossWeight(BigDecimal orderId, String steelJudge);
+
+    //通过订单Id查询该订单下所有的物资
+    List<Map<String,Object>> getMaterialMesNew(@Param("orderId") BigDecimal orderId, @Param("steelJudge") String steelJudge);
+
+    //根据运输订单查询车牌号
+    String selectCapacityNumber(BigDecimal orderId);
+
+    //根据运输订单查询运输状态
+    BigDecimal selectOrderType(BigDecimal orderId);
+
+    BigDecimal selectOrderId(BigDecimal dcId);
+
+    //查询采购订单数据 给司机
+    Map<String, Object> getCGOrderMessageToApp(Map<String, Object> map);
+
+    //查询内转运输订单给APP 9 10 11
+    Map<String, Object> getNZOrderMessageToApp(Map<String, Object> map);
+
+    //查询采购零星物资订单给app 12 13 14
+    Map<String,Object>  getSporadicOrder(Map<String, Object> map);
+
+    //查询发运计划运输订单给APP  2 3 4
+    Map<String, Object> getFYJHOrderMessageToApp(Map<String, Object> map);
+
+    //查询销售运输订单给APP 1
+    Map<String, Object> getXSOrderMessageToApp(Map<String, Object> map);
+
+
+    //通过运输订单号查询运输订单类型
+    Integer getOrderTypeByOrderNumber(@Param("orderId") BigDecimal orderId);
+
+    //通过车牌号查询该车牌下所有已下发 未接收 的 订单Id （4）
+    List<Map<String, Object>> getOrderIdListByCapacityNumber(String capacityNumber);
+
+    //通过车牌号查询该车牌下所有已接收的订单ID （5）
+    List<Integer> getReceiveOrderIdListByCapacityNum(String capacityNumber);
+
+    //通过车牌号查询运输订单号和运输订单ID
+    List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(String capacityNumber);
+
+    //通过运输订单Id或运输订单号查询订单类型
+    Integer getOrderTypeByOrderId(BigDecimal orderId);
+
+    // 销售中的运输订单
+    Map<String, Object> getSaleMap(BigDecimal orderId);
+
+    // 内转钢材的运输订单
+    Map<String, Object> getSteelInwardMap(BigDecimal orderId);
+
+    // 采购的运输订单
+    Map<String, Object> getPurchaseMap(BigDecimal orderId);
+
+    // 内转的运输订单
+    Map<String, Object> getInwardMap(BigDecimal orderId);
+
+    // 判断是走采购，销售还是内转
+    List<Map<String, Object>> getResultListByCapacity(String capacityNumber);
+
+    // 通过卸货点名称查询卸货点id
+    BigDecimal getUnloadPointId(String unloadPoint);
+
+    // 通过ssoId查询承运商id
+    BigDecimal getCarrierIdBySSO(String carrierSsoId);
+
+    List<Map<String, Object>> getOrderMaterialList(BigDecimal orderId);
+
+    //通过订单查询趟次
+    Map<String,Object> getSporadicOrderTimes(BigDecimal orderId);
+
+
+
+    //根据运输订单id查找所有实绩id
+    List<Map<String,Object>> getAllResultId(BigDecimal orderId);
+
+    //查询订单是否确认
+    Integer getDriverConfirmation(BigDecimal orderId);
+
+    //查看当前订单最大路段顺序号 与当前订单路段顺序号
+    Map<String, Object> getMaxLineSeqByOrderId(BigDecimal orderId);
+
+    //查看配置表的相关信息
+    String getDilVersion();
+
+    //查询运输订单的送货单打印信息
+    BigDecimal getPrintNumber(BigDecimal orderId);
+
+    //通过订单id查询零星订单id，运力id
+    Map<String, Object> getSporadicOrdermapAddOrder(BigDecimal orderId);
+
+    //判断是否是钢材
+    BigDecimal getIsSteel(BigDecimal lineId);
+
+    //通过定向派单ID查询车序号表中的priceId
+    BigDecimal getPriceIdByDispatchId(BigDecimal dispatchId);
+//
+//    //通过订单查询趟次
+//    Integer getSporadicOrderTimes(BigDecimal orderId);
+   //删除计重实绩
+   int deleteWeightResult(BigDecimal resultTotalId);
+
+   //删除装货实绩
+   int deleteLoadResult(BigDecimal resultTotalId);
+
+   //删除出厂实绩
+   int deleteLeaveResult(BigDecimal resultTotalId);
+
+   //删除卸货实绩
+   int deleteUnloadResult(BigDecimal resultTotalId);
+
+   //删除进厂实绩
+   int deleteEnResult(BigDecimal resultTotalId);
+
+   //判断计时实绩是否已经存在
+    int getTimeTaskByTotalId(BigDecimal resultTotalId);
+
+   List<Map<String, Object>> getPurInwardOrderList(Map<String, Object> mapValue);
+
+   Map<String, Object> selectOrderMap(BigDecimal orderId);
+
+    int refuseCtrlZ(Map<String, Object> map);
+
+    Map<String, Object> getInwardOrderMessageToApp(Map<String, Object> map);
+
+    //计时订单
+    Map<String, Object> getInwardTimeOrderMessageToApp(Map<String, Object> map) throws Exception ;
+    //根据运输订单号查找需要用车时长
+    Map<String,Object>  selectInwardTimeByOrderId(BigDecimal orderId);
+
+    List<Map<String, Object>> getTimeTaskEndDetail(Map<String, Object> map);
+
+    List<Map<String, Object>> getPauseTimeTaskDetail(Integer orderId);
+
+    Map<String, Object> getInwardOrderMessage(Map<String, Object> map);
+
+     //删除计时实绩
+    int deleteTimeTaskByTotalId(BigDecimal resultTotalId);
+
+    int closeTruckOrder(BigDecimal orderId);
+
+    Map<String, Object> getSteelOrderMessageToApp(Map<String, Object> map);
+
+    List<Map<String, Object>> getLoadForLoadCarResult(Map<String, Object> map);
+    // 查询路段顺序号
+    BigDecimal getLineSeq(BigDecimal orderId);
+
+    String getCapacityNumberByCapacityId(BigDecimal capacityNumber);
+
+    //销售：接收运输订单展示pc端界面
+    List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> map);
+
+    List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
+
+    //判断是否为达钢厂区内转
+    Map<String,Object> isInwardLine(BigDecimal orderId);
+
+    // 通过运单id或者运单号查询车辆是否放行
+    String canCapacityEnfactory(Map<String, Object> mapValue);
+
+    // 出库信息
+    List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue);
+
+    // 通过运单下的物资信息
+    int closeInwardOrderByPlan(BigDecimal bigDecimal);
+
+    Map<String, Object> getInwardSteelOrderMessageToApp(Map<String, Object> map);
+
+    //查询内转多拼
+    Map<String, Object> getMulInwardOrderMessageToApp(Map<String, Object> map);
+
+    List<Map<String, Object>> getMulInwardMaterials(Map<String, Object> map);
+
+    //查询出订单的钢材长度
+    List<Map<String,Object>> getMaterialId(BigDecimal orderId);
+
+
+    int getGoBeyondCount(Object orderId);
+
+    int getMaterialNumByOrderId(Map<String, Object> map);
+
+    int deleteQueueList(BigDecimal capacityId);
+
+    int deleteQueueResult(BigDecimal resultTotalId);
+
+    int deleteQueueSpellList(BigDecimal capacityId);
+
+    Date getOrderPrintDate(BigDecimal orderId);
+
+    String getPrintFlag();
+
+    List<Map<String, Object>> materialMesNewContinue(BigDecimal orderId, String steelJudge);
+
+    List<BigDecimal> selectContinueOrderId(BigDecimal orderId);
+
+    int updateTotalResultNull(BigDecimal resultTotalId);
+
+    int clsoePlanByPlan(BigDecimal bigDecimal);
+
+}

src/main/java/com/steerinfo/dil/mapper/RmsReceivingCompanyMapper.java

@@ -0,0 +1,21 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.RmsReceivingCompany;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author xiaosh
+ */
+@Mapper
+public interface RmsReceivingCompanyMapper extends IBaseMapper<RmsReceivingCompany, BigDecimal> {
+    /**
+     * 查询所有收款客户
+     * @return 收款客户列表
+     */
+    List<RmsReceivingCompany> selectAll();
+}

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -0,0 +1,305 @@
+package com.steerinfo.dil.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.mapstruct.Mapper;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 通用接口
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:03
+ */
+
+@Mapper
+public interface UniversalMapper {
+     int updateLineSqe(Map<String, Object> map);
+
+    //通过运输订单号查询订单信息
+    Map<String, Object> getTiHuoDan(String orderNumber);
+
+    //通过运输订单号查找订单子表物资信息
+    List<Map<String, Object>> getOOMMes(String orderNumber);
+
+    //模糊查询所有物资
+    List<Map<String, Object>> queryAPOMaterialByLike(Map<String, Object> map);
+
+    //模糊查询发货单位
+    List<Map<String, Object>> querySupplierByLike(Map<String, Object> map);
+
+    //模糊查询承运商的运力信息
+    List<Map<String, Object>> getAllCapacityByCarrierLike(Map<String, Object> map);
+
+    //通过运输订单ID查询物资子表（针对多拼）
+    List<Map<String, Object>> getMaterialMesByOrderId(Map<String, Object> map);
+
+    //通过订单ID查询订单下所有物资
+    List<Map<String, Object>> getOrderMaterialMesByOrderId(BigDecimal orderId);
+
+    //通过物资ID查询该物资的发货单位信息
+    List<Map<String, Object>> getSupplierMesByMaterialId(Map<String, Object> map);
+
+    //模糊查询所有的卸货点信息
+    List<Map<String, Object>> getUnloadingMesByLike(Map<String, Object> map);
+
+    //模糊查询所有物资
+    List<Map<String, Object>> queryMaterialByLike(Map<String, Object> map);
+
+    //查询所有的批次及其关联的采购订单号
+    List<Map<String, Object>> getBatchAndOrderMes(Map<String, Object> map);
+
+    //承运商边输边查
+    List<Map<String, Object>> getCarrierMesByLike(String index);
+
+    //边输边查发货单位
+    List<Map<String, Object>> getSupplierMesByLike(String index);
+
+    //边输边查收货单位
+    List<Map<String,Object>> getConsigneeByLike(String index);
+
+    // 收货单位
+    List<Map<String, Object>> queryConsigneeByLike(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getConsigneeHistory();
+
+    // 所有物资
+    List<Map<String, Object>> selectAllMaterialName(Map<String, Object> mapValue);
+
+    // 所有承运商
+    List<Map<String, Object>> getCarrierListByLike(Map<String, Object> mapValue);
+
+    //查卸货点
+    List<Map<String, Object>> selectUnloadingPoint(String index1);
+
+    // 查询所有门岗
+    List<Map<String, Object>> getAllGatepost();
+
+    //获取承运商下拉框
+    List<Map<String,Object>> getAllCarrierIdForSso();
+
+    //根据承运商id获取userId
+    String getUserIdbyCarrierId(Integer carrierId);
+
+    // 模糊查询收货单位
+    List<Map<String, Object>> getConsigneeListByLike(Map<String, Object> mapValue);
+
+    //模糊查询所有发货单位
+    List<Map<String, Object>> queryAllSupplierByLike(Map<String, Object> mapValue);
+
+    // 通过ssoId查询承运商id
+    BigDecimal getCarrierIdBySSO(String carrierSsoId);
+
+    Integer getSaleOrderStatus(BigDecimal orderId);
+
+    //通过运输订单号查询订单类型和ID
+        Map<String, Object> getOrderMesByOrderNumber(String orderNumber);
+
+    //查询所有的门岗（下拉框）
+    List<Map<String, Object>> getAllCalculateMes();
+
+    //查询所有的焦炭子类
+    List<Map<String, Object>> getAllMaterialCoke();
+
+
+    //边输边查发货单位
+    List<Map<String, Object>> getCapacityByLike(String index);
+
+    //模糊查询批次品名
+    List<Map<String, Object>> getBatchByLike(String index);
+
+    // 根据运力id查询所有承运商
+    List<Map<String, Object>> getCarrierByCapacityId(BigDecimal capacityId);
+
+    // 根据收货客户查询承运商
+    Map<String, Object> getCarrierByConsignee(String consigneeName);
+
+    // 确认车牌号与承运商关系是否存在
+    BigDecimal isInCapacityCarrier(Map<String, Object> mapValue);
+
+    BigDecimal isInCapacity(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getOilFormula(Map<String, Object> mapValue);
+
+    //边输边查用车单位
+    List<Map<String, Object>> getRequireUnitName(String index);
+
+    //获得港口下拉框
+    List<Map<String, Object>> getPortId();
+
+    //根据车牌号查询正在运输的订单号
+    Map<String, Object> getOrderNumber(String num);
+
+    //查询车牌号
+    List<Map<String, Object>> getCapacityNumber(String num);
+
+    //根据订单Id查询物资
+    List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId);
+
+    //边输边查物资
+    List<Map<String, Object>> getMaterialByLike(String index);
+
+    Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
+
+    //边输边查物资
+    List<Map<String, Object>> getSteelMaterial(Map<String, Object> mapValue);
+
+    // 得到所有省份
+    List<Map<String, Object>> getAllProvince();
+
+    // 通过省份得到省份下面的市
+    List<Map<String, Object>> getDistrictByProvince(String addressProvince);
+
+    // 通过市得到市下面的区和县
+    List<Map<String, Object>> getTownByDistrict(String addressDistrict);
+
+    // 通过省市县得到具体地址
+    List<Map<String, Object>> getPlaceByAllAddress(Map<String, Object> mapValue);
+
+    // 得到销售员下拉
+    List<Map<String, Object>> getSalerList();
+
+    // 获得销售组
+    String getSaleArea(BigDecimal receiveId);
+
+    List<Map<String,Object>> getWarranty(String orderNumber);
+
+    List<Map<String, Object>> getCapacityType(Map<String, Object> mapValue);
+
+    Integer getPlanCount();
+
+    List<Map<String, Object>> getTransRange();
+
+
+    BigDecimal getResultMaterialId(String orderNumber);
+
+    Map<String, Object> selectNum(String orderNumber);
+
+    List<Map<String, Object>> selectOutbound(String orderNumber);
+
+    List<Map<String,Object>> getNoListCarrier();
+    //通过车牌号查询未接收的订单数量（用于APP显示未接收小红点）
+    Integer getNotReceiveOrderQuantity(String capacityNumber);
+
+    List<Map<String,Object>> getXiNanCarrier();
+
+    //边输边查发站到站
+    List<Map<String, Object>> getArrivalByLike(String index);
+
+    //查询已下发订单数量  -->APP小红点
+    Integer getOrderNum(String capacityNumber);
+
+
+    //仓库月台下拉框
+    List<Map<String, Object>> getSteelWarehouse();
+
+    List<Map<String, Object>> getShipNameMesByLike(Map<String, Object> map);
+
+    //查询运力联系方式
+    Map<String, Object> getCapacityTel(BigDecimal capacityId);
+
+    // 边输边查收货客户
+    List<Map<String, Object>> getConsigneeMesByLike(String s);
+
+    Map<String, Object> getConsigneeByuserid(String userId);
+
+    int updateSaleOrderStatusById(BigDecimal saleOrderId);
+    // 修改司机电话
+    int updateDriverTel(Map<String, Object> map);
+    //同步修改到运力
+    int updateCapacityDriverTel(int orderId,String driverTel);
+
+    int getQueueCount();
+    // 下拉下单客户的历史使用过的地址
+    List<Map<String, Object>> getReceiverAllPlaceUsed(Integer receiveId);
+    // 片区边输边查
+    List<Map<String, Object>> getSaleAreaByLike(String index);
+    // 判断收货客户是否绑定片区
+    BigDecimal isReceiveHaveArea(Integer receiveId);
+    // 绑定片区
+    int bandSaleArea(Map<String, Object> map);
+
+    int getSteelOrderNum();
+    // 边输边查收货地址
+    List<Map<String, Object>> getPlaceAndAddress(String index);
+    // 边输边查物资名称
+    List<Map<String, Object>> getMaterialNameLike(String index);
+    // 边输边查仓库名称
+    List<Map<String, Object>> getWareHouseNameLike(String index);
+    // 边输边查物资规格型号
+    List<Map<String, Object>> getSpecificationModelLike(Map<String,Object> map);
+
+    int closePassedOrder();
+
+    List<Map<String,Object>> findPassedOrder();
+
+    List<Map<String, Object>> getInwardWeightMaterial(Map<String, Object> mapValue);
+
+    List<Map<String,Object>> selectPurchaseOrderForShip(Map<String,Object> map);
+
+    List<Map<String,Object>> getBatchOfNotice(Map<String,Object> map);
+
+    List<Map<String,Object>> findBatchHavingLoad(Map<String,Object> map);
+
+    List<Map<String,Object>> getInwardSendStation();
+
+    List<Map<String,Object>> getInwardInboundResult(Map<String, Object> map);
+
+    List<Map<String, Object>> getMaterialList(Map<String, Object> map1);
+
+    List<Map<String, Object>> getLuhaoNum(@Param("orderId") BigDecimal orderId, @Param("materialId") BigDecimal materialId);
+
+
+    //查询多拼数据
+    BigDecimal queueMore(BigDecimal orderId);
+
+    //查询实绩
+    BigDecimal sumNetWeight(BigDecimal orderId);
+
+    //状态设为2
+    int updateStatusTwo(BigDecimal orderId);
+
+    //状态设为7
+    int updateStatusSeven(BigDecimal orderId);
+
+    //查询单拼数据
+    BigDecimal queueSingle(BigDecimal orderId);
+
+    //删除单拼数据
+    int delectQueueS(BigDecimal capacityIdS);
+    //删除多拼数据
+    int delectQueueM(BigDecimal capacityIdM);
+
+    Map<String, Object> getDispachSwitch();
+
+    int updateDispachSwitch(Map<String, Object> map);
+
+    String getReleaseFlag();
+
+    Map<String, Object> getConsigneeInfo(String consigneeName);
+
+    List<String> getColumnNoRoutList(Map<String, Object> map);
+
+    Map<String, Object> getSteelReportDetailsBySmId(BigDecimal saleOrderMaterialId);
+
+    List<String> getColumnHiddenData(Map<String, Object> map);
+
+    List<Map<String, Object>> getColumnShowData(Map<String, Object> map);
+
+    List<Map<String, Object>> getColumnAllData(Map<String, Object> map);
+
+
+    int updateRemark(Map<String, Object> map);
+
+
+    List<Map<String, Object>> getColumnAllScheme(Map<String, Object> map);
+
+
+    int updateRemarkPic(Map<String, Object> map);
+
+    String getWlUrl();
+
+    int updateTruckRemark(Map<String, Object> map);
+
+}

src/main/java/com/steerinfo/dil/model/DilCidCapacity.java

@@ -0,0 +1,153 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="运力与cid的关系表")
+public class DilCidCapacity implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(CID_CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal cidCapacityId;
+
+    /**
+     * 用户cid(CID,VARCHAR,200)
+     */
+    @ApiModelProperty(value="用户cid",required=false)
+    private String cid;
+
+    /**
+     * 车牌号(CAPACITY_NUMBER,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车牌号",required=false)
+    private String capacityNumber;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.cidCapacityId;
+    }
+
+    @Override
+    public void setId(BigDecimal cidCapacityId) {
+        this.cidCapacityId = cidCapacityId;
+    }
+
+    public BigDecimal getCidCapacityId() {
+        return cidCapacityId;
+    }
+
+    public void setCidCapacityId(BigDecimal cidCapacityId) {
+        this.cidCapacityId = cidCapacityId;
+    }
+
+    public String getCid() {
+        return cid;
+    }
+
+    public void setCid(String cid) {
+        this.cid = cid == null ? null : cid.trim();
+    }
+
+    public String getCapacityNumber() {
+        return capacityNumber;
+    }
+
+    public void setCapacityNumber(String capacityNumber) {
+        this.capacityNumber = capacityNumber == null ? null : capacityNumber.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", cidCapacityId=").append(cidCapacityId);
+        sb.append(", cid=").append(cid);
+        sb.append(", capacityNumber=").append(capacityNumber);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/model/DilRoleOrgcodeTable.java

@@ -0,0 +1,122 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+
+@ApiModel(value="机构与列的展示关系")
+public class DilRoleOrgcodeTable implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(PRIMARY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal primaryId;
+
+    /**
+     * 机构关系(ORG_CODE,VARCHAR,200)
+     */
+    @ApiModelProperty(value="机构关系",required=false)
+    private String orgCode;
+
+    /**
+     * 用户名称(USER_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="用户名称",required=false)
+    private String userName;
+
+    /**
+     * 列ID(COLUMN_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="列ID",required=false)
+    private BigDecimal columnId;
+
+    /**
+     * 方案名称(PRIMARY_NAME,VARCHAR,200)
+     */
+    @ApiModelProperty(value="方案名称",required=false)
+    private String primaryName;
+
+    /**
+     * 启用状态,0 未启用；1，启用(ENABLE_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="启用状态,0 未启用；1，启用",required=false)
+    private BigDecimal enableStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.primaryId;
+    }
+
+    @Override
+    public void setId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public BigDecimal getPrimaryId() {
+        return primaryId;
+    }
+
+    public void setPrimaryId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode == null ? null : orgCode.trim();
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    public BigDecimal getColumnId() {
+        return columnId;
+    }
+
+    public void setColumnId(BigDecimal columnId) {
+        this.columnId = columnId;
+    }
+
+    public String getPrimaryName() {
+        return primaryName;
+    }
+
+    public void setPrimaryName(String primaryName) {
+        this.primaryName = primaryName == null ? null : primaryName.trim();
+    }
+
+    public BigDecimal getEnableStatus() {
+        return enableStatus;
+    }
+
+    public void setEnableStatus(BigDecimal enableStatus) {
+        this.enableStatus = enableStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", primaryId=").append(primaryId);
+        sb.append(", orgCode=").append(orgCode);
+        sb.append(", userName=").append(userName);
+        sb.append(", columnId=").append(columnId);
+        sb.append(", primaryName=").append(primaryName);
+        sb.append(", enableStatus=").append(enableStatus);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/model/DilTableColumnRole.java

@@ -0,0 +1,78 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+@ApiModel(value="表列权限")
+public class DilTableColumnRole implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(PRIMARY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal primaryId;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 列名(COLUMN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="列名",required=false)
+    private String columnName;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.primaryId;
+    }
+
+    @Override
+    public void setId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public BigDecimal getPrimaryId() {
+        return primaryId;
+    }
+
+    public void setPrimaryId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getColumnName() {
+        return columnName;
+    }
+
+    public void setColumnName(String columnName) {
+        this.columnName = columnName == null ? null : columnName.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", primaryId=").append(primaryId);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", columnName=").append(columnName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/model/DilVersion.java

@@ -0,0 +1,153 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="app版本号")
+public class DilVersion implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(VERSION_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal versionId;
+
+    /**
+     * 版本号(VERSION_VALUE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="版本号",required=false)
+    private String versionValue;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 版本类型（0：APP   1：PDA)(VERSION_TYPE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="版本类型（0：APP   1：PDA)",required=false)
+    private Short versionType;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.versionId;
+    }
+
+    @Override
+    public void setId(BigDecimal versionId) {
+        this.versionId = versionId;
+    }
+
+    public BigDecimal getVersionId() {
+        return versionId;
+    }
+
+    public void setVersionId(BigDecimal versionId) {
+        this.versionId = versionId;
+    }
+
+    public String getVersionValue() {
+        return versionValue;
+    }
+
+    public void setVersionValue(String versionValue) {
+        this.versionValue = versionValue == null ? null : versionValue.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Short getVersionType() {
+        return versionType;
+    }
+
+    public void setVersionType(Short versionType) {
+        this.versionType = versionType;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", versionId=").append(versionId);
+        sb.append(", versionValue=").append(versionValue);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", versionType=").append(versionType);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/model/OmstruckOrder.java

@@ -0,0 +1,454 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="汽运运输订单")
+public class OmstruckOrder implements IBasePO<BigDecimal> {
+    /**
+     * 运输订单id(ORDER_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输订单id",required=true)
+    private BigDecimal orderId;
+
+    /**
+     * 车序号表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID(ORDER_PLAN_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="车序号表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID",required=false)
+    private BigDecimal orderPlanId;
+
+    /**
+     * 运输订单号（WYSDD-年月日-8位数的顺序号）(ORDER_NUMBER,VARCHAR,50)
+     */
+    @ApiModelProperty(value="运输订单号（WYSDD-年月日-8位数的顺序号）",required=false)
+    private String orderNumber;
+
+    /**
+     * 运力ID(CAPACITY_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运力ID",required=false)
+    private BigDecimal capacityId;
+
+    /**
+     * 订单下发时间(ORDER_ISSUE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="订单下发时间",required=false)
+    private Date orderIssueTime;
+
+    /**
+     * 司机操作订单行为：0：拒绝；1：接收(ORDER_RECEIVE_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="司机操作订单行为：0：拒绝；1：接收",required=false)
+    private BigDecimal orderReceiveStatus;
+
+    /**
+     * 司机接收/拒绝订单时间(ORDER_RECEIVE_REFUSE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="司机接收/拒绝订单时间",required=false)
+    private Date orderReceiveRefuseTime;
+
+    /**
+     * 通信时长=司机接单/拒绝时间-订单下发时间(ORDER_COMMUNICATION_DURATION,DECIMAL,0)
+     */
+    @ApiModelProperty(value="通信时长=司机接单/拒绝时间-订单下发时间",required=false)
+    private BigDecimal orderCommunicationDuration;
+
+    /**
+     * 运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭 10：不可作业(ORDER_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭 10：不可作业",required=false)
+    private BigDecimal orderStatus;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,200)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    /**
+     * 订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）(ORDER_TYPE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）",required=false)
+    private BigDecimal orderType;
+
+    /**
+     * 路段顺序号：（1：进厂 ； 2：计毛；3：卸货；4：计皮；5：出厂；6：装货）(ORDER_LINE_SEQUENCE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="路段顺序号：（1：进厂 ； 2：计毛；3：卸货；4：计皮；5：出厂；6：装货）",required=false)
+    private BigDecimal orderLineSequence;
+
+    /**
+     * 运输路线ID(LINE_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输路线ID",required=false)
+    private BigDecimal lineId;
+
+    /**
+     * 预计进厂时间(ORDER_ENTRY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="预计进厂时间",required=false)
+    private Date orderEntryTime;
+
+    /**
+     * 卸货点ID(UNLOAD_POINT_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="卸货点ID",required=false)
+    private BigDecimal unloadPointId;
+
+    /**
+     * 司机确认订单（1：已确认）(DRIVER_CONFIRMATION,DECIMAL,0)
+     */
+    @ApiModelProperty(value="司机确认订单（1：已确认）",required=false)
+    private BigDecimal driverConfirmation;
+
+    /**
+     * 运输单价ID(PRICE_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输单价ID",required=false)
+    private BigDecimal priceId;
+
+    /**
+     * 订单所属承运商ID(CARRIER_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="订单所属承运商ID",required=false)
+    private BigDecimal carrierId;
+
+    /**
+     * 行程ID(TRIP_ID,VARCHAR,200)
+     */
+    @ApiModelProperty(value="行程ID",required=false)
+    private String tripId;
+
+    /**
+     * 打印状态(ORDER_PRINT_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="打印状态",required=false)
+    private BigDecimal orderPrintStatus;
+
+    /**
+     * 司机电话号码(DRIVER_TEL,VARCHAR,36)
+     */
+    @ApiModelProperty(value="司机电话号码",required=false)
+    private String driverTel;
+
+    /**
+     * 操作人员组织(OPTIONER_CODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="操作人员组织",required=false)
+    private String optionerCode;
+
+    /**
+     * 是否可作业(CAN_WORK,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否可作业",required=false)
+    private BigDecimal canWork;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.orderId;
+    }
+
+    @Override
+    public void setId(BigDecimal orderId) {
+        this.orderId = orderId;
+    }
+
+    public BigDecimal getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(BigDecimal orderId) {
+        this.orderId = orderId;
+    }
+
+    public BigDecimal getOrderPlanId() {
+        return orderPlanId;
+    }
+
+    public void setOrderPlanId(BigDecimal orderPlanId) {
+        this.orderPlanId = orderPlanId;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber == null ? null : orderNumber.trim();
+    }
+
+    public BigDecimal getCapacityId() {
+        return capacityId;
+    }
+
+    public void setCapacityId(BigDecimal capacityId) {
+        this.capacityId = capacityId;
+    }
+
+    public Date getOrderIssueTime() {
+        return orderIssueTime;
+    }
+
+    public void setOrderIssueTime(Date orderIssueTime) {
+        this.orderIssueTime = orderIssueTime;
+    }
+
+    public BigDecimal getOrderReceiveStatus() {
+        return orderReceiveStatus;
+    }
+
+    public void setOrderReceiveStatus(BigDecimal orderReceiveStatus) {
+        this.orderReceiveStatus = orderReceiveStatus;
+    }
+
+    public Date getOrderReceiveRefuseTime() {
+        return orderReceiveRefuseTime;
+    }
+
+    public void setOrderReceiveRefuseTime(Date orderReceiveRefuseTime) {
+        this.orderReceiveRefuseTime = orderReceiveRefuseTime;
+    }
+
+    public BigDecimal getOrderCommunicationDuration() {
+        return orderCommunicationDuration;
+    }
+
+    public void setOrderCommunicationDuration(BigDecimal orderCommunicationDuration) {
+        this.orderCommunicationDuration = orderCommunicationDuration;
+    }
+
+    public BigDecimal getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(BigDecimal orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public BigDecimal getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(BigDecimal orderType) {
+        this.orderType = orderType;
+    }
+
+    public BigDecimal getOrderLineSequence() {
+        return orderLineSequence;
+    }
+
+    public void setOrderLineSequence(BigDecimal orderLineSequence) {
+        this.orderLineSequence = orderLineSequence;
+    }
+
+    public BigDecimal getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(BigDecimal lineId) {
+        this.lineId = lineId;
+    }
+
+    public Date getOrderEntryTime() {
+        return orderEntryTime;
+    }
+
+    public void setOrderEntryTime(Date orderEntryTime) {
+        this.orderEntryTime = orderEntryTime;
+    }
+
+    public BigDecimal getUnloadPointId() {
+        return unloadPointId;
+    }
+
+    public void setUnloadPointId(BigDecimal unloadPointId) {
+        this.unloadPointId = unloadPointId;
+    }
+
+    public BigDecimal getDriverConfirmation() {
+        return driverConfirmation;
+    }
+
+    public void setDriverConfirmation(BigDecimal driverConfirmation) {
+        this.driverConfirmation = driverConfirmation;
+    }
+
+    public BigDecimal getPriceId() {
+        return priceId;
+    }
+
+    public void setPriceId(BigDecimal priceId) {
+        this.priceId = priceId;
+    }
+
+    public BigDecimal getCarrierId() {
+        return carrierId;
+    }
+
+    public void setCarrierId(BigDecimal carrierId) {
+        this.carrierId = carrierId;
+    }
+
+    public String getTripId() {
+        return tripId;
+    }
+
+    public void setTripId(String tripId) {
+        this.tripId = tripId == null ? null : tripId.trim();
+    }
+
+    public BigDecimal getOrderPrintStatus() {
+        return orderPrintStatus;
+    }
+
+    public void setOrderPrintStatus(BigDecimal orderPrintStatus) {
+        this.orderPrintStatus = orderPrintStatus;
+    }
+
+    public String getDriverTel() {
+        return driverTel;
+    }
+
+    public void setDriverTel(String driverTel) {
+        this.driverTel = driverTel == null ? null : driverTel.trim();
+    }
+
+    public String getOptionerCode() {
+        return optionerCode;
+    }
+
+    public void setOptionerCode(String optionerCode) {
+        this.optionerCode = optionerCode == null ? null : optionerCode.trim();
+    }
+
+    public BigDecimal getCanWork() {
+        return canWork;
+    }
+
+    public void setCanWork(BigDecimal canWork) {
+        this.canWork = canWork;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", orderId=").append(orderId);
+        sb.append(", orderPlanId=").append(orderPlanId);
+        sb.append(", orderNumber=").append(orderNumber);
+        sb.append(", capacityId=").append(capacityId);
+        sb.append(", orderIssueTime=").append(orderIssueTime);
+        sb.append(", orderReceiveStatus=").append(orderReceiveStatus);
+        sb.append(", orderReceiveRefuseTime=").append(orderReceiveRefuseTime);
+        sb.append(", orderCommunicationDuration=").append(orderCommunicationDuration);
+        sb.append(", orderStatus=").append(orderStatus);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", orderType=").append(orderType);
+        sb.append(", orderLineSequence=").append(orderLineSequence);
+        sb.append(", lineId=").append(lineId);
+        sb.append(", orderEntryTime=").append(orderEntryTime);
+        sb.append(", unloadPointId=").append(unloadPointId);
+        sb.append(", driverConfirmation=").append(driverConfirmation);
+        sb.append(", priceId=").append(priceId);
+        sb.append(", carrierId=").append(carrierId);
+        sb.append(", tripId=").append(tripId);
+        sb.append(", orderPrintStatus=").append(orderPrintStatus);
+        sb.append(", driverTel=").append(driverTel);
+        sb.append(", optionerCode=").append(optionerCode);
+        sb.append(", canWork=").append(canWork);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/model/RmsReceivingCompany.java

@@ -0,0 +1,128 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 收款客户 rms_receiving_company
+ * @author xiaosh
+ */
+public class RmsReceivingCompany implements IBasePO<BigDecimal> {
+    /**
+     * 收款客户ID
+     */
+    @ApiModelProperty(value = "收款客户ID")
+    private BigDecimal companyId;
+    /**
+     * 收款客户编码
+     */
+    @ApiModelProperty(value = "收款客户编码")
+    private String companyCode;
+    /**
+     * 收款客户名称
+     */
+    @ApiModelProperty(value = "收款客户名称")
+    private String companyName;
+    /**
+     * 记录创建人
+     */
+    @ApiModelProperty(value = "记录创建人")
+    private String insertUsername;
+    /**
+     * 记录创建时间
+     */
+    @ApiModelProperty(value = "记录创建时间")
+    private Date insertTime;
+    /**
+     * 记录修改人
+     */
+    @ApiModelProperty(value = "记录修改人")
+    private String updateUsername;
+    /**
+     * 记录修改时间
+     */
+    @ApiModelProperty(value = "记录修改时间")
+    private Date updateTime;
+    /**
+     * 记录创建或修改备注
+     */
+    @ApiModelProperty(value = "记录创建或修改备注")
+    private String insertUpdateRemark;
+
+    @Override
+    public BigDecimal getId() {
+        return this.companyId;
+    }
+
+    @Override
+    public void setId(BigDecimal companyId) {
+        this.companyId = companyId;
+    }
+
+    public BigDecimal getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(BigDecimal companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark;
+    }
+}

src/main/java/com/steerinfo/dil/service/IBackgroundProcessService.java

@@ -0,0 +1,10 @@
+package com.steerinfo.dil.service;
+
+import java.util.Map;
+
+public interface IBackgroundProcessService {
+
+    int updatePurOrgId(Map<String, Object> map);
+
+    int bindCidCapacityNo(String cid, String capacityNo);
+}

src/main/java/com/steerinfo/dil/service/IDilVersionService.java

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.service;
+
+/**
+ * DilVersion服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-14 10:05
+ * 类描述
+ * 修订历史：
+ * 日期：2021-12-14
+ * 作者：generator
+ * 参考：
+ * 描述：DilVersion服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IDilVersionService{
+
+    String getAppVersion();
+
+    String addAppVersion(String version);
+
+}

src/main/java/com/steerinfo/dil/service/RmsReceivingCompanyService.java

@@ -0,0 +1,21 @@
+package com.steerinfo.dil.service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author xiaosh
+ */
+public interface RmsReceivingCompanyService {
+    /**
+     * 查询收款客户
+     * @return 名称列表
+     */
+    List<String> queryRmsReceivingCompanyName();
+
+    /**
+     * 查询收款客户
+     * @return 编号名称列表
+     */
+    List<Map<String, Object>> queryRmsReceivingCompanyMap();
+}

src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -0,0 +1,32 @@
+package com.steerinfo.dil.service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:04
+ */
+
+public interface UniversalService {
+
+    //打印提货单
+    Map<String, Object> printTiHuoDan(String orderNumber);
+
+    //查询路段顺序及当前路段顺序号
+    Map<String, Object> getNowLineMes(Map<String, Object> map);
+
+   // List<String> getWarrantyAndPrint(String orderNumber);
+
+    List<String> getWarranty(java.lang.String orderNumber);
+
+    List<String> getTest(Map<String, Object> map);
+
+    Map<String, Object> submitSteel(Map<String, Object> map);
+
+    Map<String, Object> getColumnShowHidden(Map<String, Object> map);
+
+    int updateColumnShowHidden(Map<String, Object> map);
+
+    Map<String,Object> getColumShowHideScheme(Map<String, Object> map);
+}

src/main/java/com/steerinfo/dil/service/impl/BackgroundProcessingServiceImpl.java

@@ -0,0 +1,140 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
+import com.steerinfo.dil.mapper.DilCidCapacityMapper;
+import com.steerinfo.dil.model.DilCidCapacity;
+import com.steerinfo.dil.service.IBackgroundProcessService;
+import com.steerinfo.dil.util.DataChange;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+@Service(value = "backgroundProcessingService")
+public class BackgroundProcessingServiceImpl implements IBackgroundProcessService {
+
+    @Autowired
+    private BackgroundProcessingMapper backgroundProcessingMapper;
+
+    @Autowired
+    private DilCidCapacityMapper dilCidCapacityMapper;
+
+
+    /**
+     * 更新订单所属厂区
+     * @param map
+     * @return
+     */
+    @Override
+    public int updatePurOrgId(Map<String, Object> map) {
+        return backgroundProcessingMapper.updatePurOrderOrgId(map);
+    }
+
+    /**
+     * 删除重复实绩
+     * @param orderNumber
+     * @return
+     */
+    public int deleteErrorResult(String orderNumber) {
+        Map<String, Object> orderMes = backgroundProcessingMapper.getOrderMesByOrderNum(orderNumber);
+        int orderType = DataChange.dataToBigDecimal(orderMes.get("orderType")).intValue();
+        List<Integer> arrayList = Arrays.asList(15, 16, 21); //没有固定路线不支持此操作
+        if(arrayList.contains(orderType)){
+            return 0;
+        }
+        BigDecimal resultTotalId = DataChange.dataToBigDecimal(orderMes.get("resultTotalId"));
+        if(orderType==11){
+            //如果是内转计重,删除多余计量和装卸货实绩
+            backgroundProcessingMapper.deleteExtraWeight(resultTotalId);
+            backgroundProcessingMapper.deleteExtraLoad(resultTotalId);
+            backgroundProcessingMapper.deleteExtraUnload(resultTotalId);
+            return 0;
+        }
+        List<Integer> enFactoryList = backgroundProcessingMapper.enFactoryCheck(resultTotalId);
+        if(enFactoryList != null && enFactoryList.size() != 0){
+            //查询出当前顺序号中所有的实绩
+            for (Integer sqe : enFactoryList) {
+                List<Map<String, Object>> mesList = backgroundProcessingMapper.getEnFactoryResult(resultTotalId, sqe);
+                closeWay(mesList, 1);
+            }
+        }
+        List<Integer> loadList = backgroundProcessingMapper.loadCheck(resultTotalId);
+        if(loadList != null && loadList.size() != 0){
+            for (Integer sqe : loadList) {
+                List<Map<String, Object>> mesList = backgroundProcessingMapper.loadResult(resultTotalId, sqe);
+                closeWay(mesList, 2);
+            }
+        }
+        List<Integer> unloadList = backgroundProcessingMapper.unloadCheck(resultTotalId);
+        if(unloadList != null && unloadList.size() != 0){
+            for (Integer sqe : unloadList) {
+                List<Map<String, Object>> mesList = backgroundProcessingMapper.unloadResult(resultTotalId, sqe);
+                closeWay( mesList, 3);
+            }
+        }
+        List<Integer> weightList = backgroundProcessingMapper.weightCheck(resultTotalId);
+        if(weightList != null && weightList.size() != 0){
+            for (Integer sqe : weightList) {
+                List<Map<String, Object>> mesList = backgroundProcessingMapper.weightResult(resultTotalId, sqe);
+                closeWay(mesList, 4);
+            }
+        }
+        List<Integer> outFactoryList = backgroundProcessingMapper.outFactoryCheck(resultTotalId);
+        if(outFactoryList != null && outFactoryList.size() != 0){
+            for (Integer sqe : outFactoryList) {
+                List<Map<String, Object>> mesList = backgroundProcessingMapper.outFactoryResult(resultTotalId, sqe);
+                closeWay(mesList, 5);
+            }
+        }
+        return 0;
+    }
+
+    /**
+     * 关闭通用方法
+     * @param mesList 这些顺序号的实绩信息
+     * @param type 1：进厂 2：计量 3：装货：4：卸货 5：出厂
+     */
+    public void closeWay(List<Map<String, Object>> mesList, int type){
+        List<Integer> resultList = new ArrayList<>();
+        for (Map<String, Object> map : mesList) {
+            //有过操作时间的不做删除
+            if(map.get("time") == null){
+                resultList.add(DataChange.dataToBigDecimal(map.get("resultId")).intValue()); //添入列表中
+            }
+        }
+        if(mesList.size() == resultList.size()){
+            //如果所有的实绩都为空 ，则只保留一条实绩，其余的全部删除
+            resultList.remove(0);
+        }
+        if(resultList.size() != 0){
+            //删除实绩数据
+            if(type == 1)
+                backgroundProcessingMapper.deleteEnFactoryUnnecessaryResult(resultList);
+            else if(type == 2)
+                backgroundProcessingMapper.deleteLoadUnnecessaryResult(resultList);
+            else if(type == 3)
+                backgroundProcessingMapper.deleteUnloadUnnecessaryResult(resultList);
+            else if(type == 4)
+                backgroundProcessingMapper.deleteWeightUnnecessaryResult(resultList);
+            else if(type == 5)
+                backgroundProcessingMapper.deleteOutFactoryUnnecessaryResult(resultList);
+        }
+    }
+
+    @Override
+    public int bindCidCapacityNo(String cid, String capacityNo) {
+        DilCidCapacity dilCidCapacity = new DilCidCapacity();
+        //根据车牌号和cid去查询是否存在
+        Integer j = dilCidCapacityMapper.selectByCidAndCapacityNo(cid,capacityNo);
+        if(j > 0){
+            return 0;
+        }
+        dilCidCapacity.setCidCapacityId(dilCidCapacityMapper.getCidMax());
+        dilCidCapacity.setCid(cid);
+        dilCidCapacity.setCapacityNumber(capacityNo);
+        dilCidCapacity.setInsertTime(new Date());
+        int i = dilCidCapacityMapper.insertSelective(dilCidCapacity);
+        return i;
+    }
+}

src/main/java/com/steerinfo/dil/service/impl/DilVersionServiceImpl.java

@@ -0,0 +1,68 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.DilVersionMapper;
+import com.steerinfo.dil.model.DilVersion;
+import com.steerinfo.dil.service.IDilVersionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * DilVersion服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-14 10:05
+ * 类描述
+ * 修订历史：
+ * 日期：2021-12-14
+ * 作者：generator
+ * 参考：
+ * 描述：DilVersion服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "dilVersionService")
+public class DilVersionServiceImpl implements IDilVersionService {
+
+    @Autowired
+    private DilVersionMapper dilVersionMapper;
+
+
+    /**
+     * 查询最新版本号
+     * @return 版本号
+     */
+    public String getAppVersion(){
+        //查找当前最新版本号
+        return  dilVersionMapper.getAppVersion();
+    }
+
+    /**
+     * 查询PDA最新版本号
+     * @return
+     */
+    public String getPDAVersion(){
+        //查询PDA当前最新版本号
+        return dilVersionMapper.getPDAVersion();
+    }
+
+    /**
+     * 添加APP版本号
+     * @param version
+     * @return
+     */
+    public String addAppVersion(String version){
+        //判断该版本号是否已存在
+        Integer versionId = dilVersionMapper.getVersionId(version);
+        if(versionId != null){
+            return "版本号已存在";
+        }
+        DilVersion dilVersion = new DilVersion();
+        dilVersion.setVersionId(dilVersionMapper.selectMaxId());
+        dilVersion.setVersionValue(version);
+        dilVersion.setInsertTime(new Date());
+        dilVersion.setInsertUsername("admin");
+        dilVersionMapper.insertSelective(dilVersion);
+        return version + "添加成功";
+    }
+}

src/main/java/com/steerinfo/dil/service/impl/RmsReceivingCompanyServiceImpl.java

@@ -0,0 +1,49 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.RmsReceivingCompanyMapper;
+import com.steerinfo.dil.model.RmsReceivingCompany;
+import com.steerinfo.dil.service.RmsReceivingCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author xiaosh
+ */
+@Service(value = "rmsReceivingCompanyService1")
+public class RmsReceivingCompanyServiceImpl implements RmsReceivingCompanyService {
+
+    @Autowired
+    private RmsReceivingCompanyMapper rmsReceivingCompanyMapper;
+
+    @Override
+    public List<String> queryRmsReceivingCompanyName() {
+        List<String> receivingCompany = new ArrayList<>();
+        List<RmsReceivingCompany> list = rmsReceivingCompanyMapper.selectAll();
+        if(null != list && !list.isEmpty()){
+            for (RmsReceivingCompany rmsReceivingCompany : list) {
+                receivingCompany.add(rmsReceivingCompany.getCompanyName());
+            }
+        }
+        return receivingCompany;
+    }
+
+    @Override
+    public List<Map<String, Object>> queryRmsReceivingCompanyMap() {
+        List<Map<String, Object>> receivingCompany = new ArrayList<>();
+        List<RmsReceivingCompany> list = rmsReceivingCompanyMapper.selectAll();
+        if(null != list && !list.isEmpty()){
+            for (RmsReceivingCompany rmsReceivingCompany : list) {
+                Map<String, Object> map = new HashMap<>(4);
+                map.put("values1", rmsReceivingCompany.getCompanyCode());
+                map.put("label1", rmsReceivingCompany.getCompanyName());
+                receivingCompany.add(map);
+            }
+        }
+        return receivingCompany;
+    }
+}

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -0,0 +1,509 @@
+package com.steerinfo.dil.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.dil.feign.JoinFeign;
+import com.steerinfo.dil.mapper.DilRoleOrgcodeTableMapper;
+import com.steerinfo.dil.mapper.DilTableColumnRoleMapper;
+import com.steerinfo.dil.mapper.UniversalMapper;
+import com.steerinfo.dil.model.DilRoleOrgcodeTable;
+import com.steerinfo.dil.service.UniversalService;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.ESUtil;
+import com.steerinfo.dil.util.HTTPRequestUtils;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:05
+ */
+
+@Service
+@EnableScheduling
+@EnableAsync
+public class UniversalServiceImpl implements UniversalService {
+
+    @Resource
+    private UniversalMapper universalMapper;
+
+    @Resource
+    private DilRoleOrgcodeTableMapper dilRoleOrgcodeTableMapper;
+
+    @Resource
+    private DilTableColumnRoleMapper dilTableColumnRoleMapper;
+
+    @Autowired
+    private JoinFeign joinFeign;
+
+    @Autowired
+    private ESUtil esUtil;
+
+    @Autowired
+    private AmsFeign amsFeign;
+    /**
+     * 打印提货单
+     * @param orderNumber 运输订单号
+     * @return
+     */
+    @Override
+    public Map<String, Object> printTiHuoDan(String orderNumber) {
+
+        //查询订单信息
+        Map<String, Object> tiHuoDanMap = universalMapper.getTiHuoDan(orderNumber);
+        //查询该订单下的所有装车信息
+        List<Map<String, Object>> oomMes = universalMapper.getOOMMes(orderNumber);
+        tiHuoDanMap.put("loadMes", oomMes);
+        return tiHuoDanMap;
+    }
+
+
+    /**
+     * 查询路段顺序及当前路段顺序号
+     * @param map
+     * @return
+     */
+    @Override
+    public Map<String, Object> getNowLineMes(Map<String, Object> map) {
+
+        return null;
+    }
+
+//    @Override
+//    public  List<String> getWarrantyAndPrint(String orderNumber) {
+//        List<Map<String,Object>> warrantyCode = universalMapper.getWarranty(orderNumber);
+//        List<String> list = new ArrayList<>();
+//        String content = null;
+//        for(Map<String,Object> code:warrantyCode){
+//            Blob blob = (Blob) code.get("warrantyCode");
+//            try {
+//               content = new String(blob.getBytes((long)1, (int)blob.length()));
+//               String string = content.substring(0,content.length()-2);
+//               System.out.println(string);
+//               list.add(string);
+//            } catch (SQLException throwables) {
+//                throwables.printStackTrace();
+//            }
+//        }
+//
+//        return list;
+//    }
+
+    @Override
+    public List<String> getWarranty(String orderNumber) {
+        List<String> list = new ArrayList<>();
+        //回传金蝶
+        //根据orderNumber查询
+        Map<String,Object> map = getWarrantyToES(orderNumber);
+        String string = null;
+        try{
+             string = joinFeign.sendWarranty(map);
+            Map<String,Object> waMap = JSON.parseObject(string);
+            //成功
+            if(waMap.get("kdStatus").equals("1")){
+                List<Map<String,Object>> reportList = (List<Map<String,Object>>) waMap.get("qcReportList");
+                Map<String,Object> map1 = reportList.get(0);
+                Iterator<Map.Entry<String, Object>> it = map1.entrySet().iterator();
+                Map.Entry<String,Object> entry;
+                while(it.hasNext()){
+                    entry =  it.next();
+                    String value = (String) entry.getValue();
+                    list.add(value);
+                }
+            }    //失败
+            else{
+                list.add("-1");
+            }
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            list.add("-2");
+        }
+        return list;
+    }
+
+    @Override
+    public List<String> getTest(Map<String, Object> map) {
+        List<String> list = new ArrayList<>();
+        //成功
+        if(map.get("kdStatus").equals("1")){
+            List<Map<String,Object>> reportList = (List<Map<String,Object>>) map.get("qcReportList");
+            Map<String,Object> map1 = reportList.get(0);
+            Iterator<Map.Entry<String, Object>> it = map1.entrySet().iterator();
+            Map.Entry<String,Object> entry;
+            while(it.hasNext()){
+                entry =  it.next();
+                String value = (String) entry.getValue();
+                list.add(value);
+            }
+        }//失败
+        else{
+            list.add("0");
+        }
+        return list;
+    }
+
+    //出库与金蝶打通接口(获得质保书)
+    public Map<String,Object> getWarrantyToES(String orderNumber) {
+        Map<String, Object> input = new HashMap<>();
+        Map<String, Object> head = universalMapper.selectNum(orderNumber);
+        input.put("head", head);
+        List<Map<String, Object>> mapList = universalMapper.selectOutbound(orderNumber);
+        input.put("entries",mapList);
+        Map<String,Object> totalMap = esUtil.getTotalMap();
+        //组装报文
+        totalMap.put("input",input);
+        return totalMap;
+    }
+
+
+    /**
+     * sha1加密字符串
+     * @param text
+     * @return
+     */
+    public String sha1DigestUtils(String text){
+        return DigestUtils.sha1Hex(text);
+    }
+
+    /**
+     * 根据收货客户查询承运商
+      */
+    public Map<String, Object> getCarrierByConsignee(Map<String, Object> mapValue){
+        String isSelfMention = (String) mapValue.get("isSelfMention");
+        String consigneeName = (String) mapValue.get("consigneeName");
+        Map<String, Object> map = new HashMap<>();
+        if (isSelfMention.equals("是")) {
+            map = universalMapper.getCarrierByConsignee(consigneeName);
+        }
+        else {
+            map.put("carrierId",null);
+            map.put("carrierName",null);
+        }
+        return map;
+    }
+
+    /**
+     *
+     * @param mapValue
+     * @return
+     */
+    public Map<String, Object> isInCapacityCarrier(Map<String, Object> mapValue) {
+        BigDecimal capacityCarrierId = universalMapper.isInCapacityCarrier(mapValue);
+        BigDecimal capacityId = universalMapper.isInCapacity(mapValue);
+        Map<String,Object> map = new HashMap<>();
+        map.put("capacityCarrierId",capacityCarrierId);
+        map.put("capacityId",capacityId);
+        return map;
+    }
+
+    public List<Map<String, Object>> getPortId() {
+        return universalMapper.getPortId();
+    }
+
+    //获取订单号以及订单号下的物资
+    public Map<String, Object> getOrderNumber(String num) {
+        return universalMapper.getOrderNumber(num);
+    }
+
+    public List<Map<String, Object>> getCapacityNumber(String num) {
+        return universalMapper.getCapacityNumber(num);
+    }
+
+
+    public List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId) {
+        return universalMapper.getMaterialIdByOrderId(orderId);
+    }
+
+    public int recordingWeightResult(List<Map<String, Object>> mapList) throws IOException {
+        String URL = "http://172.16.33.166:8066/api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult";
+        String jsonData = null;
+        String jsonString= JSON.toJSONString(mapList);
+        jsonData = HTTPRequestUtils.send(URL, jsonString,"utf-8");
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+            String code = (String) hashMap.get("code");
+            System.out.println(hashMap.get("code"));
+            if("SUCCESS".equals(code)){
+                return 1;
+            }else{
+                return 0;
+            }
+        }else{
+            System.out.println("补录委托失败：" + jsonData);
+            return 0;
+        }
+    }
+
+    /**
+     * 关闭过期运输订单
+     * @return
+     */
+    //@Scheduled(cron = "0 0,5 8 * * ?")
+    public void closePassedOrder() {
+        //List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
+        //System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
+        //int result=0;
+        ////int result = universalMapper.closePassedOrder();
+        //try {
+        //    if (passedOrderList.isEmpty()){
+        //
+        //    }else {
+        //        for (Map<String, Object> map : passedOrderList) {
+        //            BigDecimal orderId = (BigDecimal) map.get("orderId");
+        //            //分两种情况关单
+        //            //净重为0状态设为2，不为零设为7
+        //            BigDecimal bigDecimal = universalMapper.sumNetWeight(orderId);
+        //            if (bigDecimal.compareTo(BigDecimal.ZERO)!=0){
+        //                result+=universalMapper.updateStatusTwo(orderId);
+        //            }else {
+        //                result+=universalMapper.updateStatusSeven(orderId);
+        //            }
+        //           /* BigDecimal capacityIdS=universalMapper.queueSingle(orderId);*/
+        //            /*if (capacityIdS !=null){
+        //                //删除单拼
+        //                universalMapper.delectQueueS(capacityIdS);
+        //            }*/
+        //            /*//查询多拼的数据
+        //            BigDecimal capacityIdM =universalMapper.queueMore(orderId);
+        //            if (capacityIdM !=null){
+        //                //删除多拼
+        //                universalMapper.delectQueueM(capacityIdM);
+        //            }
+        //            //查询单拼的数据
+        //            BigDecimal capacityIdS=universalMapper.queueSingle(orderId);
+        //            if (capacityIdS !=null){
+        //                //删除单拼
+        //                universalMapper.delectQueueS(capacityIdS);
+        //            }*/
+        //        }
+        //    }
+        //
+        //}catch (Exception e){
+        //
+        //}
+        //System.out.println("订单关闭数为：" + result);
+        //return 1;
+    }
+
+
+    public int linkageDeleteTransportOrder(List<Map<String, Object>> mapList) throws IOException{
+        String URL = "http://172.16.33.166:8066/api/v1/join/tmstruckweightresult/linkageDeleteTransportOrder";
+        String jsonData = null;
+        String jsonString= JSON.toJSONString(mapList);
+        jsonData = HTTPRequestUtils.send(URL, jsonString,"utf-8");
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+            String code = (String) hashMap.get("code");
+            System.out.println(hashMap.get("code"));
+            if("200".equals(code)){
+                return 1;
+            }else{
+                return 0;
+            }
+        }else{
+            System.out.println("补录委托失败：" + jsonData);
+            return 0;
+        }
+    }
+
+    @Override
+    public Map<String, Object> submitSteel(Map<String, Object> map) {
+        List<String> responseMapList = new ArrayList<>();
+        List<String> responseMapFailedList = new ArrayList<>();
+        BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(map.get("saleOrderMaterialId"));
+        //根据车序号ID获取内容
+        Map<String,Object> oldMes = universalMapper.getSteelReportDetailsBySmId(saleOrderMaterialId);
+        //修改车辆备注
+        if(map.get("truckRemark") != null && !map.get("truckRemark").equals(oldMes.get("truckRemark"))) {
+            universalMapper.updateTruckRemark(map);
+            responseMapList.add("修改车辆备注成功");
+        }
+        //修改收货客户电话
+        if(map.get("consigneeTel") != null && !map.get("consigneeTel").equals(oldMes.get("consigneeTel"))) {
+            Map<String, Object> updateConsigneeTelMap = new HashMap<>();
+            updateConsigneeTelMap.put("saleOrderNo",map.get("saleOrderNo"));
+            updateConsigneeTelMap.put("saleOrderMaterialId",map.get("saleOrderMaterialId"));
+            updateConsigneeTelMap.put("consigneeTel",map.get("consigneeTel"));
+            Map<String,Object> updateConsigneeMap = amsFeign.updateConsigneeTel(updateConsigneeTelMap);
+            if(updateConsigneeMap.get("code").toString().equals("200")) {
+                responseMapList.add("修改收货客户电话号码成功");
+            }else{
+                responseMapFailedList.add("修改收货客户电话号码失败");
+            }
+        }
+        //修改备注
+        if(map.get("orderId") != null && map.get("remark") != null && !map.get("remark").equals(oldMes.get("remark"))) {
+            universalMapper.updateRemark(map);
+            responseMapList.add("修改备注成功");
+        }
+        if(map.get("orderId") != null && map.get("urls") != null && !map.get("urls").equals(oldMes.get("urls"))) {
+            universalMapper.updateRemarkPic(map);
+            responseMapList.add("修改备注图片成功");
+        }
+        //修改司机电话号码
+        if(map.get("capacityTel") != null && !map.get("capacityTel").equals(oldMes.get("capacityTel"))) {
+            Map<String, Object> updateDriverTelMap = new HashMap<>();
+            updateDriverTelMap.put("orderId",map.get("orderId"));
+            updateDriverTelMap.put("saleOrderMaterialId",map.get("saleOrderMaterialId"));
+            updateDriverTelMap.put("driverTel",map.get("capacityTel"));
+            universalMapper.updateCapacityDriverTel(DataChange.dataToBigDecimal(map.get("orderId")).intValue(),map.get("capacityTel").toString());
+            universalMapper.updateDriverTel(updateDriverTelMap);
+            responseMapList.add("修改司机电话号码成功");
+
+        }
+        //修改承运商授权
+        if(map.get("carrierName") != null && !"".equals(map.get("carrierName")) && !map.get("carrierName").equals(oldMes.get("carrierName"))){
+            if(oldMes.get("carrierName") == null) {
+                List<Map<String,Object>> list = new ArrayList<>();
+                list.add(map);
+                Map<String,Object> updateCarrierMap = (Map<String, Object>) amsFeign.dispatchToCarrier(list);
+                if (updateCarrierMap.get("code").toString().equals("0")) {
+                    responseMapList.add("授权承运商成功");
+                }else {
+                    responseMapFailedList.add("授权承运商失败,请联系管理员");
+                }
+            }else{
+                Map<String,Object> updateCarrierMap = amsFeign.updateTruckNoCarrier(map);
+                if (updateCarrierMap.get("code").toString().equals("200")) {
+                    responseMapList.add("修改承运商授权成功");
+                }else {
+                    responseMapFailedList.add("修改承运商授权失败,请联系管理员");
+                }
+            }
+        }
+        //修改收货地址
+        if (map.get("place") != null && !"".equals(map.get("place")) && (!map.get("place").equals(oldMes.get("place"))) || DataChange.dataToBigDecimal(map.get("shipperAddressId")).compareTo(DataChange.dataToBigDecimal(oldMes.get("shipperAddressId"))) != 0){
+            map.put("isCloseEas",1);
+            map.put("isNewCar",1);
+            Map<String,Object> updateCarAddress = amsFeign.updateCarAddress(map);
+            if (updateCarAddress.get("code").toString().equals("200")) {
+                responseMapList.add("修改收货地址成功");
+            }else{
+                responseMapFailedList.add("修改收货地址失败,请联系管理员");
+            }
+
+        }
+        //修改运力
+        if (map.get("capacityNo") != null && !"".equals(map.get("capacityNo")) && !map.get("capacityNo").equals(oldMes.get("capacityNo"))) {
+            if(oldMes.get("capacityId") != null) {
+                //修改运力
+                Map<String,Object> updateCapacityMap = amsFeign.updateCapacityNumberInFactory(map);
+                if (updateCapacityMap.get("code").toString().equals("200")) {
+                    responseMapList.add("修改车牌号成功");
+                }else{
+                    responseMapFailedList.add("修改车牌号失败,失败理由:" + updateCapacityMap.get("data"));
+                }
+                System.out.println(updateCapacityMap);
+
+            }else{
+                List<Map<String,Object>> list = new ArrayList<>();
+                list.add(map);
+                Map<String,Object> updateCapacityMap = amsFeign.dispatchSteelOrder(list);
+                if (updateCapacityMap.get("code").toString().equals("200")) {
+                    responseMapList.add("派发车牌号成功");
+                }else{
+                    responseMapFailedList.add("派发车牌号失败,失败理由:" + updateCapacityMap.get("data"));
+                }
+            }
+        }
+        Map<String, Object> resMap = new HashMap<>();
+        resMap.put("response",responseMapList);
+        resMap.put("responseMapFailed",responseMapFailedList);
+        return resMap;
+    }
+
+    @Override
+    public Map<String, Object> getColumnShowHidden(Map<String, Object> map) {
+        Map<String, Object> responseMap = new HashMap<>();
+        List<Map<String,Object>> columnShowData = universalMapper.getColumnShowData(map);
+        List<Map<String,Object>> columnAllData = universalMapper.getColumnAllData(map);
+        List<String> columnHiddenData = universalMapper.getColumnHiddenData(map);
+        responseMap.put("columnShowData",columnShowData);
+        responseMap.put("columnAllData",columnAllData);
+        responseMap.put("columnHiddenData",columnHiddenData);
+        return responseMap;
+    }
+
+    @Override
+    public synchronized int updateColumnShowHidden(Map<String, Object> map) {
+        int i = 0 ;
+        //首先删除原来的列
+        if("默认方案".equals(map.get("schemeName"))) {
+            dilRoleOrgcodeTableMapper.updateEnableStatus(map);
+            return 0;
+        }
+        i += dilRoleOrgcodeTableMapper.deleteSchmenLColumnData(map);
+        List<String> columnHiddenData = (List<String>) map.get("columnHiddenData");
+        List<DilRoleOrgcodeTable> mapList = new ArrayList<>();
+        for (String s : columnHiddenData) {
+            DilRoleOrgcodeTable dilRoleOrgcodeTable = new DilRoleOrgcodeTable();
+            BigDecimal columnId = dilTableColumnRoleMapper.selectColumnId(s,map.get("tableName").toString());
+            dilRoleOrgcodeTable.setColumnId(columnId);
+            dilRoleOrgcodeTable.setUserName(map.get("userName").toString());
+            dilRoleOrgcodeTable.setOrgCode(map.get("orgCode").toString());
+            dilRoleOrgcodeTable.setEnableStatus(new BigDecimal(1));
+            dilRoleOrgcodeTable.setPrimaryName(map.get("schemeName").toString());
+            dilRoleOrgcodeTable.setPrimaryId(dilRoleOrgcodeTableMapper.getPrimaryId());
+            mapList.add(dilRoleOrgcodeTable);
+        }
+        //将该用户的所有方案都变成未启用状
+        dilRoleOrgcodeTableMapper.updateEnableStatus(map);
+        if(mapList.size() > 0) {
+            //然后再批量新增进去
+            i += dilRoleOrgcodeTableMapper.batchInsert(mapList);
+        }
+        return i;
+    }
+
+    @Override
+    public Map<String,Object> getColumShowHideScheme(Map<String, Object> map) {
+        Map<String, Object> responseMap = new HashMap<>();
+        List<Map<String,Object>> schemeList = new ArrayList<>();
+        //每一个map;
+        Map<String,Object> schemeMap = new HashMap<>();
+        //作为传值用的map
+        Map<String,Object> attrMap = new HashMap<>();
+        //当前启用状态的值
+        String activeName = "默认方案";
+        //以下是方案的标题和名字
+        schemeMap.put("title","默认方案");
+        schemeMap.put("name","默认方案");
+        //以下是方案的显示数据和隐藏数据
+        List<Map<String,Object>> columnAllData = universalMapper.getColumnAllData(map);
+        schemeMap.put("columnAllData",columnAllData);
+        responseMap.put("columnAllData",columnAllData);
+        attrMap.put("tableName",map.get("tableName"));
+        map.put("schemeName",activeName);
+        List<String> columnHiddenData = universalMapper.getColumnHiddenData(map);
+        schemeMap.put("columnHiddenData",columnHiddenData);
+        schemeList.add(schemeMap);
+        responseMap.put("activeName",activeName);
+        responseMap.put("columnHiddenData",columnHiddenData);
+        //然后根据用户名和报表名称,去查询方案名称和启用状态
+        List<Map<String,Object>> schemeMapAnotherData = universalMapper.getColumnAllScheme(map);
+        for(Map<String,Object> schemeMapAnotherDataMap : schemeMapAnotherData) {
+                Map<String, Object> itemMap = new HashMap<>();
+                itemMap.put("title",schemeMapAnotherDataMap.get("schemeName"));
+                itemMap.put("name",schemeMapAnotherDataMap.get("schemeName"));
+                itemMap.put("columnAllData",columnAllData);
+                List<String> itemColumnHiddenData = universalMapper.getColumnHiddenData(schemeMapAnotherDataMap);
+                itemMap.put("columnHiddenData",itemColumnHiddenData);
+                schemeList.add(itemMap);
+                if(DataChange.dataToBigDecimal(schemeMapAnotherDataMap.get("enableStatus")).compareTo(new BigDecimal(1)) == 0){
+                    responseMap.put("activeName",schemeMapAnotherDataMap.get("schemeName"));
+                    responseMap.put("columnHiddenData",itemColumnHiddenData);
+                }
+        }
+        responseMap.put("schemeList",schemeList);
+        return responseMap;
+    }
+}

src/main/java/com/steerinfo/dil/util/BaseRESTfulController.java

@@ -0,0 +1,70 @@
+package com.steerinfo.dil.util;
+
+import com.steerinfo.framework.controller.BaseController;
+import com.steerinfo.framework.controller.RESTfulResult;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/7/8 11:33
+ * @Version 1.0
+ */
+public class BaseRESTfulController extends BaseController {
+    public BaseRESTfulController() {
+    }
+
+    protected RESTfulResult success() {
+        RESTfulResult result = new RESTfulResult();
+        result.setSucceed();
+        result.setMessage(result.getResultMessage());
+        result.setData(true);
+        result.setCode("200");
+        return result;
+    }
+
+    protected RESTfulResult success(Object obj) {
+        RESTfulResult result = new RESTfulResult();
+        result.setSucceed();
+        result.setMessage(result.getResultMessage());
+        result.setData(obj);
+        result.setCode("200");
+        return result;
+    }
+
+    protected RESTfulResult success(Object obj, String msg) {
+        RESTfulResult result = this.success(obj);
+        result.setMessage(msg);
+        result.setCode("200");
+        return result;
+    }
+
+    protected RESTfulResult success(Object obj, String code, String msg) {
+        RESTfulResult result = this.success(obj, msg);
+        result.setCode(code);
+        result.setCode("200");
+        return result;
+    }
+
+    protected RESTfulResult failed() {
+        return this.failed((Object)null);
+    }
+
+    protected RESTfulResult failed(Object obj) {
+        RESTfulResult result = new RESTfulResult("201", (String)null);
+        result.setMessage(result.getResultMessage());
+        result.setData(obj);
+        return result;
+    }
+
+    protected RESTfulResult failed(Object obj, String msg) {
+        RESTfulResult result = new RESTfulResult("201", msg);
+        result.setData(obj);
+        return result;
+    }
+
+    protected RESTfulResult failed(Object obj, String code, String msg) {
+        RESTfulResult result = this.failed(obj, msg);
+        result = new RESTfulResult("201", msg);
+        result.setCode(code);
+        return result;
+    }
+}

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -0,0 +1,38 @@
+package com.steerinfo.dil.util;
+
+import com.steerinfo.dil.feign.ColumnDataFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+@Component
+public class ColumnDataUtil {
+    @Autowired
+    ColumnDataFeign columnDataFeign;
+
+    private Set<Map<String, Object>> setListMap(List<Map<String, Object>> list, String name) {
+        Set<Map<String, Object>> setString = new HashSet<>();
+        for (Map<String, Object> map : list) {//遍历每条数据
+            Map<String, Object> map1 = new HashMap<>();
+            //map.get(name)获取每条数据中对应表头字段的数据
+            map1.put("text", map.get(name));
+            if (map.get(name) != null) {
+                map1.put("value", map.get(name));
+                setString.add(map1);
+            }
+        }
+        return setString;
+    }
+
+    public PageListAdd tableColumnData(Integer apiId, List<Map<String,Object>> data) {
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条件
+            columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
+        }
+        PageListAdd pageList = new PageListAdd(data);
+        pageList.setColumnData(columnDataList);
+        return pageList;
+    }
+}

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -0,0 +1,159 @@
+package com.steerinfo.dil.util;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/8/25 11:25
+ */
+
+public class DataChange {
+
+
+    /**
+     * 解析前端传来的日期字符串
+     * @param vueDate
+     * @return
+     */
+    public static Date dataToDate(Object vueDate){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date parseDate = null;
+        if (vueDate != null){
+            try {
+                String date = (String) vueDate;
+                parseDate = sdf.parse(date);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        return parseDate;
+    }
+
+    /**
+     * 数据转换成BigDecimal
+     * @param data
+     * @return
+     */
+    public static BigDecimal dataToBigDecimal(Object data){
+        if (data != null){
+            if(data instanceof BigDecimal){
+                return (BigDecimal) data;
+            }else{
+                String str = String.valueOf(data);
+                BigDecimal decimal = null;
+                if(!"".equals(str)){
+                    try {
+                        decimal = new BigDecimal(str);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        return new BigDecimal(0);
+                    }
+                }
+                return decimal;
+            }
+        }
+        return new BigDecimal(0);
+    }
+
+    /**
+     * 将时间截取到天  为字符串类型 用于前端只显示到天
+     * @param date 传入时间
+     * @return
+     */
+    public static String dateToDayDate(Object date){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date changeDate = null;
+        if(date == null)
+            return null;
+        try{
+             changeDate = (Date) date;
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return sdf.format(changeDate);
+    }
+
+    /**
+     * 遍历从数据库中传进来的数据
+     * @param list 从数据库查询出来的list数据列表
+     * @param key map中多个需要转换的date参数
+     */
+    public static void changeDateToDayDate(List<Map<String, Object>> list, String ...key){
+        //遍历List
+        for (Map<String, Object> map : list) {
+            for (String s : key) {
+                //从map中取 date的值 并转换成字符串类型的日期
+                String stringDate = dateToDayDate(map.get(s));
+                map.put(s, stringDate);
+            }
+        }
+    }
+
+    /**
+     * 遍历列表使只显示两位小数
+     * @param list
+     * @param key
+     */
+    public static void dataTo2Number(List<Map<String, Object>> list, String ...key){
+        //遍历List
+        for (Map<String, Object> map : list) {
+            for (String s : key) {
+                //修改数据为带两位小数
+                BigDecimal oldDate = (BigDecimal) map.get(s);
+                DecimalFormat df =  new DecimalFormat("0.00");
+                String resultDeduction = df.format(oldDate.doubleValue());
+                map.put(s, resultDeduction);
+            }
+        }
+    }
+
+    /**
+     * 计算相差时间  日时分秒
+     * @param
+     * @return
+     */
+    public static String calculatedTimeDifference(Date time1, Date time2){
+        long t1 = time1.getTime();
+        long t2 = time2.getTime();
+        if(t1 > t2){
+            long temp = t1;
+            t1 = t2;
+            t2 = temp;
+        }
+        long between = t2 - t1;
+        long day = between / (24 * 60 * 60 * 1000);
+        long hour = (between / (60 * 60 * 1000) - day * 24);
+        long min = ((between / (60 * 1000)) - day * 24 * 60 - hour * 60);
+        long s = (between / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+        return day + "天"+  + hour+ "时" + min + "分"  + s + "秒";
+    }
+
+    /**
+     * 生成带时间的八位数顺序号
+     * @param start 前缀
+     * @param id 顺序号  主键Id
+     * @return
+     */
+    public static String generateEightDigitsNumber(String start, Integer id){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        StringBuilder sb = new StringBuilder(start + sdf.format(new Date()));
+        sb.append(
+                id < 10
+                        ? "0000000" + id : id < 100
+                        ? "000000" + id : id < 1000
+                        ? "00000" + id : id < 10000
+                        ? "0000" + id : id < 100000
+                        ? "000" + id : id < 1000000
+                        ? "00" + id : id < 10000000
+                        ? "0" + id : id.toString()
+        );
+        return sb.toString();
+    }
+
+}

src/main/java/com/steerinfo/dil/util/ESUtil.java

@@ -0,0 +1,66 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class ESUtil {
+
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "FDDGEAS85";
+    public final String dbType = "1";
+    public final String userName = "user";
+    // context
+    public final String command = "dgQcReportHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

src/main/java/com/steerinfo/dil/util/HTTPRequestUtils.java

@@ -0,0 +1,126 @@
+package com.steerinfo.dil.util;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.HttpEntity;
+import org.apache.http.ParseException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.util.EntityUtils;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class HTTPRequestUtils {
+    /**
+     * 发送post请求
+     * @param url  路径
+     * @param json  参数(json类型)
+     * @param encoding 编码格式
+     * @return
+     * @throws ParseException
+     * @throws IOException
+     */
+    public static String send(String url, String json, String encoding) throws ParseException, IOException {
+        String body = "";
+
+        //创建httpclient对象
+        CloseableHttpClient client = HttpClients.createDefault();
+        //创建post方式请求对象
+        HttpPost httpPost = new HttpPost(url);
+
+        //装填参数
+        StringEntity s = new StringEntity(json.toString(), "utf-8");
+        s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,"application/json"));
+        //设置参数到请求对象中
+        httpPost.setEntity(s);
+        System.out.println("请求地址：" + url);
+        System.out.println(json);
+        httpPost.setHeader("Content-type", "application/json");
+        httpPost.setHeader("-UserAgent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+
+        //执行请求操作，并拿到结果（同步阻塞）
+        CloseableHttpResponse response = client.execute(httpPost);
+        System.out.println(response);
+        //获取结果实体
+        HttpEntity entity = response.getEntity();
+        System.out.println(entity);
+        if (entity != null) {
+            //按指定编码转换结果实体为String类型
+            body = EntityUtils.toString(entity, encoding);
+        }
+        EntityUtils.consume(entity);
+        //释放链接
+        response.close();
+        return body;
+    }
+
+
+    public static String getJsonData(JSONObject jsonParam,String urls) {
+        StringBuffer sb=new StringBuffer();
+        try {
+            // 创建url资源
+            URL url = new URL(urls);
+            // 建立http连接
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            // 设置允许输出
+            conn.setDoOutput(true);
+            // 设置允许输入
+            conn.setDoInput(true);
+            // 设置不用缓存
+            conn.setUseCaches(false);
+            // 设置传递方式
+            conn.setRequestMethod("POST");
+            // 设置维持长连接
+            conn.setRequestProperty("Connection", "Keep-Alive");
+            // 设置文件字符集:
+            conn.setRequestProperty("Charset", "UTF-8");
+            // 转换为字节数组
+            byte[] data = (jsonParam.toString()).getBytes();
+            // 设置文件长度
+            conn.setRequestProperty("Content-Length", String.valueOf(data.length));
+            // 设置文件类型:
+            conn.setRequestProperty("contentType", "application/json");
+            // 开始连接请求
+            conn.connect();
+            OutputStream out = new DataOutputStream(conn.getOutputStream()) ;
+            // 写入请求的字符串
+            out.write((jsonParam.toString()).getBytes());
+            out.flush();
+            out.close();
+            System.out.println(conn.getResponseCode());
+
+            // 请求返回的状态
+            if (HttpURLConnection.HTTP_OK == conn.getResponseCode()){
+                System.out.println("连接成功");
+                // 请求返回的数据
+                InputStream in1 = conn.getInputStream();
+                try {
+                    String readLine = new String();
+                    BufferedReader responseReader=new BufferedReader(new InputStreamReader(in1,"UTF-8"));
+                    while((readLine=responseReader.readLine())!=null){
+                        sb.append(readLine).append("\n");
+                    }
+                    responseReader.close();
+                    System.out.println(sb.toString());
+
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
+            } else {
+                System.out.println("error++");
+            }
+        } catch (Exception e) {
+
+        }
+        return sb.toString();
+
+    }
+
+
+}

src/main/java/com/steerinfo/dil/util/PageListAdd.java

@@ -0,0 +1,33 @@
+package com.steerinfo.dil.util;
+
+import com.steerinfo.framework.service.pagehelper.PageList;
+
+import java.util.List;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/6/7 14:31
+ * @Version 1.0
+ */
+public class PageListAdd<T> extends PageList<T> {
+    public PageListAdd() {
+    }
+
+    public PageListAdd(List<T> list) {
+        super(list, 20);
+    }
+
+    public PageListAdd(List<T> list, int navigatePages) {
+        super(list, navigatePages);
+    }
+
+    private Object columnData;
+
+    public Object getColumnData() {
+        return columnData;
+    }
+
+    public void setColumnData(Object columnData) {
+        this.columnData = columnData;
+    }
+}

src/main/java/com/steerinfo/dil/util/UploadUtils.java

@@ -0,0 +1,75 @@
+package com.steerinfo.dil.util;
+
+import com.google.common.io.Files;
+import com.steerinfo.framework.exception.BaseException;
+import com.steerinfo.framework.utils.io.FileUtils;
+import com.steerinfo.framework.utils.misc.IdGenerator;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+/**
+ * @author lyg
+ * @Description:
+ * @CreateTime 2022/7/15 19:05
+ * @Version:1.0
+ */
+
+    public class UploadUtils {
+        public UploadUtils() {
+        }
+
+        public static String uploadFile(MultipartFile file, IdGenerator idGenerator, String uploadPath, String imgPath) {
+            String profilePhoto = null;
+            if (file != null) {
+                String fileId = idGenerator.getNextStr();
+                String fileName = file.getOriginalFilename();
+                String ext = Files.getFileExtension(fileName.toLowerCase());
+                try {
+                    String filePath = uploadPath + imgPath + fileId + "." + ext;
+                    File newFile = new File(filePath);
+                    FileUtils.makesureParentDirExists(newFile);
+                    Files.write(file.getBytes(), newFile);
+                } catch (IOException var10) {
+                    throw new BaseException("上传文件为空:" + var10.getMessage());
+                }
+
+                profilePhoto = uploadPath + imgPath + fileId + "." + ext;
+            }
+
+            return profilePhoto;
+        }
+
+        public static byte[] imageToByte(String imgUrl) {
+            if (StringUtils.isEmpty(imgUrl)) {
+                return null;
+            } else {
+                File file = new File(imgUrl);
+                byte[] data = null;
+                if (file.exists()) {
+                    String ext = Files.getFileExtension(imgUrl.toLowerCase());
+                    ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+                    try {
+                        BufferedImage bi = ImageIO.read(file);
+                        ImageIO.write(bi, ext, out);
+                        data = out.toByteArray();
+                    } catch (FileNotFoundException var7) {
+                        var7.printStackTrace();
+                    } catch (IOException var8) {
+                        var8.printStackTrace();
+                    }
+                }
+
+                return data;
+            }
+        }
+    }
+
+

src/main/java/com/steerinfo/dil/util/test.java

@@ -0,0 +1,11 @@
+package com.steerinfo.dil.util;
+
+import com.steerinfo.framework.utils.misc.IdGenerator;
+
+public class test {
+    public static void main(String[] args) {
+        for(int i=0;i<1000;i++){
+            System.out.println(new IdGenerator(i%31,10).getNextStr());
+        }
+    }
+}

src/main/java/com/steerinfo/dil/util/util.java

@@ -0,0 +1,11 @@
+package com.steerinfo.dil.util;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/5/26 8:59
+ * @Version 1.0
+ * 工具类
+ */
+public class util {
+
+}

src/main/resources/application-dev.yml

@@ -0,0 +1,61 @@
+spring:
+  datasource:
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: root123
+    username: DAGANG
+    driver-class-name: oracle.jdbc.OracleDriver
+  application:
+    name: antai-api
+server:
+  port: 8080
+
+#  druid:
+#    stat-view-servlet:
+#      #是否启用StatViewServlet(监控页面),默认true-启动，false-不启动
+#      enabled: false
+#      url-pattern: '/druid/*'
+#      # IP白名单(没有配置或者为空，则允许所有访问)
+#      allow:
+#      # IP黑名单(存在共同时,deny优先于allow)
+#      deny:
+#      # 禁用HTML页面上的"Reset All"功能
+#      reset-enable: false
+#      # 登录名
+#      login-username: admin
+#      # 登录密码
+#      login-password: dagang0426
+
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:localhost:8015}
+  BmsshipFeign:
+    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+  BmstrainFeign:
+    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
+  BmstruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+  QmsTruckFeign:
+    url: ${QMSTRUCKFEIGN_URL:localhost:8017}
+  TmsTrainFeign:
+    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+  TmsshipFeign:
+    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
+  WMSHFeign:
+    url: ${WMSHFEIGN_URL:localhost:8070}
+  WMSFeign:
+    url: ${WMSFEIGN_URL:localhost:8012}
+  OMSFeign:
+    url: ${OMSFEIGN_URL:localhost:8016}
+  RmsFeign:
+    url: ${RMSFEIGN_HRL:localhost:8060}
+  JoinFeign:
+    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+  OTMSFeign:
+    url: ${OTMSFEIGN_URL:172.16.33.162:8038}
+
+piction:
+  path: /shared

src/main/resources/application-prod.yml

@@ -0,0 +1,50 @@
+spring:
+  datasource:
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
+    driver-class-name: oracle.jdbc.OracleDriver
+  application:
+    name: dil-api
+  mvc:
+    async:
+      request-timeout: 15000
+
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+  BmsshipFeign:
+    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+  BmstrainFeign:
+    url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
+  BmstruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+  QmsTruckFeign:
+    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
+  TmsTrainFeign:
+    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+  TmsshipFeign:
+    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+  WMSHFeign:
+    url: ${WMSHFEIGN_URL:172.16.33.166:8070}
+  WMSFeign:
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+  OMSFeign:
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+  RmsFeign:
+    url: ${RMSFEIGN_URL:172.16.33.166:8060}
+  JoinFeign:
+    url: ${JOINFEIGN_URL:172.16.33.166:8066}
+  OTMSFeign:
+    url: ${OTMSFEIGN_URL:172.16.33.166:8038}
+piction:
+  path: /shared
+server:
+  port: 8080
+  tomcat:
+    max-threads: 1000
+    accept-count: 800

src/main/resources/bootstrap.yml

@@ -0,0 +1,55 @@
+api.version: api/v1
+spring:
+  profiles:
+    include: ${SPRING_PROFILES:prod}
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  #    serialization: {WRITE_DATES_AS_TIMESTAMPS: true}
+  messages:
+    basename: message
+    encoding: UTF-8
+  mvc:
+    static-path-pattern:
+
+#eureka设置
+eureka:
+  client:
+    service-url:
+
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
+    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
+    fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+
+
+  instance:
+    prefer-ip-address: false
+    status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
+    instance-id: ${spring.cloud.client.ip-address}:${server.port}
+
+genxml:
+  pth: com/agit
+cache:
+  level: 2
+redis:
+  host: 10.10.50.28
+  port: 6379
+  pwd: adhykdj
+  project:
+    prefix: sysmanage
+  pool:
+    maxTotal: 8
+    maxWaitMillis: 1000
+    maxIdle: 8
+  cache:
+    time: 864000000
+  database: 0
+
+mybatis:
+  type-aliases-package: com.steerinfo.dil.model
+  mapper-locations: classpath:com/steerinfo/dil/mapper/*.xml
+  configuration:
+    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    mapUnderscoreToCamelCase: true
+    call-setters-on-nulls: true
+

src/main/resources/com/steerinfo/dil/mapper/BackgroundProcessingMapper.xml

@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.BackgroundProcessingMapper">
+
+    <update id="closePurOrderMoreTrips" parameterType="string">
+        update AMS_PURCHASE_ORDER APO
+        set APO.IS_MORE_TRIPS = null
+        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
+    </update>
+
+    <update id="updatePurOrderOrgId" parameterType="java.util.Map">
+        update AMS_PURCHASE_ORDER APO
+        set APO.PURCHASING_ORGANIZATION_ID = #{orgId}
+        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
+    </update>
+    <update id="allowEnfactory">
+        UPDATE TMSTRUCK_ENFACTORY_RESULT TER
+        SET TER.INSERT_UPDATE_REMARK = 'OK'
+        WHERE TER.RESULT_ID = (SELECT TER.RESULT_ID FROM OMSTRUCK_ORDER OO
+            LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+            LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+            WHERE OO.ORDER_NUMBER = #{orderNumber})
+    </update>
+
+    <select id="getOrderType" resultType="java.lang.Integer" parameterType="java.lang.Integer">
+        select OO.ORDER_TYPE from OMSTRUCK_ORDER OO
+        where oo.ORDER_ID = #{orderId}
+    </select>
+
+    <select id="getOrderMesByOrderNum" resultType="java.util.Map">
+        select OO.ORDER_ID  "orderId",
+               OO.ORDER_TYPE    "orderType",
+               TTR.RESULT_TOTAL_ID  "resultTotalId"
+        from OMSTRUCK_ORDER OO
+                 left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
+        where OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <select id="getEnFactoryResult" resultType="java.util.Map">
+        select TER.RESULT_ID    "resultId",
+               TER.RESULT_ENTRY_GATE_TIME   "time"
+        from TMSTRUCK_ENFACTORY_RESULT TER
+        where TER.RESULT_TOTAL_ID = #{resultTotalId}
+          and  TER.SEGMEN_SQE = #{sqe}
+    </select>
+
+    <select id="loadResult" resultType="java.util.Map">
+        select T.RESULT_ID    "resultId",
+               T.RESULT_LOAD_END_TIME   "time"
+        from TMSTRUCK_LOAD_RESULT T
+        where T.RESULT_TOTAL_ID = #{resultTotalId}
+          and  T.SEGMENT_SQE = #{sqe}
+    </select>
+
+    <select id="unloadResult" resultType="java.util.Map">
+        select T.RESULT_ID    "resultId",
+               T.RESULT_END_TIME   "time"
+        from TMSTRUCK_UNLOAD_RESULT T
+        where T.RESULT_TOTAL_ID = #{resultTotalId}
+          and  T.SEGMENT_SQE = #{sqe}
+    </select>
+
+    <select id="weightResult" resultType="java.util.Map">
+        select T.WEIGHT_TASK_RESULT_ID    "resultId",
+               T.RESULT_TARE_WEIGHT_TIME   "time"
+        from TMSTRUCK_WEIGHT_RESULT T
+        where T.RESULT_TOTAL_ID = #{resultTotalId}
+          and  T.GROSS_SEGMENT_SQE = #{sqe}
+    </select>
+
+    <select id="outFactoryResult" resultType="java.util.Map">
+        select T.RESULT_ID    "resultId",
+               T.RESULT_OUT_GATE_TIME   "time"
+        from TMSTRUCK_LEAVE_FACTORY_RESULT T
+        where T.RESULT_TOTAL_ID = #{resultTotalId}
+          and  T.SEGMENT_SQE = #{sqe}
+    </select>
+
+    <select id="getAllPurOrder" resultType="java.lang.Integer">
+        select OO.ORDER_ID
+        from OMSTRUCK_ORDER OO
+        left join AMS_PURCHASE_ORDER APO
+            on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
+        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
+          and OO.ORDER_TYPE in (5,6,7,8,17,18)
+          and OO.ORDER_STATUS in (3,4)
+    </select>
+
+    <delete id="deleteOrders" parameterType="arraylist">
+        delete
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")" >
+            ${id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteOrderMaterials" parameterType="arraylist">
+        delete
+        from OMSTRUCK_ORDER_MATERIAL OOM
+        where OOM.ORDER_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")" >
+            ${id}
+        </foreach>
+    </delete>
+
+    <delete id="batchByOrderIdForTotalDelete" parameterType="arraylist">
+        delete from TMSTRUCK_TOTAL_RESULT TTR
+        where TTR.ORDER_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="enFactoryCheck" parameterType="decimal" resultType="int">
+        SELECT
+            TER.SEGMEN_SQE  "segmentSqe"
+        FROM
+            TMSTRUCK_ENFACTORY_RESULT TER
+        WHERE
+            TER.RESULT_TOTAL_ID = #{resultTotalId}
+        GROUP BY TER.SEGMEN_SQE
+        HAVING count( TER.SEGMEN_SQE ) > 1
+    </select>
+
+    <select id="loadCheck" parameterType="decimal" resultType="int">
+        SELECT
+            T.SEGMENT_SQE  "segmentSqe"
+        FROM
+            TMSTRUCK_LOAD_RESULT T
+        WHERE
+            T.RESULT_TOTAL_ID = #{resultTotalId}
+        GROUP BY T.SEGMENT_SQE
+        HAVING count( T.SEGMENT_SQE ) > 1
+    </select>
+
+    <select id="unloadCheck" parameterType="decimal" resultType="int">
+        SELECT
+            T.SEGMENT_SQE  "segmentSqe"
+        FROM
+            TMSTRUCK_UNLOAD_RESULT T
+        WHERE
+            T.RESULT_TOTAL_ID = #{resultTotalId}
+        GROUP BY T.SEGMENT_SQE
+        HAVING count( T.SEGMENT_SQE ) > 1
+    </select>
+
+    <select id="weightCheck" parameterType="decimal" resultType="int">
+        SELECT
+            T.GROSS_SEGMENT_SQE   "segmentSqe"
+        FROM
+            TMSTRUCK_WEIGHT_RESULT T
+        WHERE
+            T.RESULT_TOTAL_ID = #{resultTotalId}
+        GROUP BY T.GROSS_SEGMENT_SQE
+        HAVING count( T.GROSS_SEGMENT_SQE  ) > 1
+    </select>
+
+    <select id="outFactoryCheck" parameterType="decimal" resultType="int">
+        SELECT
+            T.SEGMENT_SQE  "segmentSqe"
+        FROM
+            TMSTRUCK_LEAVE_FACTORY_RESULT T
+        WHERE
+            T.RESULT_TOTAL_ID = #{resultTotalId}
+        GROUP BY T.SEGMENT_SQE
+        HAVING count( T.SEGMENT_SQE ) > 1
+    </select>
+    <select id="getDetailsForEnAndQue" resultType="java.util.Map">
+        SELECT OO .ORDER_ID "orderId",
+               TTR .RESULT_TOTAL_ID "resultTotalId",
+               OO .CAPACITY_ID "capacityId"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO .ORDER_ID = TTR .ORDER_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR .RESULT_TOTAL_ID = TTR .RESULT_TOTAL_ID  AND TWR .RESULT_NET_WEIGHT IS NOT NULL
+        WHERE  TWR .WEIGHT_TASK_RESULT_ID IS NULL AND OO .ORDER_TYPE = 1 AND OO .ORDER_STATUS = 5 AND OO .ORDER_NUMBER= #{orderNumber}
+        FETCH NEXT 1 ROWS ONLY
+    </select>
+
+    <delete id="deleteEnFactoryUnnecessaryResult">
+        delete from TMSTRUCK_ENFACTORY_RESULT where RESULT_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")">
+            ${id}
+        </foreach>
+    </delete>
+
+  <delete id="deleteLoadUnnecessaryResult">
+        delete from TMSTRUCK_LOAD_RESULT where RESULT_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")">
+            ${id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteUnloadUnnecessaryResult">
+        delete from TMSTRUCK_UNLOAD_RESULT where RESULT_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")">
+            ${id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteWeightUnnecessaryResult">
+        delete from TMSTRUCK_WEIGHT_RESULT where WEIGHT_TASK_RESULT_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")">
+            ${id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteOutFactoryUnnecessaryResult">
+        delete from TMSTRUCK_LEAVE_FACTORY_RESULT where RESULT_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")">
+            ${id}
+        </foreach>
+    </delete>
+
+    <update id="updateOrderCanWork" parameterType="string">
+        update OMSTRUCK_ORDER OO
+        set oo.CAN_WORK = 2
+        where oo.ORDER_NUMBER = #{orderNumber}
+    </update>
+    <update id="updateOrderStatus" parameterType="java.util.Map">
+        update OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS = #{orderStatus},
+            OO.INSERT_UPDATE_REMARK = '管理员操作修改状态'
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
+    </update>
+    <delete id="deleteExtraWeight">
+        DELETE FROM TMSTRUCK_WEIGHT_RESULT WHERE WEIGHT_TASK_RESULT_ID IN
+         (
+             SELECT
+                 WEIGHT_TASK_RESULT_ID
+             FROM
+                 TMSTRUCK_WEIGHT_RESULT
+             WHERE RESULT_TOTAL_ID=#{resultTotalId}
+             FETCH NEXT
+                (
+                --查询需要删除的数量
+                SELECT COUNT(WEIGHT_TASK_RESULT_ID)-1
+                FROM TMSTRUCK_WEIGHT_RESULT
+                WHERE RESULT_TOTAL_ID=#{resultTotalId}
+                GROUP BY RESULT_TOTAL_ID
+                )
+            ROWS ONLY
+        )
+    </delete>
+    <delete id="deleteExtraLoad">
+        DELETE FROM TMSTRUCK_LOAD_RESULT WHERE RESULT_ID IN
+           (
+               SELECT
+                   RESULT_ID
+               FROM
+                   TMSTRUCK_LOAD_RESULT
+               WHERE RESULT_TOTAL_ID=#{resultTotalId}
+               FETCH NEXT
+                    (
+                    --查询需要删除的数量
+                    SELECT COUNT(RESULT_ID)-1
+                    FROM TMSTRUCK_LOAD_RESULT
+                    WHERE RESULT_TOTAL_ID=#{resultTotalId}
+                    GROUP BY RESULT_TOTAL_ID
+                    )
+                ROWS ONLY
+            )
+    </delete>
+    <delete id="deleteExtraUnload">
+        DELETE FROM TMSTRUCK_UNLOAD_RESULT WHERE RESULT_ID IN
+           (
+               SELECT
+                   RESULT_ID
+               FROM
+                   TMSTRUCK_UNLOAD_RESULT
+               WHERE RESULT_TOTAL_ID=#{resultTotalId}
+               FETCH NEXT
+                (
+                --查询需要删除的数量
+                SELECT COUNT(RESULT_ID)-1
+                FROM TMSTRUCK_UNLOAD_RESULT
+                WHERE RESULT_TOTAL_ID=#{resultTotalId}
+                GROUP BY RESULT_TOTAL_ID
+                )
+                ROWS ONLY
+            )
+    </delete>
+    <insert id="insertNotUpload">
+        INSERT INTO AMS_NOT_UPLOADED_EAS
+        ("ORDER_ID", "NO", "RESULT_POUND_NO", "CAPACITY_NUMBER", "RESULT_CROSS_CALCULATE_NUMBER", "RESULT_TARE_CALCULATE_NUMBER", "RESULT_CROSS_WEIGHT", "RESULT_TARE_WEIGHT", "RESULT_NET_WEIGHT", "RESULT_CROSS_WEIGHT_TIME", "RESULT_TARE_WEIGHT_TIME",
+         "EAS_ENTRY_ID", "INSERT_USERNAME", "INSERT_TIME", "UPDATE_USERNAME", "UPDATE_TIME", "INSERT_UPDATE_REMARK")
+        VALUES
+        (#{orderId}, #{purchaseOrderNo}, #{poundNo}, #{capacityNo}, #{grossTruckCalculateSecond}, #{tareTruckCalculateSecond}, #{grossWeightSecond}, #{tareWeightSecond}, #{netWeightSecond}, #{grossWeigtTimeSecond}, #{tareWeightTimeSecond},
+         (SELECT EAS_ENTRY_ID FROM AMS_PURCHASE_ORDER WHERE PURCHASE_ORDER_NO=#{purchaseOrderNo} AND DELETED=0), NULL, NULL, NULL, NULL, NULL)
+    </insert>
+    <update id="resetPrintNumber">
+        UPDATE OMSTRUCK_ORDER
+        SET PRINTNUMBER=0,
+            PRINTDATE = null
+        WHERE ORDER_ID = #{orderId}
+    </update>
+    <update id="clearEnDetails">
+        UPDATE TMSTRUCK_ENFACTORY_RESULT
+        SET RESULT_ENTRY_MODE = NULL ,RESULT_ENTRY_GATE_TIME = NULL,INSERT_TIME = NULL
+        WHERE RESULT_TOTAL_ID = #{resultTotalId}
+    </update>
+</mapper>

src/main/resources/com/steerinfo/dil/mapper/DilCidCapacityMapper.xml

@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.DilCidCapacityMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilCidCapacity">
+    <id column="CID_CAPACITY_ID" jdbcType="DECIMAL" property="cidCapacityId" />
+    <result column="CID" jdbcType="VARCHAR" property="cid" />
+    <result column="CAPACITY_NUMBER" jdbcType="VARCHAR" property="capacityNumber" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+  </resultMap>
+  <sql id="columns">
+    CID_CAPACITY_ID, CID, CAPACITY_NUMBER, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.CID_CAPACITY_ID, t.CID, t.CAPACITY_NUMBER, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DIL_CID_CAPACITY
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DIL_CID_CAPACITY t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="cidCapacityId != null">
+        and CID_CAPACITY_ID = #{cidCapacityId}
+      </if>
+      <if test="cid != null and cid != ''">
+        and CID = #{cid}
+      </if>
+      <if test="capacityNumber != null and capacityNumber != ''">
+        and CAPACITY_NUMBER = #{capacityNumber}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="cidCapacityId != null">
+        and CID_CAPACITY_ID = #{cidCapacityId}
+      </if>
+      <if test="cid != null and cid != ''">
+        and CID LIKE '%${cid}%'
+      </if>
+      <if test="capacityNumber != null and capacityNumber != ''">
+        and CAPACITY_NUMBER LIKE '%${capacityNumber}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from DIL_CID_CAPACITY
+    where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DIL_CID_CAPACITY
+    where 1!=1 
+      <if test="cid != null and cid != ''">
+        or CID = #{cid}
+      </if>
+      <if test="capacityNumber != null and capacityNumber != ''">
+        or CAPACITY_NUMBER = #{capacityNumber}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.DilCidCapacity">
+    insert into DIL_CID_CAPACITY (CID_CAPACITY_ID, CID, CAPACITY_NUMBER, 
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK)
+    values (#{cidCapacityId,jdbcType=DECIMAL}, #{cid,jdbcType=VARCHAR}, #{capacityNumber,jdbcType=VARCHAR}, 
+      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilCidCapacity">
+    insert into DIL_CID_CAPACITY
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="cidCapacityId != null">
+        CID_CAPACITY_ID,
+      </if>
+      <if test="cid != null">
+        CID,
+      </if>
+      <if test="capacityNumber != null">
+        CAPACITY_NUMBER,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="cidCapacityId != null">
+        #{cidCapacityId,jdbcType=DECIMAL},
+      </if>
+      <if test="cid != null">
+        #{cid,jdbcType=VARCHAR},
+      </if>
+      <if test="capacityNumber != null">
+        #{capacityNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilCidCapacity">
+    update DIL_CID_CAPACITY
+    set CID = #{cid,jdbcType=VARCHAR},
+      CAPACITY_NUMBER = #{capacityNumber,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+    where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilCidCapacity">
+    update DIL_CID_CAPACITY
+    <set>
+      <if test="cid != null">
+        CID = #{cid,jdbcType=VARCHAR},
+      </if>
+      <if test="capacityNumber != null">
+        CAPACITY_NUMBER = #{capacityNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into DIL_CID_CAPACITY 
+      (CID_CAPACITY_ID, 
+      CID, CAPACITY_NUMBER, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.cidCapacityId,jdbcType=DECIMAL}, 
+      #{item.cid,jdbcType=VARCHAR}, #{item.capacityNumber,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DIL_CID_CAPACITY
+     set
+       CID_CAPACITY_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.cidCapacityId,jdbcType=DECIMAL}
+       </foreach>
+       ,CID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.cid,jdbcType=VARCHAR}
+       </foreach>
+       ,CAPACITY_NUMBER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.capacityNumber,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where CID_CAPACITY_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.cidCapacityId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DIL_CID_CAPACITY
+    where CID_CAPACITY_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="selectByCidAndCapacityNo" resultType="java.lang.Integer" parameterType="string">
+    select count(DCC.CAPACITY_NUMBER) from DIL_CID_CAPACITY DCC
+    WHERE DCC.CAPACITY_NUMBER = #{capacityNo}
+    AND DCC.CID = #{cid}
+  </select>
+</mapper>

src/main/resources/com/steerinfo/dil/mapper/DilRoleOrgcodeTableMapper.xml

@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.DilRoleOrgcodeTableMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+    <id column="PRIMARY_ID" jdbcType="DECIMAL" property="primaryId" />
+    <result column="ORG_CODE" jdbcType="VARCHAR" property="orgCode" />
+    <result column="USER_NAME" jdbcType="VARCHAR" property="userName" />
+    <result column="COLUMN_ID" jdbcType="DECIMAL" property="columnId" />
+    <result column="PRIMARY_NAME" jdbcType="VARCHAR" property="primaryName" />
+    <result column="ENABLE_STATUS" jdbcType="DECIMAL" property="enableStatus" />
+  </resultMap>
+  <sql id="columns">
+    PRIMARY_ID, ORG_CODE, USER_NAME, COLUMN_ID, PRIMARY_NAME, ENABLE_STATUS
+  </sql>
+  <sql id="columns_alias">
+    t.PRIMARY_ID, t.ORG_CODE, t.USER_NAME, t.COLUMN_ID, t.PRIMARY_NAME, t.ENABLE_STATUS
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DIL_ROLE_ORGCODE_TABLE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DIL_ROLE_ORGCODE_TABLE t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="primaryId != null">
+        and PRIMARY_ID = #{primaryId}
+      </if>
+      <if test="orgCode != null and orgCode != ''">
+        and ORG_CODE = #{orgCode}
+      </if>
+      <if test="userName != null and userName != ''">
+        and USER_NAME = #{userName}
+      </if>
+      <if test="columnId != null">
+        and COLUMN_ID = #{columnId}
+      </if>
+      <if test="primaryName != null and primaryName != ''">
+        and PRIMARY_NAME = #{primaryName}
+      </if>
+      <if test="enableStatus != null">
+        and ENABLE_STATUS = #{enableStatus}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="primaryId != null">
+        and PRIMARY_ID = #{primaryId}
+      </if>
+      <if test="orgCode != null and orgCode != ''">
+        and ORG_CODE LIKE '%${orgCode}%'
+      </if>
+      <if test="userName != null and userName != ''">
+        and USER_NAME LIKE '%${userName}%'
+      </if>
+      <if test="columnId != null">
+        and COLUMN_ID = #{columnId}
+      </if>
+      <if test="primaryName != null and primaryName != ''">
+        and PRIMARY_NAME LIKE '%${primaryName}%'
+      </if>
+      <if test="enableStatus != null">
+        and ENABLE_STATUS = #{enableStatus}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from DIL_ROLE_ORGCODE_TABLE
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DIL_ROLE_ORGCODE_TABLE
+    where 1!=1
+    <if test="orgCode != null and orgCode != ''">
+      or ORG_CODE = #{orgCode}
+    </if>
+    <if test="userName != null and userName != ''">
+      or USER_NAME = #{userName}
+    </if>
+    <if test="columnId != null">
+      or COLUMN_ID = #{columnId}
+    </if>
+    <if test="primaryName != null and primaryName != ''">
+      or PRIMARY_NAME = #{primaryName}
+    </if>
+    <if test="enableStatus != null">
+      or ENABLE_STATUS = #{enableStatus}
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+    insert into DIL_ROLE_ORGCODE_TABLE (PRIMARY_ID, ORG_CODE, USER_NAME,
+                                        COLUMN_ID, PRIMARY_NAME, ENABLE_STATUS
+    )
+    values (#{primaryId,jdbcType=DECIMAL}, #{orgCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
+            #{columnId,jdbcType=DECIMAL}, #{primaryName,jdbcType=VARCHAR}, #{enableStatus,jdbcType=DECIMAL}
+           )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+    insert into DIL_ROLE_ORGCODE_TABLE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="primaryId != null">
+        PRIMARY_ID,
+      </if>
+      <if test="orgCode != null">
+        ORG_CODE,
+      </if>
+      <if test="userName != null">
+        USER_NAME,
+      </if>
+      <if test="columnId != null">
+        COLUMN_ID,
+      </if>
+      <if test="primaryName != null">
+        PRIMARY_NAME,
+      </if>
+      <if test="enableStatus != null">
+        ENABLE_STATUS,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="primaryId != null">
+        #{primaryId,jdbcType=DECIMAL},
+      </if>
+      <if test="orgCode != null">
+        #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="columnId != null">
+        #{columnId,jdbcType=DECIMAL},
+      </if>
+      <if test="primaryName != null">
+        #{primaryName,jdbcType=VARCHAR},
+      </if>
+      <if test="enableStatus != null">
+        #{enableStatus,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+    update DIL_ROLE_ORGCODE_TABLE
+    set ORG_CODE = #{orgCode,jdbcType=VARCHAR},
+        USER_NAME = #{userName,jdbcType=VARCHAR},
+        COLUMN_ID = #{columnId,jdbcType=DECIMAL},
+        PRIMARY_NAME = #{primaryName,jdbcType=VARCHAR},
+        ENABLE_STATUS = #{enableStatus,jdbcType=DECIMAL}
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+    update DIL_ROLE_ORGCODE_TABLE
+    <set>
+      <if test="orgCode != null">
+        ORG_CODE = #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        USER_NAME = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="columnId != null">
+        COLUMN_ID = #{columnId,jdbcType=DECIMAL},
+      </if>
+      <if test="primaryName != null">
+        PRIMARY_NAME = #{primaryName,jdbcType=VARCHAR},
+      </if>
+      <if test="enableStatus != null">
+        ENABLE_STATUS = #{enableStatus,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into DIL_ROLE_ORGCODE_TABLE
+    (PRIMARY_ID,
+    ORG_CODE, USER_NAME, COLUMN_ID,
+    PRIMARY_NAME, ENABLE_STATUS)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.primaryId,jdbcType=DECIMAL},
+    #{item.orgCode,jdbcType=VARCHAR}, #{item.userName,jdbcType=VARCHAR}, #{item.columnId,jdbcType=DECIMAL},
+    #{item.primaryName,jdbcType=VARCHAR}, #{item.enableStatus,jdbcType=DECIMAL} from dual
+  </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+    update DIL_ROLE_ORGCODE_TABLE
+    set
+    PRIMARY_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+      when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryId,jdbcType=DECIMAL}
+    </foreach>
+    ,ORG_CODE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+      when #{item.primaryId,jdbcType=DECIMAL} then #{item.orgCode,jdbcType=VARCHAR}
+    </foreach>
+    ,USER_NAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+      when #{item.primaryId,jdbcType=DECIMAL} then #{item.userName,jdbcType=VARCHAR}
+    </foreach>
+    ,COLUMN_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+      when #{item.primaryId,jdbcType=DECIMAL} then #{item.columnId,jdbcType=DECIMAL}
+    </foreach>
+    ,PRIMARY_NAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+      when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryName,jdbcType=VARCHAR}
+    </foreach>
+    ,ENABLE_STATUS=
+    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+      when #{item.primaryId,jdbcType=DECIMAL} then #{item.enableStatus,jdbcType=DECIMAL}
+    </foreach>
+    where PRIMARY_ID in
+    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+      #{item.primaryId,jdbcType=DECIMAL}
+    </foreach>
+  </update>
+
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DIL_ROLE_ORGCODE_TABLE
+    where PRIMARY_ID in
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <delete id="deleteSchmenLColumnData" parameterType="map">
+    delete from DIL_ROLE_ORGCODE_TABLE DROT
+    where DROT.USER_NAME = #{userName}
+    and DROT.ORG_CODE = #{orgCode}
+    and DROT.PRIMARY_NAME = #{schemeName}
+    AND DROT.COLUMN_ID IN (SELECT DTCR.PRIMARY_ID FROM DIL_TABLE_COLUMN_ROLE DTCR
+    WHERE DTCR.TABLE_NAME = #{tableName})
+  </delete>
+  <update id="updateEnableStatus" parameterType="map">
+    UPDATE DIL_ROLE_ORGCODE_TABLE DROT
+    SET DROT.ENABLE_STATUS = 0
+    where
+    DROT.USER_NAME = #{userName}
+    AND DROT.COLUMN_ID IN
+    (SELECT DTCR.PRIMARY_ID FROM DIL_TABLE_COLUMN_ROLE DTCR
+    WHERE DTCR.TABLE_NAME = #{tableName})
+    AND DROT.ORG_CODE = #{orgCode}
+  </update>
+</mapper>

src/main/resources/com/steerinfo/dil/mapper/DilTableColumnRoleMapper.xml

@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.DilTableColumnRoleMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilTableColumnRole">
+    <id column="PRIMARY_ID" jdbcType="DECIMAL" property="primaryId" />
+    <result column="TABLE_NAME" jdbcType="VARCHAR" property="tableName" />
+    <result column="COLUMN_NAME" jdbcType="VARCHAR" property="columnName" />
+  </resultMap>
+  <sql id="columns">
+    PRIMARY_ID, TABLE_NAME, COLUMN_NAME
+  </sql>
+  <sql id="columns_alias">
+    t.PRIMARY_ID, t.TABLE_NAME, t.COLUMN_NAME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DIL_TABLE_COLUMN_ROLE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DIL_TABLE_COLUMN_ROLE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="primaryId != null">
+        and PRIMARY_ID = #{primaryId}
+      </if>
+      <if test="tableName != null and tableName != ''">
+        and TABLE_NAME = #{tableName}
+      </if>
+      <if test="columnName != null and columnName != ''">
+        and COLUMN_NAME = #{columnName}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="primaryId != null">
+        and PRIMARY_ID = #{primaryId}
+      </if>
+      <if test="tableName != null and tableName != ''">
+        and TABLE_NAME LIKE '%${tableName}%'
+      </if>
+      <if test="columnName != null and columnName != ''">
+        and COLUMN_NAME LIKE '%${columnName}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from DIL_TABLE_COLUMN_ROLE
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DIL_TABLE_COLUMN_ROLE
+    where 1!=1 
+      <if test="tableName != null and tableName != ''">
+        or TABLE_NAME = #{tableName}
+      </if>
+      <if test="columnName != null and columnName != ''">
+        or COLUMN_NAME = #{columnName}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
+    insert into DIL_TABLE_COLUMN_ROLE (PRIMARY_ID, TABLE_NAME, COLUMN_NAME
+      )
+    values (#{primaryId,jdbcType=DECIMAL}, #{tableName,jdbcType=VARCHAR}, #{columnName,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
+    insert into DIL_TABLE_COLUMN_ROLE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="primaryId != null">
+        PRIMARY_ID,
+      </if>
+      <if test="tableName != null">
+        TABLE_NAME,
+      </if>
+      <if test="columnName != null">
+        COLUMN_NAME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="primaryId != null">
+        #{primaryId,jdbcType=DECIMAL},
+      </if>
+      <if test="tableName != null">
+        #{tableName,jdbcType=VARCHAR},
+      </if>
+      <if test="columnName != null">
+        #{columnName,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
+    update DIL_TABLE_COLUMN_ROLE
+    set TABLE_NAME = #{tableName,jdbcType=VARCHAR},
+      COLUMN_NAME = #{columnName,jdbcType=VARCHAR}
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
+    update DIL_TABLE_COLUMN_ROLE
+    <set>
+      <if test="tableName != null">
+        TABLE_NAME = #{tableName,jdbcType=VARCHAR},
+      </if>
+      <if test="columnName != null">
+        COLUMN_NAME = #{columnName,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into DIL_TABLE_COLUMN_ROLE 
+      (PRIMARY_ID, 
+      TABLE_NAME, COLUMN_NAME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.primaryId,jdbcType=DECIMAL}, 
+      #{item.tableName,jdbcType=VARCHAR}, #{item.columnName,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DIL_TABLE_COLUMN_ROLE
+     set
+       PRIMARY_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+          when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryId,jdbcType=DECIMAL}
+       </foreach>
+       ,TABLE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+          when #{item.primaryId,jdbcType=DECIMAL} then #{item.tableName,jdbcType=VARCHAR}
+       </foreach>
+       ,COLUMN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+          when #{item.primaryId,jdbcType=DECIMAL} then #{item.columnName,jdbcType=VARCHAR}
+       </foreach>
+     where PRIMARY_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.primaryId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DIL_TABLE_COLUMN_ROLE
+    where PRIMARY_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="selectColumnId" resultType="java.math.BigDecimal" parameterType="string">
+    SELECT PRIMARY_ID FROM DIL_TABLE_COLUMN_ROLE
+    WHERE TABLE_NAME = #{tableName}
+    AND COLUMN_NAME = #{s}
+  </select>
+</mapper>

src/main/resources/com/steerinfo/dil/mapper/DilVersionMapper.xml

@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.DilVersionMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilVersion">
+    <id column="VERSION_ID" jdbcType="DECIMAL" property="versionId" />
+    <result column="VERSION_VALUE" jdbcType="VARCHAR" property="versionValue" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="VERSION_TYPE" jdbcType="DECIMAL" property="versionType" />
+  </resultMap>
+  <sql id="columns">
+    VERSION_ID, VERSION_VALUE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+    INSERT_UPDATE_REMARK, VERSION_TYPE
+  </sql>
+  <sql id="columns_alias">
+    t.VERSION_ID, t.VERSION_VALUE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.VERSION_TYPE
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM DIL_VERSION
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM DIL_VERSION t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="versionId != null">
+        and VERSION_ID = #{versionId}
+      </if>
+      <if test="versionValue != null and versionValue != ''">
+        and VERSION_VALUE = #{versionValue}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="versionType != null">
+        and VERSION_TYPE = #{versionType}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="versionId != null">
+        and VERSION_ID = #{versionId}
+      </if>
+      <if test="versionValue != null and versionValue != ''">
+        and VERSION_VALUE LIKE '%${versionValue}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="versionType != null">
+        and VERSION_TYPE = #{versionType}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from DIL_VERSION
+    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DIL_VERSION
+    where 1!=1
+    <if test="versionValue != null and versionValue != ''">
+      or VERSION_VALUE = #{versionValue}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="versionType != null">
+      or VERSION_TYPE = #{versionType}
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.DilVersion">
+    insert into DIL_VERSION (VERSION_ID, VERSION_VALUE, INSERT_USERNAME,
+                             INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                             INSERT_UPDATE_REMARK, VERSION_TYPE)
+    values (#{versionId,jdbcType=DECIMAL}, #{versionValue,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
+            #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+            #{insertUpdateRemark,jdbcType=VARCHAR}, #{versionType,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilVersion">
+    insert into DIL_VERSION
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="versionId != null">
+        VERSION_ID,
+      </if>
+      <if test="versionValue != null">
+        VERSION_VALUE,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="versionType != null">
+        VERSION_TYPE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="versionId != null">
+        #{versionId,jdbcType=DECIMAL},
+      </if>
+      <if test="versionValue != null">
+        #{versionValue,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="versionType != null">
+        #{versionType,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilVersion">
+    update DIL_VERSION
+    set VERSION_VALUE = #{versionValue,jdbcType=VARCHAR},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        VERSION_TYPE = #{versionType,jdbcType=DECIMAL}
+    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilVersion">
+    update DIL_VERSION
+    <set>
+      <if test="versionValue != null">
+        VERSION_VALUE = #{versionValue,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="versionType != null">
+        VERSION_TYPE = #{versionType,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into DIL_VERSION
+    (VERSION_ID,
+    VERSION_VALUE, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK,
+    VERSION_TYPE)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.versionId,jdbcType=DECIMAL},
+    #{item.versionValue,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
+    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+    #{item.versionType,jdbcType=DECIMAL} from dual
+  </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+    update DIL_VERSION
+    set
+    VERSION_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.versionId,jdbcType=DECIMAL}
+    </foreach>
+    ,VERSION_VALUE=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.versionValue,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,VERSION_TYPE=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.versionType,jdbcType=DECIMAL}
+    </foreach>
+    where VERSION_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.versionId,jdbcType=DECIMAL}
+    </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DIL_VERSION
+    where VERSION_ID in
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="getAppVersion" resultType="string">
+    select *
+    from (
+           select DV.VERSION_VALUE
+           from DIL_VERSION DV
+           where DV.VERSION_TYPE = 0
+           order by DV.VERSION_ID desc
+         )
+    where ROWNUM = 1
+  </select>
+
+
+  <select id="getVersionId" parameterType="string" resultType="java.lang.Integer">
+    select DV.VERSION_ID from DIL_VERSION DV
+    where DV.VERSION_VALUE = #{versionValue}
+  </select>
+
+
+  <select id="getPDAVersion" resultType="java.lang.String">
+    select *
+    from (
+           select DV.VERSION_VALUE
+           from DIL_VERSION DV
+           where DV.VERSION_TYPE = 1
+           order by DV.VERSION_ID desc
+         )
+    where ROWNUM = 1
+  </select>
+
+</mapper>

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -0,0 +1,4519 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.OmstruckOrderMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.OmstruckOrder">
+        <id column="ORDER_ID" jdbcType="DECIMAL" property="orderId" />
+        <result column="ORDER_PLAN_ID" jdbcType="DECIMAL" property="orderPlanId" />
+        <result column="ORDER_NUMBER" jdbcType="VARCHAR" property="orderNumber" />
+        <result column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId" />
+        <result column="ORDER_ISSUE_TIME" jdbcType="TIMESTAMP" property="orderIssueTime" />
+        <result column="ORDER_RECEIVE_STATUS" jdbcType="DECIMAL" property="orderReceiveStatus" />
+        <result column="ORDER_RECEIVE_REFUSE_TIME" jdbcType="TIMESTAMP" property="orderReceiveRefuseTime" />
+        <result column="ORDER_COMMUNICATION_DURATION" jdbcType="DECIMAL" property="orderCommunicationDuration" />
+        <result column="ORDER_STATUS" jdbcType="DECIMAL" property="orderStatus" />
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+        <result column="ORDER_TYPE" jdbcType="DECIMAL" property="orderType" />
+        <result column="ORDER_LINE_SEQUENCE" jdbcType="DECIMAL" property="orderLineSequence" />
+        <result column="LINE_ID" jdbcType="DECIMAL" property="lineId" />
+        <result column="ORDER_ENTRY_TIME" jdbcType="TIMESTAMP" property="orderEntryTime" />
+        <result column="UNLOAD_POINT_ID" jdbcType="DECIMAL" property="unloadPointId" />
+        <result column="DRIVER_CONFIRMATION" jdbcType="DECIMAL" property="driverConfirmation" />
+        <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
+        <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
+        <result column="TRIP_ID" jdbcType="VARCHAR" property="tripId" />
+        <result column="ORDER_PRINT_STATUS" jdbcType="DECIMAL" property="orderPrintStatus" />
+        <result column="DRIVER_TEL" jdbcType="VARCHAR" property="driverTel" />
+        <result column="OPTIONER_CODE" jdbcType="VARCHAR" property="optionerCode" />
+        <result column="CAN_WORK" jdbcType="DECIMAL" property="canWork" />
+    </resultMap>
+    <sql id="columns">
+        ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER, CAPACITY_ID, ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS,
+    ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION, ORDER_STATUS, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ORDER_TYPE,
+    ORDER_LINE_SEQUENCE, LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID, DRIVER_CONFIRMATION,
+    PRICE_ID, CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL, OPTIONER_CODE, CAN_WORK
+    </sql>
+    <sql id="columns_alias">
+        t.ORDER_ID, t.ORDER_PLAN_ID, t.ORDER_NUMBER, t.CAPACITY_ID, t.ORDER_ISSUE_TIME, t.ORDER_RECEIVE_STATUS,
+    t.ORDER_RECEIVE_REFUSE_TIME, t.ORDER_COMMUNICATION_DURATION, t.ORDER_STATUS, t.INSERT_USERNAME,
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
+    t.ORDER_TYPE, t.ORDER_LINE_SEQUENCE, t.LINE_ID, t.ORDER_ENTRY_TIME, t.UNLOAD_POINT_ID,
+    t.DRIVER_CONFIRMATION, t.PRICE_ID, t.CARRIER_ID, t.TRIP_ID, t.ORDER_PRINT_STATUS,
+    t.DRIVER_TEL, t.OPTIONER_CODE, t.CAN_WORK
+    </sql>
+    <sql id="select">
+        SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER
+    </sql>
+    <sql id="select_alias">
+        SELECT <include refid="columns_alias" /> FROM OMSTRUCK_ORDER t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="orderId != null">
+                and ORDER_ID = #{orderId}
+            </if>
+            <if test="orderPlanId != null">
+                and ORDER_PLAN_ID = #{orderPlanId}
+            </if>
+            <if test="orderNumber != null and orderNumber != ''">
+                and ORDER_NUMBER = #{orderNumber}
+            </if>
+            <if test="capacityId != null">
+                and CAPACITY_ID = #{capacityId}
+            </if>
+            <if test="orderIssueTime != null">
+                and TO_CHAR(ORDER_ISSUE_TIME,'yyyy-MM-dd') = #{orderIssueTime}
+            </if>
+            <if test="orderReceiveStatus != null">
+                and ORDER_RECEIVE_STATUS = #{orderReceiveStatus}
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                and TO_CHAR(ORDER_RECEIVE_REFUSE_TIME,'yyyy-MM-dd') = #{orderReceiveRefuseTime}
+            </if>
+            <if test="orderCommunicationDuration != null">
+                and ORDER_COMMUNICATION_DURATION = #{orderCommunicationDuration}
+            </if>
+            <if test="orderStatus != null">
+                and ORDER_STATUS = #{orderStatus}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+            <if test="orderType != null">
+                and ORDER_TYPE = #{orderType}
+            </if>
+            <if test="orderLineSequence != null">
+                and ORDER_LINE_SEQUENCE = #{orderLineSequence}
+            </if>
+            <if test="lineId != null">
+                and LINE_ID = #{lineId}
+            </if>
+            <if test="orderEntryTime != null">
+                and TO_CHAR(ORDER_ENTRY_TIME,'yyyy-MM-dd') = #{orderEntryTime}
+            </if>
+            <if test="unloadPointId != null">
+                and UNLOAD_POINT_ID = #{unloadPointId}
+            </if>
+            <if test="driverConfirmation != null">
+                and DRIVER_CONFIRMATION = #{driverConfirmation}
+            </if>
+            <if test="priceId != null">
+                and PRICE_ID = #{priceId}
+            </if>
+            <if test="carrierId != null">
+                and CARRIER_ID = #{carrierId}
+            </if>
+            <if test="tripId != null and tripId != ''">
+                and TRIP_ID = #{tripId}
+            </if>
+            <if test="orderPrintStatus != null">
+                and ORDER_PRINT_STATUS = #{orderPrintStatus}
+            </if>
+            <if test="driverTel != null and driverTel != ''">
+                and DRIVER_TEL = #{driverTel}
+            </if>
+            <if test="optionerCode != null and optionerCode != ''">
+                and OPTIONER_CODE = #{optionerCode}
+            </if>
+            <if test="canWork != null">
+                and CAN_WORK = #{canWork}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="orderId != null">
+                and ORDER_ID = #{orderId}
+            </if>
+            <if test="orderPlanId != null">
+                and ORDER_PLAN_ID = #{orderPlanId}
+            </if>
+            <if test="orderNumber != null and orderNumber != ''">
+                and ORDER_NUMBER LIKE '%${orderNumber}%'
+            </if>
+            <if test="capacityId != null">
+                and CAPACITY_ID = #{capacityId}
+            </if>
+            <if test="orderIssueTime != null">
+                and TO_CHAR(ORDER_ISSUE_TIME,'yyyy-MM-dd') = #{orderIssueTime}
+            </if>
+            <if test="orderReceiveStatus != null">
+                and ORDER_RECEIVE_STATUS = #{orderReceiveStatus}
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                and TO_CHAR(ORDER_RECEIVE_REFUSE_TIME,'yyyy-MM-dd') = #{orderReceiveRefuseTime}
+            </if>
+            <if test="orderCommunicationDuration != null">
+                and ORDER_COMMUNICATION_DURATION = #{orderCommunicationDuration}
+            </if>
+            <if test="orderStatus != null">
+                and ORDER_STATUS = #{orderStatus}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+            <if test="orderType != null">
+                and ORDER_TYPE = #{orderType}
+            </if>
+            <if test="orderLineSequence != null">
+                and ORDER_LINE_SEQUENCE = #{orderLineSequence}
+            </if>
+            <if test="lineId != null">
+                and LINE_ID = #{lineId}
+            </if>
+            <if test="orderEntryTime != null">
+                and TO_CHAR(ORDER_ENTRY_TIME,'yyyy-MM-dd') = #{orderEntryTime}
+            </if>
+            <if test="unloadPointId != null">
+                and UNLOAD_POINT_ID = #{unloadPointId}
+            </if>
+            <if test="driverConfirmation != null">
+                and DRIVER_CONFIRMATION = #{driverConfirmation}
+            </if>
+            <if test="priceId != null">
+                and PRICE_ID = #{priceId}
+            </if>
+            <if test="carrierId != null">
+                and CARRIER_ID = #{carrierId}
+            </if>
+            <if test="tripId != null and tripId != ''">
+                and TRIP_ID LIKE '%${tripId}%'
+            </if>
+            <if test="orderPrintStatus != null">
+                and ORDER_PRINT_STATUS = #{orderPrintStatus}
+            </if>
+            <if test="driverTel != null and driverTel != ''">
+                and DRIVER_TEL LIKE '%${driverTel}%'
+            </if>
+            <if test="optionerCode != null and optionerCode != ''">
+                and OPTIONER_CODE LIKE '%${optionerCode}%'
+            </if>
+            <if test="canWork != null">
+                and CAN_WORK = #{canWork}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+        delete from OMSTRUCK_ORDER
+        where ORDER_ID = #{orderId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from OMSTRUCK_ORDER
+        where 1!=1
+        <if test="orderPlanId != null">
+            or ORDER_PLAN_ID = #{orderPlanId}
+        </if>
+        <if test="orderNumber != null and orderNumber != ''">
+            or ORDER_NUMBER = #{orderNumber}
+        </if>
+        <if test="capacityId != null">
+            or CAPACITY_ID = #{capacityId}
+        </if>
+        <if test="orderIssueTime != null">
+            or TO_CHAR(ORDER_ISSUE_TIME,'yyyy-MM-dd') = '#{orderIssueTime}'
+        </if>
+        <if test="orderReceiveStatus != null">
+            or ORDER_RECEIVE_STATUS = #{orderReceiveStatus}
+        </if>
+        <if test="orderReceiveRefuseTime != null">
+            or TO_CHAR(ORDER_RECEIVE_REFUSE_TIME,'yyyy-MM-dd') = '#{orderReceiveRefuseTime}'
+        </if>
+        <if test="orderCommunicationDuration != null">
+            or ORDER_COMMUNICATION_DURATION = #{orderCommunicationDuration}
+        </if>
+        <if test="orderStatus != null">
+            or ORDER_STATUS = #{orderStatus}
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+        <if test="orderType != null">
+            or ORDER_TYPE = #{orderType}
+        </if>
+        <if test="orderLineSequence != null">
+            or ORDER_LINE_SEQUENCE = #{orderLineSequence}
+        </if>
+        <if test="lineId != null">
+            or LINE_ID = #{lineId}
+        </if>
+        <if test="orderEntryTime != null">
+            or TO_CHAR(ORDER_ENTRY_TIME,'yyyy-MM-dd') = '#{orderEntryTime}'
+        </if>
+        <if test="unloadPointId != null">
+            or UNLOAD_POINT_ID = #{unloadPointId}
+        </if>
+        <if test="driverConfirmation != null">
+            or DRIVER_CONFIRMATION = #{driverConfirmation}
+        </if>
+        <if test="priceId != null">
+            or PRICE_ID = #{priceId}
+        </if>
+        <if test="carrierId != null">
+            or CARRIER_ID = #{carrierId}
+        </if>
+        <if test="tripId != null and tripId != ''">
+            or TRIP_ID = #{tripId}
+        </if>
+        <if test="orderPrintStatus != null">
+            or ORDER_PRINT_STATUS = #{orderPrintStatus}
+        </if>
+        <if test="driverTel != null and driverTel != ''">
+            or DRIVER_TEL = #{driverTel}
+        </if>
+        <if test="optionerCode != null and optionerCode != ''">
+            or OPTIONER_CODE = #{optionerCode}
+        </if>
+        <if test="canWork != null">
+            or CAN_WORK = #{canWork}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrder">
+        insert into OMSTRUCK_ORDER (ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER,
+                                    CAPACITY_ID, ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS,
+                                    ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION,
+                                    ORDER_STATUS, INSERT_USERNAME, INSERT_TIME,
+                                    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+                                    DELETED, ORDER_TYPE, ORDER_LINE_SEQUENCE,
+                                    LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
+                                    DRIVER_CONFIRMATION, PRICE_ID, CARRIER_ID,
+                                    TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL,
+                                    OPTIONER_CODE, CAN_WORK)
+        values (#{orderId,jdbcType=DECIMAL}, #{orderPlanId,jdbcType=DECIMAL}, #{orderNumber,jdbcType=VARCHAR},
+                #{capacityId,jdbcType=DECIMAL}, #{orderIssueTime,jdbcType=TIMESTAMP}, #{orderReceiveStatus,jdbcType=DECIMAL},
+                #{orderReceiveRefuseTime,jdbcType=TIMESTAMP}, #{orderCommunicationDuration,jdbcType=DECIMAL},
+                #{orderStatus,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+                #{deleted,jdbcType=DECIMAL}, #{orderType,jdbcType=DECIMAL}, #{orderLineSequence,jdbcType=DECIMAL},
+                #{lineId,jdbcType=DECIMAL}, #{orderEntryTime,jdbcType=TIMESTAMP}, #{unloadPointId,jdbcType=DECIMAL},
+                #{driverConfirmation,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
+                #{tripId,jdbcType=VARCHAR}, #{orderPrintStatus,jdbcType=DECIMAL}, #{driverTel,jdbcType=VARCHAR},
+                #{optionerCode,jdbcType=VARCHAR}, #{canWork,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
+        insert into OMSTRUCK_ORDER
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">
+                ORDER_ID,
+            </if>
+            <if test="orderPlanId != null">
+                ORDER_PLAN_ID,
+            </if>
+            <if test="orderNumber != null">
+                ORDER_NUMBER,
+            </if>
+            <if test="capacityId != null">
+                CAPACITY_ID,
+            </if>
+            <if test="orderIssueTime != null">
+                ORDER_ISSUE_TIME,
+            </if>
+            <if test="orderReceiveStatus != null">
+                ORDER_RECEIVE_STATUS,
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                ORDER_RECEIVE_REFUSE_TIME,
+            </if>
+            <if test="orderCommunicationDuration != null">
+                ORDER_COMMUNICATION_DURATION,
+            </if>
+            <if test="orderStatus != null">
+                ORDER_STATUS,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+            <if test="orderType != null">
+                ORDER_TYPE,
+            </if>
+            <if test="orderLineSequence != null">
+                ORDER_LINE_SEQUENCE,
+            </if>
+            <if test="lineId != null">
+                LINE_ID,
+            </if>
+            <if test="orderEntryTime != null">
+                ORDER_ENTRY_TIME,
+            </if>
+            <if test="unloadPointId != null">
+                UNLOAD_POINT_ID,
+            </if>
+            <if test="driverConfirmation != null">
+                DRIVER_CONFIRMATION,
+            </if>
+            <if test="priceId != null">
+                PRICE_ID,
+            </if>
+            <if test="carrierId != null">
+                CARRIER_ID,
+            </if>
+            <if test="tripId != null">
+                TRIP_ID,
+            </if>
+            <if test="orderPrintStatus != null">
+                ORDER_PRINT_STATUS,
+            </if>
+            <if test="driverTel != null">
+                DRIVER_TEL,
+            </if>
+            <if test="optionerCode != null">
+                OPTIONER_CODE,
+            </if>
+            <if test="canWork != null">
+                CAN_WORK,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">
+                #{orderId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderPlanId != null">
+                #{orderPlanId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderNumber != null">
+                #{orderNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="capacityId != null">
+                #{capacityId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderIssueTime != null">
+                #{orderIssueTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="orderReceiveStatus != null">
+                #{orderReceiveStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                #{orderReceiveRefuseTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="orderCommunicationDuration != null">
+                #{orderCommunicationDuration,jdbcType=DECIMAL},
+            </if>
+            <if test="orderStatus != null">
+                #{orderStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+            <if test="orderType != null">
+                #{orderType,jdbcType=DECIMAL},
+            </if>
+            <if test="orderLineSequence != null">
+                #{orderLineSequence,jdbcType=DECIMAL},
+            </if>
+            <if test="lineId != null">
+                #{lineId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderEntryTime != null">
+                #{orderEntryTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="unloadPointId != null">
+                #{unloadPointId,jdbcType=DECIMAL},
+            </if>
+            <if test="driverConfirmation != null">
+                #{driverConfirmation,jdbcType=DECIMAL},
+            </if>
+            <if test="priceId != null">
+                #{priceId,jdbcType=DECIMAL},
+            </if>
+            <if test="carrierId != null">
+                #{carrierId,jdbcType=DECIMAL},
+            </if>
+            <if test="tripId != null">
+                #{tripId,jdbcType=VARCHAR},
+            </if>
+            <if test="orderPrintStatus != null">
+                #{orderPrintStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="driverTel != null">
+                #{driverTel,jdbcType=VARCHAR},
+            </if>
+            <if test="optionerCode != null">
+                #{optionerCode,jdbcType=VARCHAR},
+            </if>
+            <if test="canWork != null">
+                #{canWork,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrder">
+        update OMSTRUCK_ORDER
+        set ORDER_PLAN_ID = #{orderPlanId,jdbcType=DECIMAL},
+            ORDER_NUMBER = #{orderNumber,jdbcType=VARCHAR},
+            CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
+            ORDER_ISSUE_TIME = #{orderIssueTime,jdbcType=TIMESTAMP},
+            ORDER_RECEIVE_STATUS = #{orderReceiveStatus,jdbcType=DECIMAL},
+            ORDER_RECEIVE_REFUSE_TIME = #{orderReceiveRefuseTime,jdbcType=TIMESTAMP},
+            ORDER_COMMUNICATION_DURATION = #{orderCommunicationDuration,jdbcType=DECIMAL},
+            ORDER_STATUS = #{orderStatus,jdbcType=DECIMAL},
+            INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED = #{deleted,jdbcType=DECIMAL},
+            ORDER_TYPE = #{orderType,jdbcType=DECIMAL},
+            ORDER_LINE_SEQUENCE = #{orderLineSequence,jdbcType=DECIMAL},
+            LINE_ID = #{lineId,jdbcType=DECIMAL},
+            ORDER_ENTRY_TIME = #{orderEntryTime,jdbcType=TIMESTAMP},
+            UNLOAD_POINT_ID = #{unloadPointId,jdbcType=DECIMAL},
+            DRIVER_CONFIRMATION = #{driverConfirmation,jdbcType=DECIMAL},
+            PRICE_ID = #{priceId,jdbcType=DECIMAL},
+            CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+            TRIP_ID = #{tripId,jdbcType=VARCHAR},
+            ORDER_PRINT_STATUS = #{orderPrintStatus,jdbcType=DECIMAL},
+            DRIVER_TEL = #{driverTel,jdbcType=VARCHAR},
+            OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR},
+            CAN_WORK = #{canWork,jdbcType=DECIMAL}
+        where ORDER_ID = #{orderId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
+        update OMSTRUCK_ORDER
+        <set>
+            <if test="orderPlanId != null">
+                ORDER_PLAN_ID = #{orderPlanId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderNumber != null">
+                ORDER_NUMBER = #{orderNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="capacityId != null">
+                CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderIssueTime != null">
+                ORDER_ISSUE_TIME = #{orderIssueTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="orderReceiveStatus != null">
+                ORDER_RECEIVE_STATUS = #{orderReceiveStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                ORDER_RECEIVE_REFUSE_TIME = #{orderReceiveRefuseTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="orderCommunicationDuration != null">
+                ORDER_COMMUNICATION_DURATION = #{orderCommunicationDuration,jdbcType=DECIMAL},
+            </if>
+            <if test="orderStatus != null">
+                ORDER_STATUS = #{orderStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+            <if test="orderType != null">
+                ORDER_TYPE = #{orderType,jdbcType=DECIMAL},
+            </if>
+            <if test="orderLineSequence != null">
+                ORDER_LINE_SEQUENCE = #{orderLineSequence,jdbcType=DECIMAL},
+            </if>
+            <if test="lineId != null">
+                LINE_ID = #{lineId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderEntryTime != null">
+                ORDER_ENTRY_TIME = #{orderEntryTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="unloadPointId != null">
+                UNLOAD_POINT_ID = #{unloadPointId,jdbcType=DECIMAL},
+            </if>
+            <if test="driverConfirmation != null">
+                DRIVER_CONFIRMATION = #{driverConfirmation,jdbcType=DECIMAL},
+            </if>
+            <if test="priceId != null">
+                PRICE_ID = #{priceId,jdbcType=DECIMAL},
+            </if>
+            <if test="carrierId != null">
+                CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+            </if>
+            <if test="tripId != null">
+                TRIP_ID = #{tripId,jdbcType=VARCHAR},
+            </if>
+            <if test="orderPrintStatus != null">
+                ORDER_PRINT_STATUS = #{orderPrintStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="driverTel != null">
+                DRIVER_TEL = #{driverTel,jdbcType=VARCHAR},
+            </if>
+            <if test="optionerCode != null">
+                OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR},
+            </if>
+            <if test="canWork != null">
+                CAN_WORK = #{canWork,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where ORDER_ID = #{orderId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
+        <include refid="select" />
+        where ORDER_ID = #{orderId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select" />
+        <include refid="where" />
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select" />
+        <include refid="whereLike" />
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into OMSTRUCK_ORDER
+        (ORDER_ID,
+        ORDER_PLAN_ID, ORDER_NUMBER, CAPACITY_ID,
+        ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS,
+        ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION,
+        ORDER_STATUS, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK,
+        DELETED, ORDER_TYPE, ORDER_LINE_SEQUENCE,
+        LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
+        DRIVER_CONFIRMATION, PRICE_ID,
+        CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS,
+        DRIVER_TEL, OPTIONER_CODE, CAN_WORK
+        )
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.orderId,jdbcType=DECIMAL},
+        #{item.orderPlanId,jdbcType=DECIMAL}, #{item.orderNumber,jdbcType=VARCHAR}, #{item.capacityId,jdbcType=DECIMAL},
+        #{item.orderIssueTime,jdbcType=TIMESTAMP}, #{item.orderReceiveStatus,jdbcType=DECIMAL},
+        #{item.orderReceiveRefuseTime,jdbcType=TIMESTAMP}, #{item.orderCommunicationDuration,jdbcType=DECIMAL},
+        #{item.orderStatus,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+        #{item.deleted,jdbcType=DECIMAL}, #{item.orderType,jdbcType=DECIMAL}, #{item.orderLineSequence,jdbcType=DECIMAL},
+        #{item.lineId,jdbcType=DECIMAL}, #{item.orderEntryTime,jdbcType=TIMESTAMP}, #{item.unloadPointId,jdbcType=DECIMAL},
+        #{item.driverConfirmation,jdbcType=DECIMAL}, #{item.priceId,jdbcType=DECIMAL},
+        #{item.carrierId,jdbcType=DECIMAL}, #{item.tripId,jdbcType=VARCHAR}, #{item.orderPrintStatus,jdbcType=DECIMAL},
+        #{item.driverTel,jdbcType=VARCHAR}, #{item.optionerCode,jdbcType=VARCHAR}, #{item.canWork,jdbcType=DECIMAL}
+        from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update OMSTRUCK_ORDER
+        set
+        ORDER_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_PLAN_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderPlanId,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_NUMBER=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderNumber,jdbcType=VARCHAR}
+        </foreach>
+        ,CAPACITY_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_ISSUE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderIssueTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,ORDER_RECEIVE_STATUS=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderReceiveStatus,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_RECEIVE_REFUSE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderReceiveRefuseTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,ORDER_COMMUNICATION_DURATION=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderCommunicationDuration,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_STATUS=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderStatus,jdbcType=DECIMAL}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETED=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_TYPE=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderType,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_LINE_SEQUENCE=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderLineSequence,jdbcType=DECIMAL}
+        </foreach>
+        ,LINE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.lineId,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_ENTRY_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderEntryTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UNLOAD_POINT_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.unloadPointId,jdbcType=DECIMAL}
+        </foreach>
+        ,DRIVER_CONFIRMATION=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.driverConfirmation,jdbcType=DECIMAL}
+        </foreach>
+        ,PRICE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
+        </foreach>
+        ,CARRIER_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+        </foreach>
+        ,TRIP_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.tripId,jdbcType=VARCHAR}
+        </foreach>
+        ,ORDER_PRINT_STATUS=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderPrintStatus,jdbcType=DECIMAL}
+        </foreach>
+        ,DRIVER_TEL=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.driverTel,jdbcType=VARCHAR}
+        </foreach>
+        ,OPTIONER_CODE=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.optionerCode,jdbcType=VARCHAR}
+        </foreach>
+        ,CAN_WORK=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.canWork,jdbcType=DECIMAL}
+        </foreach>
+        where ORDER_ID in
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item.orderId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from OMSTRUCK_ORDER
+        where ORDER_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+    <!--  根据插入时间排序  -->
+    <sql id="orderBy">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+    </sql>
+
+    <!--  查询运输订单 -->
+    <select id="getAllTruckOrder" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+        select
+        *
+        from
+        (
+        select
+        OO.ORDER_ID "orderId",
+        APO.PURCHASE_ORDER_ID "purchaseOrderId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        APO.IS_MORE_TRIPS   "isMoreTrips",
+        RM.MATERIAL_NAME "materialName",
+        <if test="orderTypee == 8">
+            AP.PLAN_NO "planNo",
+            AP.PLAN_ID "planId",
+            to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd')"planTruckTime",
+            to_char(AP.PLAN_INCOMING_TIME, 'yyyy-mm-dd') "planIncomingTime",
+        </if>
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_ID "capacityId",
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
+        OO.INSERT_USERNAME "insertUsername",
+        OO.INSERT_TIME "insertTime",
+        OO.ORDER_NUMBER "orderNumber",
+        RW.WAREHOUSE_NAME "warehouseName", --卸货点
+        RW2.WAREHOUSE_NAME "loadName",
+        to_char(OO.ORDER_ENTRY_TIME, 'yyyy-mm-dd') "orderEntryTime", --进厂时间
+        RS.SUPPLIER_NAME "supplierName", --发货单位
+        RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位
+        OO.ORDER_ISSUE_TIME "orderIssueTime"
+
+        from OMSTRUCK_ORDER OO
+        left join AMS_PURCHASE_ORDER APO
+        on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
+        <if test="orderTypee == 8">
+            left join AMSTRUCK_PURPLAN AP
+            on AP.BATCH_ID = APO.BATCH_ID and AP.PLAN_STATUS != 3
+        </if>
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        <if test="carrierSSOId != null">
+            left join RMS_CARRIER RCA
+            on RCA.CARRIER_ID = OO.CARRIER_ID
+        </if>
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        left join RMS_WAREHOUSE RW
+        on OO.UNLOAD_POINT_ID = RW.WAREHOUSE_ID
+        left join RMS_WAREHOUSE RW2
+        ON OO.DRIVER_CONFIRMATION = RW2.WAREHOUSE_ID
+        left join RMS_SUPPLIER RS
+        on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        left join RMS_CONSIGNEE RCSE
+        on APO.RECEIVE_UNIT_ID = RCSE.CONSIGNEE_ID
+        <where>
+            <choose>
+                <when test="orderStatus != 111">
+                    and OO.ORDER_STATUS = #{orderStatus}
+                </when>
+                <when test="orderStatus == 111">
+                    and OO.ORDER_STATUS in (0, 1, 2, 4, 5, 6)
+                </when>
+            </choose>
+            <if test="planId != null ">
+                and AP.PLAN_ID = #{planId}
+            </if>
+            <if test="orderTypee != null">
+                and OO.ORDER_TYPE = #{orderTypee}
+            </if>
+            <if test="fuelOrder == 1">
+                and OO.ORDER_TYPE in (6, 7)
+            </if>
+            <if test="fuelOrder == 2">
+                and OO.ORDER_TYPE in (17, 18)
+            </if>
+            <if test="carrierSSOId != null">
+                and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+            </if>
+            <if test="oneDate != null">
+                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =   OO.INSERT_TIME
+            </if>
+            <if test="startDate != null">
+                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =    OO.INSERT_TIME
+                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  OO.INSERT_TIME
+            </if>
+            <if test="con!=null">
+                and ((instr(RCSE.CONSIGNEE_COMPANY_NAME, #{con}) > 0) or  (instr(RS.SUPPLIER_NAME, #{con}) > 0)
+                 or (instr( RC.CAPACITY_NUMBER, #{con}) > 0) or (instr(RM.MATERIAL_NAME , #{con}) > 0))
+            </if>
+        </where>
+        )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialWeight != null">
+                and
+                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
+                    "orderMaterialWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="planNo != null">
+                and
+                <foreach collection="planNo" item="item" open="(" separator="or" close=")">
+                    "planNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="planTruckTime != null">
+                and
+                <foreach collection="planTruckTime" item="item" open="(" separator="or" close=")">
+                    "planTruckTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="planIncomingTime != null">
+                and
+                <foreach collection="planIncomingTime" item="item" open="(" separator="or" close=")">
+                    "planIncomingTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="insertUsername != null">
+                and
+                <foreach collection="insertUsername" item="item" open="(" separator="or" close=")">
+                    "insertUsername" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="insertTime != null">
+                and
+                <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
+                    "insertTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName != null">
+                and
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderNumber != null">
+                and
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderEntryTime != null">
+                and
+                <foreach collection="orderEntryTime" item="item" open="(" separator="or" close=")">
+                    "orderEntryTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierName != null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </select>
+
+    <!--  通过运输订单Id查询运输订单号 -->
+    <select id="getOrderNumberByOrderId" parameterType="int" resultType="string">
+        select OO.ORDER_NUMBER "orderNumber"
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!--  获取所有的运力信息 -->
+    <select id="getAllCapacity" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+        select
+        *
+        from
+        (
+        select
+        RC.CAPACITY_ID "capacityId",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_VIP "capacityVip",
+        RCA.CARRIER_NAME "carrierName",
+        RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+        RC.CAPACITY_BLACKLIST "capacityBlacklist",
+        RC.INSERT_TIME AS "insertTime"
+        from RMS_CAPACITY RC
+        left join RMS_CARRIER RCA
+        on RC.CARRIER_ID = RCA.CARRIER_ID
+        left join RMS_CAPACITY_TYPE RCT
+        on RCT.CAPACITY_TYPE_ID = RC.CAPACITY_TYPE_ID
+        <where>
+            <if test="capacityTypeId != null">
+                RC.CAPACITY_TYPE_ID = #{capacityTypeId}
+            </if>
+            <if test="capacityStatus != null">
+                and RC.CAPACITY_STATUS = #{capacityStatus}
+            </if>
+            <if test="carrierId != null">
+                and RC.CARRIER_ID = #{carrierId}
+            </if>
+        </where>
+        )
+        <where>
+            <if test="capacityTypeName != null">
+                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
+                    "capacityTypeName" like '%${item}%'
+                </foreach>
+            </if>
+
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityVip != null">
+                and
+                <foreach collection="capacityVip" item="item" open="(" separator="or" close=")">
+                    "capacityVip" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityBlacklist != null">
+                and
+                <foreach collection="capacityBlacklist" item="item" open="(" separator="or" close=")">
+                    "capacityBlacklist" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </select>
+
+    <!--  通过Id查询派发时间 -->
+    <select id="getInsertTimeById" parameterType="int" resultType="java.util.Date">
+        select ORDER_ISSUE_TIME
+        from OMSTRUCK_ORDER
+        where ORDER_ID = #{orderId}
+    </select>
+
+    <!--  通过车牌号匹配运力Id -->
+    <select id="getCapacityIdByCapacityNum" parameterType="string" resultType="java.math.BigDecimal">
+        select CAPACITY_ID
+        from RMS_CAPACITY
+        where CAPACITY_NUMBER = #{capacityNumber}
+    </select>
+
+    <!--  通过运输订单ID 或运输订单号 查询 运力ID  -->
+    <select id="getCapacityIdByOrderOrNum" parameterType="java.util.Map" resultType="java.math.BigDecimal">
+        select CAPACITY_ID
+        from OMSTRUCK_ORDER
+        <where>
+            <if test="orderId != null">
+                ORDER_ID = #{orderId}
+            </if>
+            <if test="orderNumber != null">
+                and ORDER_NUMBER = #{orderNumber}
+            </if>
+        </where>
+
+    </select>
+
+    <!--  通过运力ID 或车牌号 修改 运力状态  -->
+    <update id="updateCapacityByCarIdOrNum" parameterType="java.util.Map">
+        update RMS_CAPACITY RC
+        set RC.CAPACITY_STATUS = #{capacityStatus}
+        where
+        <if test="capacityId != null">
+            RC.CAPACITY_ID = #{capacityId}
+        </if>
+        <if test="capacityNumber != null">
+            RC.CAPACITY_NUMBER = #{capacityNumber}
+        </if>
+    </update>
+
+
+    <!-- 销售物流，通过运力id修改运力状态 -->
+    <update id="updateCapacityById" parameterType="java.util.Map">
+        update RMS_CAPACITY RC
+        set RC.CAPACITY_STATUS = #{capacityStatus}
+        where
+        <if test="driverCapacityId != null">
+            RC.CAPACITY_ID = #{driverCapacityId}
+        </if>
+        <if test="capacityNumber != null">
+            RC.CAPACITY_NUMBER = #{capacityNumber}
+        </if>
+    </update>
+
+    <update id="refuseCtrlZ">
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS = 4,
+            OO.INSERT_UPDATE_REMARK = '撤销订单状态变为4'
+        WHERE OO.ORDER_ID = #{orderId}
+    </update>
+
+
+    <update id="closeTruckOrder" parameterType="java.math.BigDecimal">
+        update OMSTRUCK_ORDER OO
+        set OO.ORDER_STATUS = 7,
+            OO.INSERT_UPDATE_REMARK = '过期订单'
+        where OO.ORDER_ID = #{orderId}
+    </update>
+
+
+    <!-- 通过运力ID 查询采购司机接单数据  、通过运单号查询所有运单信息-->
+    <select id="getTruckOrderByCapacityNum" parameterType="java.util.Map" resultType="java.util.Map">
+        select *
+        from (
+        select OO.ORDER_NUMBER "orderNumber",
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
+        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+        RW.WAREHOUSE_NAME "warehouseName",
+        RM.MATERIAL_NAME "materialName",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RW2.WAREHOUSE_NAME "warehouseName2",
+        OO.INSERT_UPDATE_REMARK "insertUpdateRemark",
+        TTR.RESULT_TOTAL_ID "resultTotalId"
+        from OMSTRUCK_ORDER OO
+        left join RMS_CAPACITY RC on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        left join RMS_WAREHOUSE RW on RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        left join TMSTRUCK_TOTAL_RESULT TTR on TTR.ORDER_ID = OO.ORDER_ID
+        left join TMSTRUCK_LOAD_RESULT TLR on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join RMS_WAREHOUSE RW2 on RW2.WAREHOUSE_ID = TLR.LOADING_ID
+        where OO.ORDER_RECEIVE_STATUS = #{orderReceiveStatus}
+        and OO.ORDER_TYPE = #{orderTypee}
+        )
+        <where>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialWeight != null">
+                and
+                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
+                    "orderMaterialWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                and
+                <foreach collection="orderReceiveRefuseTime" item="item" open="(" separator="or" close=")">
+                    "orderReceiveRefuseTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName != null">
+                and
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName2 != null">
+                and
+                <foreach collection="warehouseName2" item="item" open="(" separator="or" close=")">
+                    "warehouseName2" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "orderReceiveRefuseTime" desc
+        </if>
+    </select>
+
+    <!-- 通过运力ID 查询销售司机接单数据  、通过运单号查询所有运单信息-->
+    <select id="getSaleTruckOrderByCapacityNum" parameterType="java.util.Map" resultType="java.util.Map">
+        select
+        distinct *
+        from(
+        select
+        OO.INSERT_TIME "insertTime",
+        OO.ORDER_ID "orderId",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "carNumber",
+        ASO.SALE_NUMBER "saleNumber",
+        RM.MATERIAL_NAME "materialName",
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
+        RS.SHIPPER_NAME "shipperName",
+        RCO.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        RRA.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        OO.CAN_WORK "canWork",
+        OO.ORDER_STATUS "orderStatus"
+        from OMSTRUCK_ORDER OO
+        left join AMS_SALE_ORDER_MATERIAL ASOM
+        on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        left join AMS_SALE_ORDER ASO
+        on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        left join RMS_SHIPPER RS
+        on RS.SHIPPER_ID = ASO.SHIPPER_ID
+        left join RMS_CONSIGNEE RCO
+        on RCO.CONSIGNEE_ID = ASO.RECEIVE_ID
+        left join RMS_RECEIVE_ADDRESS RRA
+        on RRA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        left join RMS_CAPACITY RC --车牌号
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM --物资重量
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM --物资名称
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
+
+        <where>
+            <if test="capacityId != null">
+                and OO.CAPACITY_ID = #{capacityId}
+            </if>
+            <if test="orderStatus != null">
+                and OO.ORDER_STATUS = #{orderStatus}
+            </if>
+            <if test="orderId != null">
+                and OO.ORDER_ID = #{orderId}
+            </if>
+            <if test="orderType != null">
+                and OO.ORDER_TYPE = #{orderType}
+            </if>
+            <if test="orderReceiveStatus != null">
+                and OO.ORDER_RECEIVE_STATUS = #{orderReceiveStatus}
+            </if>
+        </where>
+        )
+        <where>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carNumber != null">
+                <foreach collection="carNumber" item="item" open="(" separator="or" close=")">
+                    "carNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleNumber != null">
+                <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+                    "saleNumber" like '%${item}%'
+                </foreach>
+            </if>
+
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialWeight != null">
+                and
+                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
+                    "orderMaterialWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="addressDeliveryAddress != null">
+                and
+                <foreach collection="addressDeliveryAddress" item="item" open="(" separator="or" close=")">
+                    "addressDeliveryAddress" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleDateOfReceipt != null">
+                and
+                <foreach collection="saleDateOfReceipt" item="item" open="(" separator="or" close=")">
+                    "saleDateOfReceipt" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </select>
+
+    <!-- 查询五个作业点名称sql片段 -->
+    <sql id="columnSql">
+        RG1.GATEPOST_NAME "gatepostName1",
+     RG2.GATEPOST_NAME "gatepostName2",
+     RTC1.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+     RW.WAREHOUSE_NAME    "warehouseName",
+     RTC2.TRUCK_CALCULATE_NUMBER "truckCalculateNum",
+    </sql>
+
+    <sql id="placeSql">
+        left join RMS_GATEPOST RG1 --进厂门岗
+    on RG1.GATEPOST_ID = RL.LINE_START_NODE_ID
+    left join RMS_GATEPOST RG2 --出厂门岗
+    on RG2.GATEPOST_ID = RL.LINE_END_NODE_ID
+
+    left join RMS_LINE_SEGEMNT RLS1
+    on RL.LINE_ID = RLS1.LINE_ID and RLS1.SEGMENT_END_NODE_TYPE = 1
+    left join RMS_TRUCK_CALCULATE RTC1 -- 计毛汽车衡
+    on RLS1.SEGMENT_END_NODE_ID = RTC1.TRUCK_CALCULATE_ID
+
+    left join RMS_LINE_SEGEMNT RLS2
+    on RL.LINE_ID = RLS2.LINE_ID and RLS2.SEGMENT_END_NODE_TYPE = 3
+    left join RMS_WAREHOUSE RW -- 卸货仓库
+    on RW.WAREHOUSE_ID = RLS2.SEGMENT_END_NODE_ID
+
+    left join RMS_LINE_SEGEMNT RLS3
+    on RL.LINE_ID = RLS3.LINE_ID and RLS3.SEGMENT_END_NODE_TYPE = 2
+    left join RMS_TRUCK_CALCULATE RTC2 -- 计皮汽车衡
+    on RLS3.SEGMENT_END_NODE_ID = RTC2.TRUCK_CALCULATE_ID
+    </sql>
+    <!--  通过运力ID 查询司机所有已拒绝已接收的订单 -->
+    <select id="getReceiveRefuseOrderByCapacityId" parameterType="java.util.Map" resultType="java.util.Map">
+        select OO.ORDER_ID     "orderId",
+               OO.ORDER_NUMBER "orderNumber"
+        from OMSTRUCK_ORDER OO
+        where CAPACITY_ID = #{capacityId}
+          and ORDER_RECEIVE_STATUS = 0
+
+    </select>
+
+    <!-- 查询实绩流程 -->
+    <select id="selectPlaceAndTime" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ERG.GATEPOST_NAME            as "entryGatepost",
+               TER.RESULT_ENTRY_GATE_TIME   as "entryTime",
+               GRTC.TRUCK_CALCULATE_NUMBER  as "grossCalculate",
+               TWR.RESULT_GROSS_WEIGHT_TIME as "grossTime",
+               RW.WAREHOUSE_NAME            as "unloadWarhouse",
+               TUR.RESULT_START_TIME        as "unloadTime",
+               TRTC.TRUCK_CALCULATE_NUMBER  as "tareCalculate",
+               TWR.RESULT_TARE_WEIGHT_TIME  as "tareTime",
+               LRG.GATEPOST_NAME            as "leaveGatepost",
+               TLFR.RESULT_OUT_GATE_TIME    as "outTime",
+               RWR.WAREHOUSE_NAME           as "receiptWarhouse",
+               TRR.INSERT_TIME              as "receiptTime",
+               OO.ORDER_LINE_SEQUENCE       as "orderLineSequence",
+               OO.ORDER_TYPE                as "orderType"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                           ON TTR.RESULT_TOTAL_ID = TER.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_GATEPOST ERG --进厂门岗
+                           ON ERG.GATEPOST_ID = TER.GATEPOST_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                           ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_TRUCK_CALCULATE GRTC --毛重汽车衡
+                           ON TWR.RESULT_GROSS_PLACE_ID = GRTC.TRUCK_CALCULATE_ID
+                 LEFT JOIN RMS_TRUCK_CALCULATE TRTC --皮重汽车衡
+                           ON TWR.RESULT_TARE_PLACE_ID = TRTC.TRUCK_CALCULATE_ID
+                 LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR
+                           ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_WAREHOUSE RW --卸货点
+                           ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                           ON TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_GATEPOST LRG --出厂门岗
+                           ON LRG.GATEPOST_ID = TLFR.GATEPOST_ID
+                 LEFT JOIN TMSTRUCK_RECEIPT_RESULT TRR
+                           ON TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_WAREHOUSE RWR --异地库
+                           ON TRR.WAREHOUSE_ID = RWR.WAREHOUSE_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!--  通过运输订单ID查询运输订单相关信息 仅限单拼 -->
+    <select id="getOrderByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        SELECT APO.PURCHASE_ORDER_NO     "purchaseOrderNo",
+               RC.CAPACITY_NUMBER        "capacityNumber",
+               RM.MATERIAL_ID            "materialId",
+               RM.MATERIAL_NAME          "materialName",
+               OO.ORDER_ENTRY_TIME       "orderEntryTime",
+               OO.ORDER_TYPE             "orderType",
+               RW.WAREHOUSE_NAME         "warehouseName",
+               OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+               OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
+                 left join AMS_PURCHASE_ORDER APO
+                           on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                 left join OMSTRUCK_ORDER_MATERIAL OOM
+                           on OOM.ORDER_ID = OO.ORDER_ID
+                 left join RMS_MATERIAL RM
+                           on RM.MATERIAL_ID = OOM.MATERIAL_ID
+                 left join RMS_WAREHOUSE RW
+                           on RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!--  通过运输订单号查询各路段预设作业点 以及总实绩ID -->
+    <select id="getPointIdByOrderNum" parameterType="java.util.Map" resultType="java.util.Map">
+        select
+        RL.LINE_START_NODE_ID "lineStartNodeId",
+        RL.LINE_END_NODE_ID "lineEndNodeId",
+        RLS1.SEGMENT_END_NODE_ID "truckCalculateIdMao",
+        RLS2.SEGMENT_END_NODE_ID "truckCalculateIdPi",
+        RLS3.SEGMENT_END_NODE_ID "resultUnloadPlaceId",
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        OO.ORDER_TYPE "orderType"
+
+        from OMSTRUCK_ORDER OO
+        left join RMS_LINE RL
+        on RL.LINE_ID = OO.LINE_ID
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TTR.ORDER_ID = OO.ORDER_ID
+        left join RMS_LINE_SEGEMNT RLS1 --查询计毛汽车衡
+        on RL.LINE_ID = RLS1.LINE_ID and RLS1.SEGMENT_END_NODE_TYPE = 1
+        left join RMS_LINE_SEGEMNT RLS2 --查询计皮汽车衡
+        on RL.LINE_ID = RLS2.LINE_ID and RLS2.SEGMENT_END_NODE_TYPE = 2
+        left join RMS_LINE_SEGEMNT RLS3 --查询卸货点
+        on RL.LINE_ID = RLS3.LINE_ID and RLS3.SEGMENT_END_NODE_TYPE = 3
+
+        <where>
+            <if test="orderNumber != null">
+                OO.ORDER_NUMBER = #{orderNumber}
+            </if>
+            <if test="orderId != null">
+                and OO.ORDER_ID = #{orderId}
+            </if>
+        </where>
+
+    </select>
+
+    <!--  查询运输派单信息  -->
+    <select id="getTransportDispatch" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+        select
+        *
+        from(
+        select
+        OO.ORDER_ID "orderId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        OO.ORDER_NUMBER "orderNumber",
+        RS.SUPPLIER_NAME "supplierName",
+        RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        RW.WAREHOUSE_NAME "warehouseName",
+        RCON.CONSIGNEE_CONTACT_NAME "consigneeContactName",
+        RCON.CONSIGNEE_CONTACT_TEL "consigneeContactTel",
+        to_char(APO.PUCHASE_ORDER_DELIVERY_DATE, 'yyyy-mm-dd') "puchaseOrderDeliveryDate",
+        RM.MATERIAL_NAME "materialName",
+        (
+        case when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then OOM.ORDER_MATERIAL_WEIGHT
+        when OOM.ORDER_MATERIAL_WEIGHT is null
+        then OOM.ORDER_MATERIAL_NUMBER
+        end
+        )    "orderMaterialWeight",
+        OO.ORDER_ISSUE_TIME "orderIssueTime",
+        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+        RC.CAPACITY_NUMBER "capacityNumber"
+
+        from OMSTRUCK_ORDER OO
+        left join AMS_PURCHASE_ORDER APO
+        on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        left join RMS_SUPPLIER RS
+        on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        left join RMS_CONSIGNEE RCON
+        on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        left join RMS_WAREHOUSE RW
+        on RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        <if test="carrierSSOId != null">
+            left join RMS_CARRIER RCA
+            on RCA.CARRIER_ID = OO.CARRIER_ID
+        </if>
+        <where>
+            <choose>
+                <when test="orderStatus != 111">
+                    and OO.ORDER_STATUS = #{orderStatus}
+                </when>
+                <when test="orderStatus == 111">
+                    and OO.ORDER_STATUS in (0, 1, 2, 5)
+                </when>
+            </choose>
+            <if test="orderTypee != null">
+                and OO.ORDER_TYPE = #{orderTypee}
+            </if>
+            <if test="fuelOrder == 1">
+                and OO.ORDER_TYPE in (6, 7)
+            </if>
+            <if test="fuelOrder == 2">
+                and OO.ORDER_TYPE in (17, 18)
+            </if>
+            <if test="carrierSSOId != null">
+                and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+            </if>
+            <if test="oneDate != null">
+                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =    OO.ORDER_ISSUE_TIME
+            </if>
+            <if test="startDate != null">
+                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =    OO.ORDER_ISSUE_TIME
+                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=   OO.ORDER_ISSUE_TIME
+            </if>
+            <if test="con!=null">
+                and ((instr(RCON.CONSIGNEE_COMPANY_NAME, #{con}) > 0) or  (instr(RS.SUPPLIER_NAME, #{con}) > 0)
+                or (instr( RC.CAPACITY_NUMBER, #{con}) > 0) or (instr(RM.MATERIAL_NAME , #{con}) > 0))
+            </if>
+        </where>
+        )
+        <where>
+            <if test="purchaseOrderNo != null">
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierName != null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName != null">
+                and
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeContactName != null">
+                and
+                <foreach collection="consigneeContactName" item="item" open="(" separator="or" close=")">
+                    "consigneeContactName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeContactTel != null">
+                and
+                <foreach collection="consigneeContactTel" item="item" open="(" separator="or" close=")">
+                    "consigneeContactTel" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="puchaseOrderDeliveryDate != null">
+                and
+                <foreach collection="puchaseOrderDeliveryDate" item="item" open="(" separator="or" close=")">
+                    "puchaseOrderDeliveryDate" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialWeight != null">
+                and
+                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
+                    "orderMaterialWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                and
+                <foreach collection="orderReceiveRefuseTime" item="item" open="(" separator="or" close=")">
+                    "orderReceiveRefuseTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderIssueTime != null">
+                and
+                <foreach collection="orderIssueTime" item="item" open="(" separator="or" close=")">
+                    "orderIssueTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="driverName != null">
+                and
+                <foreach collection="driverName" item="item" open="(" separator="or" close=")">
+                    "driverName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "orderReceiveRefuseTime" desc
+        </if>
+    </select>
+
+    <!-- 查询已下发已接受的销售订单信息 -->
+    <select id="getOrderReceived" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT aso.SALE_NUMBER as "saleNumber",
+        oo.ORDER_NUMBER as "orderNumber",
+        oo.INSERT_USERNAME as "insertUsername",
+        rc.CAPACITY_NUMBER as "capacityNumber"
+        FROM OMSTRUCK_ORDER oo
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL asom
+        ON asom.SALE_ORDER_MATERIAL_ID = oo.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER aso
+        ON aso.SALE_ORDER_ID = asom.SALE_ORDER_ID
+        LEFT JOIN RMS_CAPACITY rc
+        ON rc.CAPACITY_ID = oo.CAPACITY_ID
+        WHERE oo.ORDER_ISSUE_TIME IS NOT NULL
+        AND oo.ORDER_RECEIVE_STATUS = 1
+        AND oo.ORDER_TYPE = #{orderType}
+        <where>
+            <if test="saleNumber != null">
+                <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+                    "saleNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="insertUsername != null">
+                <foreach collection="insertUsername" item="item" open="(" separator="or" close=")">
+                    "insertUsername" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <!--查询司机排班信息-->
+    <select id="selectCapacityAndDriver" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT
+        RDC.CAPACITY_ID "capacityId",
+        RC.CAPACITY_NUMBER "number",
+        RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+        RCD.DRIVER_NAME "name"
+
+        FROM
+        RMS_DRIVER_CAPACITY RDC
+        LEFT JOIN RMS_CAPACITY RC ON RDC.CAPACITY_ID = RC.CAPACITY_ID
+        LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCT.CAPACITY_TYPE_ID = RC.CAPACITY_TYPE_ID
+        LEFT JOIN RMS_CAR_DRIVER RCD ON RCD.DRIVER_ID = RDC.DRIVER_ID
+        WHERE
+        RC.CAPACITY_STATUS =0 and RC.CARRIER_ID=#{carrierId}
+        <where>
+            <if test="capacityId != null">
+                <foreach collection="capacityId" item="item" open="(" separator="or" close=")">
+                    "capacityId" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="number != null">
+                <foreach collection="number" item="item" open="(" separator="or" close=")">
+                    "number" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityTypeName != null">
+                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
+                    "capacityTypeName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="name != null">
+                <foreach collection="name" item="item" open="(" separator="or" close=")">
+                    "name" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+
+    <!--根据id查找用户名    -->
+    <select id="selectPersonNameByPersonnelId" resultType="java.lang.String" parameterType="java.lang.Integer">
+        select RP.PERSONNEL_NAME "personnelName"
+        from RMS_PERSONNEL RP
+        where RP.PERSONNEL_ID = #{personnelId}
+    </select>
+    <!--  通过车牌号、承运商匹配最新的运力id-->
+    <select id="selectCapacityId" parameterType="java.util.Map" resultType="java.math.BigDecimal">
+        select t.CAPACITY_ID
+        from RMS_CAPACITY t
+        where t.CAPACITY_ID = #{capacityId}
+          and t.CAPACITY_NUMBER = #{capacityNumber}
+    </select>
+    <!-- 通过运输订单号或运输订单ID查询总实绩ID和订单类型 -->
+    <select id="getResultTotalIdByOrderNumAndId" parameterType="java.util.Map" resultType="java.util.Map">
+        select
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        OO.ORDER_TYPE "orderType"
+        from OMSTRUCK_ORDER OO
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TTR.ORDER_ID = OO.ORDER_ID
+        <where>
+            <if test="orderId != null">
+                OO.ORDER_ID= #{orderId}
+            </if>
+            <if test="orderNumber != null">
+                and OO.ORDER_NUMBER = #{orderNumber}
+            </if>
+        </where>
+    </select>
+
+    <!--通过运输订单ID查询数据 用于websocket推送数据  如果订单实绩中有卸货点  没有卸货点通过传入的卸货点进行查询-->
+    <select id="pushMesToWebsocket" parameterType="java.util.Map" resultType="java.util.Map">
+        select OO.ORDER_NUMBER           "orderNumber",
+               RC.CAPACITY_NUMBER        "capacityNumber"
+        from OMSTRUCK_ORDER OO
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
+        where OO.ORDER_ID = #{orderId}
+          and rownum = 1
+    </select>
+
+
+    <!--  //通过物资id查询批次表匹配最新的批次，关联最新的采购订单号 -->
+    <select id="selectNewOrderId" parameterType="java.util.Map" resultType="java.util.Map">
+        select *
+        from (
+        select apo.PURCHASE_ORDER_NO "purchaseOrderNo",
+        apo.PURCHASE_ORDER_ID "purchaseOrderId",
+        db.RESULT_FOREIGN_SHIP_NAME "remark",
+        apo.RECEIVE_UNIT_ID     "receiveUnitId",
+        apo.purchasing_organization_id "purchaseOrgId"
+        from AMS_PURCHASE_ORDER APO
+        join DIL_BATCH DB on apo.BATCH_ID = db.BATCH_ID
+        where db.MATERIAL_ID = #{materialId}
+        and apo.SUPPLIER_UNIT_ID = #{supplierId}
+        and apo.deleted = 0
+        <if test="purchaseOrgId != null">
+            and apo.purchasing_organization_id = #{purchaseOrgId}
+        </if>
+        <if test="remark != null">
+            and instr(db.RESULT_FOREIGN_SHIP_NAME, #{remark}) > 0
+        </if>
+        order by apo.PURCHASE_ORDER_NO desc
+        )
+        where rownum = 1
+    </select>
+
+    <!--  查询所有的发货单位  -->
+    <select id="getReceivingUnit" resultType="java.util.Map">
+        SELECT *
+        from (
+                 select RC.CONSIGNEE_ID           "id",
+                        RC.CONSIGNEE_ID           "value",
+                        RC.CONSIGNEE_COMPANY_NAME "label"
+                 from RMS_CONSIGNEE RC
+                 order by RC.CONSIGNEE_ID
+             )
+        where rownum &lt; 20
+    </select>
+
+    <!--  查询所有的发货单位  -->
+    <select id="getSupplier" resultType="java.util.Map">
+        SELECT *
+        from (
+                 select RS.SUPPLIER_ID   "id",
+                        RS.SUPPLIER_ID   "value",
+                        RS.SUPPLIER_NAME "label"
+                 from RMS_SUPPLIER RS
+                 order by RS.SUPPLIER_ID
+             )
+        where rownum &lt; 20
+    </select>
+
+    <!--通过运输订单Id查询运输订单子表有几种物资 ：物资ID-->
+    <select id="getMaterialIdListByOrderId" parameterType="int" resultType="java.lang.Integer">
+        select OOM.MATERIAL_ID
+        from OMSTRUCK_ORDER OO
+                 left join OMSTRUCK_ORDER_MATERIAL OOM
+                           on OOM.ORDER_ID = OO.ORDER_ID
+    </select>
+
+    <!-- 通过采购订单号查找采购订单ID -->
+    <select id="getPurchaseOrderIdByNo" parameterType="string" resultType="java.math.BigDecimal">
+        select APO.PURCHASE_ORDER_ID
+        from AMS_PURCHASE_ORDER APO
+        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
+    </select>
+    <select id="getSaleTruckOrderByCapacityId" resultType="java.util.Map">
+        select oo.ORDER_ID                                "orderId",
+               oo.order_number                            "orderNumber",
+               rc.capacity_number                         "capacityNumber",
+               aso.sale_number                            "saleOrderNumber",
+               rs.shipper_name                            "shipperUnit",
+               rce.consignee_company_name                 "receiveUnit",
+               to_char(oo.order_issue_time, 'yyyy-mm-dd') "shipperDate",
+               rca.address_delivery_address               "receiveAddress",
+               asom.sale_date_of_receipt                  "receiveDate"
+        from omstruck_order oo
+                 left join rms_capacity rc
+                           on rc.capacity_id = OO.capacity_id
+                 left join omstruck_order_material oom
+                           on oom.order_id = oo.order_id
+                 left join ams_sale_order_material asom
+                           on asom.sale_order_material_id = oo.order_plan_id
+                 left join ams_sale_order aso
+                           on aso.sale_order_id = asom.sale_order_id
+                 left join rms_shipper rs
+                           on rs.shipper_id = aso.shipper_id
+                 left join rms_consignee rce
+                           on rce.consignee_id = aso.receive_id
+                 left join rms_receive_address rca
+                           on rca.address_id = asom.sale_shipping_address_id
+        where oo.ORDER_ID = #{orderId}
+    </select>
+    <select id="getSaleTruckOrderByCapacityNumMaterial" resultType="java.util.Map">
+        select rm.material_name          "materialName",
+               oom.order_material_weight "materialWeight"
+        from omstruck_order oo
+                 left join rms_capacity rc
+                           on rc.capacity_id = OO.capacity_id
+                 left join omstruck_order_material oom
+                           on oom.order_id = oo.order_id
+                 left join rms_material rm
+                           on rm.material_id = oom.material_id
+        where rc.capacity_id = #{capacityId}
+          and oo.order_status = #{orderStatus}
+          and oo.order_type = #{orderType}
+
+    </select>
+    <!-- 通过车序号查找物资id -->
+    <select id="selectMaterialIdBysaleOrderMaterialId" resultType="java.util.Map" parameterType="java.lang.Integer">
+        SELECT ASTM.MATERIAL_ID "materialId"
+        FROM AMS_SALE_ORDER_MATERIAL ASOM
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.TRUCKNO_MATERIAL_ID
+        WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    </select>
+    <!--通过销售订单物资ID查找物资理重和物资件数-->
+    <select id="selectTheoreticalWeightAndMaterialNumber" resultType="java.util.Map" parameterType="java.lang.Integer">
+        SELECT ASTM.SALE_ORDER_MATERIAL_NUMBER  "materialNumber",
+               ASTM.MATERIAL_THEORETICAL_WEIGHT "weight"
+
+        from AMS_SALE_ORDER_MATERIAL ASOM
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        WHERE ASTM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    </select>
+    <!--销售，查看运输订单(钢材销售订单)并根据司机接受或者拒绝时间进行排序  -->
+    <select id="selectTransportOrderForSale" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT * FROM (
+        SELECT DISTINCT *from(
+        select
+        OO.ORDER_NUMBER "orderNumber",
+        ASO.SALE_NUMBER "saleNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN "addressDeliveryAddress",
+        ACTP.PRICE_VALUE "priceValue",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+        RS.SHIPPER_NAME "shipperName",
+        OO.ORDER_ID "orderId",
+        RC3.CARRIER_NAME "carrierName",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        OO.DRIVER_TEL "drivelTel",
+        ASM.SALE_WAREHOUSE "saleWarehouse",
+        ASM.MATERIAL_NUMBER "materialNumber"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
+        LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+        ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN RMS_CARRIER RC3
+        ON RC3.CARRIER_ID = ADSO.CARRIER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2
+        ON RC2.CONSIGNEE_ID=ASO.RECEIVE_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON OO.CAPACITY_ID=RC.CAPACITY_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID=ASO.SHIPPER_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP
+        ON RRP.PLACE_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+        ON OO.PRICE_ID=ACTP.PRICE_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID=OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+        <where>
+            ASM.SALE_MATERIAL_ID IS NOT NULL
+            <if test="orderStatus!=null">
+                AND OO.ORDER_STATUS = #{orderStatus}
+            </if>
+            <if test="carrierSsoId!=null">
+                and RC3.CARRIER_SSO_ID = #{carrierSsoId}
+            </if>
+            <if test="orderTypee!=null">
+                and OO.ORDER_TYPE = #{orderTypee}
+            </if>
+            <if test="shipperId!=null">
+                and ASO.SHIPPER_ID = #{shipperId}
+            </if>
+        </where>
+        ) RRC
+        <if test="con != null">
+            WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con} or RRC."carrierName" LIKE #{con}
+        </if>
+        )
+        <where>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleNumber != null">
+                and
+                <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+                    "saleNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "orderNumber" desc
+        </if>
+    </select>
+
+    <select id="selectTransportOrderForSale1" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT  * FROM (
+        SELECT  *from(
+        select DISTINCT
+        OO.ORDER_NUMBER "orderNumber",
+        ASO.SALE_NUMBER "saleNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN
+        ||RRP.ADDRESS_DELIVERY_ADDRESS "completeAddress",
+        ASOM.SALE_SHIPPING_ADDRESS_ID "addressId",
+        ACTP.PRICE_VALUE "priceValue",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+        RS.SHIPPER_NAME "shipperName",
+        RC3.CARRIER_NAME "carrierName",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        ASM.SALE_MATERIAL_ID "saleMaterialId",
+        ASM.MATERIAL_ID "materialId",
+        ASTM.TRUCKNO_MATERIAL_ID "trucknoMaterialId",
+        OO.ORDER_ID "orderId",
+        ASM.STEEL_METER "meterNumber",
+        ASM.MATERIAL_NUMBER "orderPlanWeight",
+        ASM.IS_POUND_SALE "isPound",
+        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "Specification",
+        ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
+        ASM.EAS_PRIMARY_ID "easId",
+        ASM.SALE_WAREHOUSE "warehouse",
+        ASM.MATERIAL_WEIGHT "materialWeight",
+        TWR.RESULT_NET_WEIGHT "netWeight",
+        OO.ORDER_LINE_SEQUENCE "lineSequence",
+        ASM.DELETED "materialStatus"
+        FROM AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        AND NVL(OO.ORDER_TYPE,0) BETWEEN 0 AND 1
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        AND TWR.MATERIAL_ID = ASM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
+        LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+        ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN RMS_CARRIER RC3
+        ON RC3.CARRIER_ID = ADSO.CARRIER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2
+        ON RC2.CONSIGNEE_ID=ASO.RECEIVE_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON OO.CAPACITY_ID=RC.CAPACITY_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID=ASO.SHIPPER_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP
+        ON RRP.PLACE_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+        ON OO.PRICE_ID=ACTP.PRICE_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+        <where>
+            ASM.SALE_MATERIAL_ID IS NOT NULL
+            <if test="saleOrderId!=null">
+                AND ASO.SALE_ORDER_ID = #{saleOrderId}
+            </if>
+            <if test="numberPlate!=null">
+                AND RC.CAPACITY_NUMBER LIKE #{numberPlate}
+            </if>
+        </where>
+        ) RRC
+        <if test="con != null">
+            WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con} or RRC."carrierName" LIKE #{con}
+        </if>
+        )
+        <where>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleNumber != null">
+                and
+                <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+                    "saleNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "orderNumber" desc
+        </if>
+    </select>
+    <!--根据车序号查找销售订单 -->
+    <select id="selectSaleBySaleOrderMaterialId" parameterType="java.lang.Integer" resultType="java.util.Map">
+        SELECT
+        ASO.SALE_NUMBER "saleNumber",
+        RS.SHIPPER_NAME "shipperName",
+        RC.CONSIGNEE_COMPANY_NAME "consigneeName",
+        RRA.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
+        ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
+        ASOM.SALE_DATE_OF_RECEIPT "receiptOfdate",
+        ASOM.SALE_ORDER_CONSIGNEE "saleOrderConsignee",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel",
+        ASOM.INSERT_UPDATE_REMARK "insertUpdateRemark",
+        ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
+        (
+        SELECT
+        ASTM.SALE_ORDER_MATERIAL_NUMBER
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "saleOrderMaterialNumber",
+        (
+        SELECT
+        ASTM.MATERIAL_THEORETICAL_WEIGHT
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "materialTheoreticalWeight",
+        (
+        SELECT
+        RM.MATERIAL_NAME "materialName"
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "materialName",
+        (
+        SELECT
+        ASTM.MATERIAL_ID "materialId"
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "materialId"
+        FROM
+        AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID=#{saleOrderMaterialId}
+        <include refid="orderBy"></include>
+    </select>
+
+
+    <!-- 根据承运商查找销售订单 -->
+    <select id="selectSaleMaterialIdByCarrierId" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select ADSO.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId"
+        from AMS_DISPATCH_SALE_ORDER ADSO
+        where ADSO.CARRIER_ID = #{carrierId}
+    </select>
+    <!-- 查询所有下发的销售订单，根据下发状态进行筛选-->
+    <select id="selectSaleNumberForCarrier" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT ASO.SALE_NUMBER           "saleNumber",
+               RC.CONSIGNEE_COMPANY_NAME "companyName",
+               RS.SHIPPER_NAME           "shipperName"
+        FROM AMS_SALE_ORDER ASO
+                 LEFT JOIN RMS_CONSIGNEE RC
+                           ON ASO.RECEIVE_ID = RC.CONSIGNEE_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleMaterialId}
+    </select>
+
+
+    <!-- 查询所有已接收的焦炭发运计划 -->
+    <select id="selectCokeDayPlanAndRecived" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select * from (
+        select
+        ARD.DAYPLAN_ID "dayPlanId",
+        ARD.DAYPLAN_NO "No",
+        RS.SHIPPER_NAME "shipperName",
+        ARD.DAYPLAN_TRUCK_NUMBER "TruckNumber",
+        ARD.DAYPLAN_DELIVERY_PLACE "DayPlanDeliveryPlace",
+        ARD.DAYPLAN_RECEIVE_UNIT "receiveUnit",
+        ARD.DAYPLAN_DELIVERY_DATE "deliveryDate",
+        ARD.DAYPLAN_MATERIAL_WEIGHT "weight",
+        RM.MATERIAL_NAME "materialName",
+        ARD.INSERT_UPDATE_REMARK "remark",
+        ARD.INSERT_TIME "insertTime"
+
+        FROM AMSTRUCK_RAIL_DAYPLAN ARD
+        left join RMS_SHIPPER RS
+        on ARD.SHIPMENT_UNIT_ID =RS.SHIPPER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID=ARD.MATERIAL_ID
+        left Join RMS_MATERIAL_TYPE RMT
+        on RMT.MATERIAL_TYPE_ID=RM.MATERIAL_TYPE_ID
+        where ARD.DAYPLAN_RECEIVE_STATUS=1 and ARD.CARRIER_ID=#{carrierId}
+
+        )
+        <!--    <where>-->
+        <!--  <if test="shipperName != null">-->
+        <!--    and-->
+        <!--    <foreach collection="shipperName" item="item" open="(" separator="or" close=")">-->
+        <!--      "shipperName" like '%${item}%'-->
+        <!--    </foreach>-->
+        <!--  </if>-->
+        <!--  <if test="TruckNumber != null">-->
+        <!--    and-->
+        <!--    <foreach collection="TruckNumber" item="item" open="(" separator="or" close=")">-->
+        <!--      "TruckNumber" like '%${item}%'-->
+        <!--    </foreach>-->
+        <!--  </if>-->
+        <!--  <if test="DayPlanDeliveryPlace != null">-->
+        <!--    and-->
+        <!--    <foreach collection="DayPlanDeliveryPlace" item="item" open="(" separator="or" close=")">-->
+        <!--      "DayPlanDeliveryPlace" like '%${item}%'-->
+        <!--    </foreach>-->
+        <!--    <if test="receiveUnit != null">-->
+        <!--      and-->
+        <!--      <foreach collection="receiveUnit" item="item" open="(" separator="or" close=")">-->
+        <!--        "receiveUnit" like '%${item}%'-->
+        <!--      </foreach>-->
+        <!--    </if>-->
+        <!--    <if test="materialName != null">-->
+        <!--      and-->
+        <!--      <foreach collection="materialName" item="item" open="(" separator="or" close=")">-->
+        <!--        "materialName" like '%${item}%'-->
+        <!--      </foreach>-->
+        <!--    </if>-->
+        <!--    <if test="remark != null">-->
+        <!--      and-->
+        <!--      <foreach collection="remark" item="item" open="(" separator="or" close=")">-->
+        <!--        "remark" like '%${item}%'-->
+        <!--      </foreach>-->
+        <!--    </if>-->
+        <!--  </if>-->
+        <!--</where>-->
+        <!--    <include refid="orderBy">-->
+        <!--    </include>-->
+        <!--    <if test="orderField == null  ">-->
+        <!--      order by "insertTime" desc-->
+        <!--    </if>-->
+    </select>
+
+    <!--查询所有已接收的水渣发运计划-->
+    <select id="selectWaterSlagDayPlanAndRecived" resultType="java.util.Map" parameterType="java.lang.Integer">
+        SELECT *
+        FROM (
+        SELECT
+        ARD.DAYPLAN_ID "dayPlanId",
+        ARD.DAYPLAN_NO "No",
+        RS.SHIPPER_NAME "shipperName",
+        ARD.DAYPLAN_RECEIVE_UNIT "receiveUnit",
+        ARD.DAYPLAN_DELIVERY_DATE "deliveryDate",
+        ARD.DAYPLAN_MATERIAL_WEIGHT "weight",
+        RM.MATERIAL_NAME "materialName",
+        ARD.INSERT_UPDATE_REMARK "remark",
+        ARD.INSERT_TIME "insertTime"
+        FROM AMSTRUCK_RAIL_DAYPLAN ARD
+        LEFT JOIN RMS_SHIPPER RS
+        ON ARD.SHIPMENT_UNIT_ID =RS.SHIPPER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID=ARD.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL_TYPE RMT
+        ON RMT.MATERIAL_TYPE_ID=RM.MATERIAL_TYPE_ID
+        where ARD.DAYPLAN_RECEIVE_STATUS=1 AND ARD.CARRIER_ID=#{carrierId}
+        )
+        <!--<where>-->
+        <!--      <if test="shipperName != null">-->
+        <!--    and-->
+        <!--    <foreach collection="shipperName" item="item" open="(" separator="or" close=")">-->
+        <!--      "shipperName" like '%${item}%'-->
+        <!--    </foreach>-->
+        <!--  </if>-->
+        <!--  <if test="DayPlanDeliveryPlace != null">-->
+        <!--    and-->
+        <!--    <foreach collection="DayPlanDeliveryPlace" item="item" open="(" separator="or" close=")">-->
+        <!--      "DayPlanDeliveryPlace" like '%${item}%'-->
+        <!--    </foreach>-->
+        <!--    <if test="receiveUnit != null">-->
+        <!--      and-->
+        <!--      <foreach collection="receiveUnit" item="item" open="(" separator="or" close=")">-->
+        <!--        "receiveUnit" like '%${item}%'-->
+        <!--      </foreach>-->
+        <!--    </if>-->
+        <!--    <if test="materialName != null">-->
+        <!--      and-->
+        <!--      <foreach collection="materialName" item="item" open="(" separator="or" close=")">-->
+        <!--        "materialName" like '%${item}%'-->
+        <!--      </foreach>-->
+        <!--    </if>-->
+        <!--    <if test="remark != null">-->
+        <!--      and-->
+        <!--      <foreach collection="remark" item="item" open="(" separator="or" close=")">-->
+        <!--        "remark" like '%${item}%'-->
+        <!--      </foreach>-->
+        <!--    </if>-->
+        <!--  </if>-->
+        <!--</where>-->
+        <include refid="orderBy"></include>
+    </select>
+
+
+    <!--根据发运计划id查找物资id  -->
+    <select id="selectMaterialIdAndWeightByDayPlanId" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select APM.MATERIAL_ID             "materialId",
+               APM.DAYPLAN_MATERIAL_WEIGHT "materialWeight"
+        from AMSTRUCK_RAIL_DAYPLAN APM
+        WHERE APM.DAYPLAN_ID = #{dayPlanId}
+    </select>
+
+
+    <!--查询根据销售订单生成的运输订单  -->
+    <select id="selectAllOrderForSale" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
+        SELECT
+        ASO.SALE_NUMBER "saleNumber",
+        RS.SHIPPER_NAME "shipperName",
+        RC.CONSIGNEE_COMPANY_NAME "consigneeName",
+        RRA.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
+        ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
+        ASOM.SALE_DATE_OF_RECEIPT "receiptOfdate",
+        ASOM.SALE_ORDER_CONSIGNEE "saleOrderConsignee",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel",
+        ASOM.INSERT_UPDATE_REMARK "insertUpdateRemark",
+        RC2.CAPACITY_NUMBER "capacityNumber",
+        OO.ORDER_ID "orderId",
+        (
+        SELECT
+        ASTM.SALE_ORDER_MATERIAL_NUMBER
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "saleOrderMaterialNumber",
+        (
+        SELECT
+        ASTM.MATERIAL_THEORETICAL_WEIGHT
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "materialTheoreticalWeight",
+        (
+        SELECT
+        RM.MATERIAL_NAME "materialName"
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "materialName",
+        (
+        SELECT
+        ASTM.MATERIAL_ID "materialId"
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "materialId"
+
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+        LEFT JOIN RMS_CAPACITY RC2 ON RC2.CAPACITY_ID=OO.CAPACITY_ID
+        <where>
+            <if test="saleOrderMaterialId != null">
+                and ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+            </if>
+            <if test="orderStatus!=null">
+                and OO.ORDER_STATUS = #{orderStatus}
+            </if>
+            <if test="orderTypee != null">
+                and OO.ORDER_TYPE = #{orderTypee}
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+    <!--销售查询已经形成水渣日计划  -->
+    <select id="selectWaterSlagForOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        select *
+        from (
+        SELECT ARD.DAYPLAN_NO "No",
+        RS.SHIPPER_NAME "shipperName",
+        ARD.DAYPLAN_TRUCK_NUMBER "TruckNumber",
+        ARD.DAYPLAN_DELIVERY_PLACE "DayPlanDeliveryPlace",
+        ARD.DAYPLAN_RECEIVE_UNIT "receiveUnit",
+        ARD.DAYPLAN_DELIVERY_DATE "deliveryDate",
+        ARD.DAYPLAN_MATERIAL_WEIGHT "weight",
+        ARD.INSERT_UPDATE_REMARK "remark",
+        ARD.INSERT_TIME "insertTime",
+        OO.ORDER_ID "orderId",
+        RM.MATERIAL_NAME "materialName"
+
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_RAIL_DAYPLAN ARD
+        ON ARD.DAYPLAN_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID=ARD.MATERIAL_ID
+        left join RMS_SHIPPER RS
+        on ARD.SHIPMENT_UNIT_ID =RS.SHIPPER_ID
+        <where>
+            <if test="carrierId!=null">
+                and ARD.CARRIER_ID=#{carrierId}
+            </if>
+            <if test="dayPlanId!=null">
+                and ARD.DAYPLAN_ID=#{dayPlanId}
+            </if>
+            <if test="orderType!=null">
+                and OO.ORDER_TYPE=#{orderType}
+            </if>
+            <if test="orderStatus!=null">
+                and OO.ORDER_STATUS=#{orderStatus}
+            </if>
+            <if test="materialId!=null">
+                and RM.MATERIAL_ID=#{materialId}
+            </if>
+        </where>
+        )
+        <include refid="orderBy"></include>
+    </select>
+    <!--销售查询已经形成订单得水渣日计划-->
+    <select id="selectCokeRailPlanForOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        select *
+        from (
+        SELECT ARD.DAYPLAN_NO "No",
+        ARD.DAYPLAN_ID "dayPlanId",
+        RS.SHIPPER_NAME "shipperName",
+        ARD.DAYPLAN_TRUCK_NUMBER "TruckNumber",
+        ARD.DAYPLAN_DELIVERY_PLACE "DayPlanDeliveryPlace",
+        ARD.DAYPLAN_RECEIVE_UNIT "receiveUnit",
+        ARD.DAYPLAN_DELIVERY_DATE "deliveryDate",
+        ARD.DAYPLAN_MATERIAL_WEIGHT "weight",
+        RM.MATERIAL_NAME "materialName",
+        ARD.INSERT_UPDATE_REMARK "remark",
+        ARD.INSERT_TIME "insertTime",
+        OO.ORDER_ID "orderId"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_RAIL_DAYPLAN ARD
+        ON ARD.DAYPLAN_ID=OO.ORDER_PLAN_ID
+        left join RMS_SHIPPER RS
+        on ARD.SHIPMENT_UNIT_ID =RS.SHIPPER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID=ARD.MATERIAL_ID
+        left join OMSTRUCK_ORDER OO
+        ON OO.ORDER_PLAN_ID=ARD.DAYPLAN_ID
+        <where>
+            <if test="carrierId!=null">
+                and ARD.CARRIER_ID=#{carrierId}
+            </if>
+            <if test="dayPlanId!=null">
+                and ARD.DAYPLAN_ID=#{dayPlanId}
+            </if>
+            <if test="orderType!=null">
+                and OO.ORDER_TYPE=#{orderType}
+            </if>
+            <if test="orderStatus!=null">
+                and OO.ORDER_STATUS=#{orderStatus}
+            </if>
+            <if test="materialId!=null">
+                and RM.MATERIAL_ID=#{materialId}
+            </if>
+        </where>
+        )
+        <include refid="orderBy"></include>
+    </select>
+    <!-- 根据承运商查找销售订单-->
+    <select id="selectSteelSaleForCarrier" resultType="java.util.LinkedHashMap" parameterType="java.lang.Integer">
+        select ASO.SALE_NUMBER               "saleNumber",
+               RS.SHIPPER_NAME               "shipperName",
+               RC.CONSIGNEE_COMPANY_NAME     "consigneeName",
+               RRA.ADDRESS_DELIVERY_ADDRESS  "addressDeliveryAddress",
+               ASOM.SALE_DATE_OF_RECEIPT     "receiptOfdate",
+               ASOM.SALE_ORDER_CONSIGNEE     "saleOrderConsignee",
+               ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel",
+               RC2.CARRIER_NAME              "carrierName",
+               ASO.SALE_ORDER_ID             "saleOderId"
+        from AMS_SALE_ORDER ASO
+                 left join AMS_SALE_ORDER_MATERIAL ASOM
+                           on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 left join OMSTRUCK_ORDER OO
+                           on OO.ORDER_PLAN_ID = ASTM.SALE_ORDER_MATERIAL_ID
+                 left join RMS_CAPACITY RDC
+                           on RDC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
+                 LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+                 left join RMS_CARRIER RC2 ON RC2.CARRIER_ID = RDC.CARRIER_ID
+        WHERE RDC.CARRIER_ID = #{carrierId}
+          and OO.ORDER_TYPE = 1
+          AND OO.ORDER_STATUS = 4
+    </select>
+
+    <select id="selectInfoBySaleOrderId" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select OO.ORDER_NUMBER                   "orderNumber",
+               RM.MATERIAL_NAME                  "materialName",
+               OOM.ORDER_MATERIAL_NUMBER         "orderMaterialNumber",
+               RM.MATERIAL_THEORETICAL_WEIGHT    "orderTheoreticalWeight",
+               ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "saleOrderMaterialTruckNo",
+               OO.INSERT_UPDATE_REMARK           "remark",
+               RC.CAPACITY_NUMBER                "capacityNumber"
+
+        from AMS_SALE_ORDER ASO
+                 left join AMS_SALE_ORDER_MATERIAL ASOM
+                           on asom.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+                 left join OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                           ON OOM.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
+          and OO.ORDER_TYPE = 1
+          AND OO.ORDER_STATUS = 4
+    </select>
+
+    <!--根据承运商查找发运计划-->
+    <select id="selectCokeRailPlan" resultType="java.util.Map" parameterType="java.util.Map">
+        select ARD.DAYPLAN_NO             "dayPlanNo",
+               ARD.DAYPLAN_DELIVERY_DATE  "dayPlanDeliverydate",
+               ARD.DAYPLAN_TRUCK_NUMBER   "dayTruckNumber",
+               ARD.DAYPLAN_DELIVERY_PLACE "dayPlanDeliveryPlace",
+               ARD.DAYPLAN_RECEIVE_UNIT   "dayPlanReceiveUnit",
+               RS.SHIPPER_NAME            "shipperName",
+               ARD.DAYPLAN_ID             "dayPlanId"
+        from AMSTRUCK_RAIL_DAYPLAN ARD
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ARD.SHIPMENT_UNIT_ID
+        WHERE ARD.CARRIER_ID = #{carrierId}
+          and OO.ORDER_TYPE = #{orderType}
+          AND OO.ORDER_STATUS = 4
+    </select>
+
+
+    <!-- 根据发运计划id查找信息 -->
+    <select id="selectInfoByDayPlanId" parameterType="java.lang.Integer" resultType="java.util.Map">
+
+        select OO.ORDER_NUMBER             "orderNumber",
+               RM.MATERIAL_NAME            "materialName",
+               ARD.DAYPLAN_MATERIAL_WEIGHT "materialWeight",
+               RC.CAPACITY_NUMBER          "capacityNumber",
+               OO.INSERT_UPDATE_REMARK     "remark"
+
+
+        from AMSTRUCK_RAIL_DAYPLAN ARD
+                 left join OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = ARD.MATERIAL_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        where OO.ORDER_TYPE = #{orderType}
+          and ARD.DAYPLAN_ID = #{dayPlanId}
+          AND OO.ORDER_STATUS = 4
+    </select>
+
+
+    <select id="getOrderUnReceive" resultType="java.util.Map"></select>
+
+    <!-- 车牌号下拉 -->
+    <select id="getDriverCapacity" resultType="java.util.Map">
+        SELECT RCA.CAPACITY_NUMBER    AS "label",
+               RDC.DRIVER_CAPACITY_ID AS "value"
+        FROM RMS_DRIVER_CAPACITY RDC
+                 LEFT JOIN RMS_CAPACITY RCA
+                           ON RDC.CAPACITY_ID = RCA.CAPACITY_ID
+--         WHERE RCA.CAPACITY_STATUS = 0
+    </select>
+
+    <!-- 派单信息 -->
+    <select id="getTruckNoDispatchMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ADSO.DISPATCH_ID                  AS "dispatchId",
+               ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "saleOrderMaterialTruckNo",
+               ASO.SALE_NUMBER                   AS "saleNumber",
+               ADSO.DISPATCH_DEAL_TIME           AS "dispatchDealTime",
+               RSH.SHIPPER_NAME                  AS "shipperName",
+               RC.CONSIGNEE_COMPANY_NAME         AS "consigneeCompanyName",
+               RRA.ADDRESS_DELIVERY_ADDRESS      AS "addressDeliveryAddress",
+               ASOM.SALE_ORDER_CONSIGNEE         AS "saleOrderConsignee",
+               ASOM.SALE_ORDER_CONSIGNEE_TEL     AS "saleOrderConsigneeTel",
+               RCA.CARRIER_NAME                  AS "carrierName"
+        FROM AMS_DISPATCH_SALE_ORDER ADSO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN RMS_CONSIGNEE RC
+                           ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+                 LEFT JOIN RMS_CARRIER RCA
+                           ON RCA.CARRIER_ID = ADSO.CARRIER_ID
+        WHERE ADSO.DISPATCH_STATUS = 0
+          AND ADSO.DISPATCH_ID = #{dispatchId}
+    </select>
+
+    <select id="getNullOrNotNull" parameterType="DECIMAL" resultType="java.util.List">
+        SELECT OO.ORDER_ID AS "orderId"
+        FROM AMS_DISPATCH_SALE_ORDER ADSO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = ADSO.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        WHERE ADSO.DISPATCH_ID = #{dispatchId}
+    </select>
+
+    <select id="getMaterialMessages" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RM.MATERIAL_NAME                               AS "materialName",
+               RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
+               ASTM.MATERIAL_THEORETICAL_WEIGHT               AS "materialTheoreticalWeight",
+               ASTM.SALE_ORDER_MATERIAL_NUMBER                AS "saleOrderMaterialNumber",
+               ASM.MATERIAL_ID                               AS "materialId"
+        FROM AMS_DISPATCH_SALE_ORDER ADSO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+        WHERE ADSO.DISPATCH_ID = #{dispatchId}
+    </select>
+
+
+    <!--得到销售订单与物资中间表id-->
+    <select id="getSaleMaterialId" parameterType="DECIMAL" resultType="DECIMAL">
+        SELECT ASOM.SALE_ORDER_MATERIAL_ID AS "saleOrderMaterialId"
+        FROM AMS_DISPATCH_SALE_ORDER ADSO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        WHERE ADSO.DISPATCH_ID = #{dispatchId}
+    </select>
+
+    <select id="getCapacityId" parameterType="java.lang.String" resultType="DECIMAL">
+        SELECT RC.CAPACITY_ID AS "capacityId"
+        FROM RMS_CAPACITY RC
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+    </select>
+
+    <select id="getDriverCapacityId" parameterType="DECIMAL" resultType="DECIMAL">
+        SELECT *
+        FROM (SELECT RC.DRIVER_CAPACITY_ID AS "driverCapacityId"
+              FROM RMS_DRIVER_CAPACITY RC
+              WHERE RC.CAPACITY_ID = #{capacityId}
+                AND DELETED = 0
+              ORDER BY RC.INSERT_TIME)
+        WHERE ROWNUM = 1
+    </select>
+
+    <select id="getUnloadPointId" parameterType="java.lang.String" resultType="DECIMAL">
+        SELECT
+            RW.WAREHOUSE_ID AS "wareHouseId"
+        FROM RMS_WAREHOUSE RW
+        WHERE RW.WAREHOUSE_NAME = #{unloadPoint}
+    </select>
+
+    <select id="getCapacityAndDriver" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (SELECT RC.CAPACITY_NUMBER AS "capacityNumber",
+        RC.CAPACITY_ID AS "carrierId"
+        FROM RMS_CAPACITY RC
+        WHERE RC.CAPACITY_STATUS = 0
+        AND RC.CAPACITY_TYPE_ID = 1
+        <if test="carrierIds != null">
+            and RC.CARRIER_ID = (select rcr.carrier_id from rms_carrier rcr where rcr.carrier_sso_id = #{carrierIds})
+        </if>
+        )
+        <where>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="getInwardMaterial" parameterType="DECIMAL" resultType="DECIMAL">
+        SELECT ARM.MATERIAL_ID AS "materialId"
+        FROM AMSTRUCK_REQUIREMENT_PLAN ARP
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+                           ON ARP.REQUIREMENT_ID = ARM.REQUIREMENT_ID
+        WHERE ARP.PLAN_ID = #{planId}
+    </select>
+
+    <!-- 查询分解运输计划 -->
+    <select id="getInwardOrderList" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT *
+        FROM (SELECT
+        OO.ORDER_NUMBER                       "orderNumber",
+        AIP.PLAN_NUMBER                    AS "planNumber",
+        RCA.CARRIER_NAME                   AS "carrierName",
+        AIP.CARRIER_ID                     AS "carrierId",
+        RC.CAPACITY_NUMBER                 AS "capacityNumber",
+        OOM.ORDER_MATERIAL_NUMBER          AS "orderMaterialNumber",
+        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
+        AIP.PLAN_ISSUE_TIME                AS "planIssueTime",
+        AIP.PLAN_ISSUE_NAME                AS "planIssueName",
+        AIR.REQUIREMENT_TYPE               AS "requirementType",
+        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+        AIR.REQUIREMENT_ID                 AS "requirementId",
+        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+        AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
+        OO.ORDER_ID                        AS "orderId",
+        AIP.INSERT_TIME                    AS "insertTime",
+        RW.WAREHOUSE_NAME                  AS "unloadName",
+        RW1.WAREHOUSE_NAME                 AS "loadName",
+        RM.MATERIAL_NAME                   AS "materialName",
+        RC.CAPACITY_NUMBER || RM.MATERIAL_NAME || RW1.WAREHOUSE_NAME || RW.WAREHOUSE_NAME "likeCon"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_CARRIER RCA
+        ON RCA.CARRIER_ID = AIP.CARRIER_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN  RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+        WHERE AIP.DELETED = 0
+        AND OO.ORDER_TYPE in (11,21,25)
+        <if test="carrierId != null">
+            AND AIP.CARRIER_ID = (select rc.carrier_id from rms_carrier rc
+            where rc.carrier_sso_id =  #{carrierId})
+        </if>
+        <if test="orderStatus != null">
+            AND OO.ORDER_STATUS = #{orderStatus}
+        </if>
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OO.INSERT_TIME
+        </if>
+        )
+        <where>
+            <if test="con != null">
+                and "likeCon" like #{con}
+            </if>
+            <if test="materialNumber != null">
+                and
+                <foreach collection="materialNumber" item="item" open="(" separator="or" close=")">
+                    "materialNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementNumber != null">
+                and
+                <foreach collection="requirementNumber" item="item" open="(" separator="or" close=")">
+                    "requirementNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementType != null">
+                and
+                <foreach collection="requirementType" item="item" open="(" separator="or" close=")">
+                    "requirementType" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="planIssueTime != null">
+                and
+                <foreach collection="planIssueTime" item="item" open="(" separator="or" close=")">
+                    "planIssueTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="planIssueName != null">
+                and
+                <foreach collection="planIssueName" item="item" open="(" separator="or" close=")">
+                    "planIssueName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementTruckTime != null">
+                and
+                <foreach collection="requirementTruckTime" item="item" open="(" separator="or" close=")">
+                    "requirementTruckTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementWorkType != null">
+                and
+                <foreach collection="requirementWorkType" item="item" open="(" separator="or" close=")">
+                    "requirementWorkType" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="unloadName != null">
+                and
+                <foreach collection="unloadName" item="item" open="(" separator="or" close=")">
+                    "unloadName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="loadName != null">
+                and
+                <foreach collection="loadName" item="item" open="(" separator="or" close=")">
+                    "loadName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+
+    <select id="getResultList" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID   AS "orderId",
+               OO.ORDER_TYPE AS "orderType"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_STATUS = 4
+          AND OO.ORDER_TYPE NOT IN (4, 9, 10, 11)
+          AND OO.CAPACITY_ID = #{capacityId}
+    </select>
+    <!-- 销售订单 -->
+    <select id="getSaleOrderMap" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT ASO.SALE_NUMBER              AS "saleNumber",
+               RSH.SHIPPER_NAME             AS "shipperName",
+               RC.CONSIGNEE_COMPANY_NAME    AS "consigneeCompanyName",
+               OO.ORDER_NUMBER              AS "orderNumber",
+               RCA.CAPACITY_NUMBER          AS "capacityNumber",
+               RRA.ADDRESS_DELIVERY_ADDRESS AS "addressDeliveryAddress",
+               ASOM.SALE_DATE_OF_RECEIPT    AS "saleDateOfReceipt",
+               OO.ORDER_RECEIVE_REFUSE_TIME AS "orderReceiveRefuseTime"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN RMS_CONSIGNEE RC
+                           ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_CAPACITY RCA
+                           ON OO.CAPACITY_ID = RCA.CAPACITY_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+    </select>
+
+    <!-- 物资信息 -->
+    <select id="getMaterialMes" parameterType="DECIMAL" resultType="java.util.LinkedHashMap">
+        SELECT
+        RM.MATERIAL_NAME || (
+            case
+                when OOM.MATERIAL_LUNO is not null
+                     then '-' || oom.MATERIAL_LUNO
+            end
+        )
+        <if test="steelJudge != null">
+            || '   ' || RW.WAREHOUSE_NAME
+        </if>
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+        OOM.SALE_MATERIAL_ID    "saleMaterialId",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        when OOM.ORDER_MATERIAL_NUMBER is not null
+        then OOM.ORDER_MATERIAL_NUMBER || '件/支'
+        end
+        ) || (
+            case
+        when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then '-'||OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        end
+        )
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        <if test="steelJudge != null">
+            LEFT JOIN RMS_WAREHOUSE RW
+            ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+        </if>
+        WHERE ORDER_ID = #{orderId}
+        ORDER BY RM.MATERIAL_NAME
+    </select>
+
+
+    <!-- 物资信息（特供给已完成物资总数）-->
+    <select id="getMaterialMesForGrossWeight"  resultType="java.util.LinkedHashMap">
+        SELECT
+        RM.MATERIAL_NAME || (
+        case
+        when OOM.MATERIAL_LUNO is not null
+        then '-' || oom.MATERIAL_LUNO
+        end
+        )
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        when OOM.ORDER_MATERIAL_NUMBER is not null
+        then OOM.ORDER_MATERIAL_NUMBER || '件/支'
+        end
+        ) || (
+        case
+        when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then '-'||OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        end
+        )
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        <if test="steelJudge != null">
+            LEFT JOIN RMS_WAREHOUSE RW
+            ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+        </if>
+        WHERE ORDER_ID = #{orderId}
+        ORDER BY RM.MATERIAL_NAME
+    </select>
+
+    <!-- 物资信息(NEW) -->
+    <select id="getMaterialMesNew" parameterType="DECIMAL" resultType="java.util.LinkedHashMap">
+        SELECT
+        RM.MATERIAL_NAME
+        <if test="steelJudge != null">
+            || '   ' || RW.WAREHOUSE_NAME ||
+            AMS.STEEL_METER||'米'
+        </if>
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        when OOM.ORDER_MATERIAL_NUMBER is not null
+        then OOM.ORDER_MATERIAL_NUMBER || '件'
+        when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        end
+        )
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        <if test="steelJudge != null">
+            LEFT JOIN RMS_WAREHOUSE RW
+            ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+            LEFT JOIN OMSTRUCK_ORDER OO
+            ON OO.ORDER_ID=OOM.ORDER_ID
+            LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+            ON ASTM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+            LEFT JOIN AMS_SALE_MATERIAL AMS
+            ON AMS.SALE_MATERIAL_ID=ASTM.MATERIAL_ID
+        </if>
+        WHERE OOM.ORDER_ID = #{orderId}
+        ORDER BY RM.MATERIAL_NAME
+    </select>
+
+    <!--根据ID查询-->
+    <select id="getMaterialId" resultType="java.util.Map">
+        select
+        distinct
+        AMS.MATERIAL_ID "materialId",
+        AMS.STEEL_METER "steelmeter"
+        from OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_MATERIAL AMS
+        ON AMS.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        WHERE OOM.ORDER_ID=#{orderId}
+        and AMS.SALE_MATERIAL_ID IS NOT NULL
+        and AMS.DELETED IS NULL
+    </select>
+    <!-- 内转原料司机接单 -->
+    <select id="getInwardOrderMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT AIR.REQUIREMENT_NUMBER AS "upNumber",
+               OO.ORDER_NUMBER        AS "orderNumber",
+               RC.CAPACITY_NUMBER     AS "capacityNumber",
+               RCA.CARRIER_NAME       AS "carrierName",
+               AIR.INSERT_UPDATE_REMARK "insertUpdateRemark"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+                           ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                           ON ARP.PLAN_ID = AIP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+                 LEFT JOIN RMS_CARRIER RCA
+                           ON RCA.CARRIER_ID = AIP.CARRIER_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 内转钢材到异地库 -->
+    <select id="getSteelInwardOrderMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT AROD.DAYPLAN_NO    AS "upNumber",
+               OO.ORDER_NUMBER    AS "orderNumber",
+               RC.CAPACITY_NUMBER AS "capacityNumber",
+               RCA.CARRIER_NAME   AS "carrierName"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN AMS_RAIL_OFFSET_DAYPLAN AROD
+                           ON AROD.DAYPLAN_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_CARRIER RCA
+                           ON RCA.CARRIER_ID = AROD.CARRIER_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+    <select id="selectCapacityNumber" resultType="java.lang.String">
+        select rc.capacity_number
+        from omstruck_order oo
+                 left join rms_capacity rc
+                           on rc.capacity_id = OO.CAPACITY_ID
+        where oo.order_id = #{orderId}
+    </select>
+    <select id="selectOrderType" resultType="java.math.BigDecimal">
+
+    </select>
+    <select id="selectOrderId" resultType="java.math.BigDecimal">
+        select oo.order_id
+        from omstruck_order oo
+        where oo.CAPACITY_ID = #{dcId}
+          and oo.order_status = 3
+    </select>
+
+    <!-- 销售的运输订单 -->
+    <select id="getSaleMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID                  AS "orderId",
+               OO.ORDER_TYPE                AS "orderType",
+               OO.ORDER_NUMBER              AS "orderNumber",
+               RC.CAPACITY_NUMBER           AS "capacityNumber",
+               RSH.SHIPPER_NAME             AS "shipperName",
+               RCO.CONSIGNEE_COMPANY_NAME   AS "consigneeCompanyName",
+               RRA.ADDRESS_DELIVERY_ADDRESS AS "addressDeliveryAddress",
+               ASOM.SALE_DATE_OF_RECEIPT    AS "saleDateOfReceipt"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN RMS_CONSIGNEE RCO
+                           ON RCO.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 内转钢材的运输订单 -->
+    <select id="getSteelInwardMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID        AS "orderId",
+               OO.ORDER_TYPE      AS "orderType",
+               OO.ORDER_NUMBER    AS "orderNumber",
+               RC.CAPACITY_NUMBER AS "capacityNumber"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 采购的运输订单 -->
+    <select id="getPurchaseMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID        AS "orderId",
+               OO.ORDER_TYPE      AS "orderType",
+               OO.ORDER_NUMBER    AS "orderNumber",
+               RC.CAPACITY_NUMBER AS "capacityNumber",
+               RSU.SUPPLIER_NAME  AS "loadPoint",
+               RSH.SHIPPER_NAME   AS "unloadPoint"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_SUPPLIER RSU
+                           ON RSU.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = APO.PURCHASING_ORGANIZATION_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 内转的运输订单 -->
+    <select id="getInwardMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID             AS "orderId",
+               OO.ORDER_TYPE           AS "orderType",
+               OO.ORDER_NUMBER         AS "orderNumber",
+               RC.CAPACITY_NUMBER      AS "capacityNumber",
+               RWLOAD.WAREHOUSE_NAME   AS "loadPoint",
+               RWUNLOAD.WAREHOUSE_NAME AS "unloadPoint"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
+                 LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+                           ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                           ON ARP.PLAN_ID = AIP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+                 LEFT JOIN RMS_WAREHOUSE RWLOAD
+                           ON RWLOAD.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+                 LEFT JOIN RMS_WAREHOUSE RWUNLOAD
+                           ON RWUNLOAD.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 判断是走采购，销售还是内转 -->
+    <select id="getResultListByCapacity" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT OO.ORDER_ID   AS "orderId",
+               OO.ORDER_TYPE AS "orderType"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+          AND OO.ORDER_STATUS = 4
+    </select>
+
+    <!--  通过运输订单号查询运输订单ID  -->
+    <select id="getOrderIdByOrderNumber" parameterType="string" resultType="java.lang.Integer">
+        select OO.ORDER_ID
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_NUMBER = #{orderNumber} AND OO.ORDER_STATUS=5
+        FETCH NEXT 1 ROWS ONLY
+    </select>
+
+    <!--   查询采购运输订单给APP 5 6 7 8 -->
+    <select id="getCGOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT OO.ORDER_ID        "orderId",
+        OO.ORDER_NUMBER    "orderNumber",
+        OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        RS.SUPPLIER_NAME   "shipperName",
+        RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName",
+        RW.WAREHOUSE_NAME  "unloadName",
+        OO.ORDER_TYPE      "orderType",
+        RW2.WAREHOUSE_NAME "loadName",
+        (case when APO.PURCHASING_ORGANIZATION_ID = 1
+        then '一厂'
+        when APO.PURCHASING_ORGANIZATION_ID = 2
+        then '二厂'
+        end) "organizationCode"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        left join RMS_WAREHOUSE RW2
+        ON RW2.WAREHOUSE_ID=OO.DRIVER_CONFIRMATION
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        LEFT JOIN RMS_CONSIGNEE RCON
+        ON RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+
+    <!--查询采购零星物资信息给app 12 -->
+    <select id="getSporadicOrder" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT  OO.ORDER_ID        "orderId",
+        OO.ORDER_NUMBER    "orderNumber",
+        OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        OO.ORDER_TYPE      "orderType",
+        RS.SUPPLIER_NAME  "shipperName",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join AMSTRUCK_SPORADIC_ORDER ASO
+        ON ASO.SPORADIC_ORDER_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID=ASO.SEND_UNIT_ID
+        LEFT JOIN RMS_CONSIGNEE RC2
+        ON RC2.CONSIGNEE_ID=ASO.RECEIVE_UNIT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+
+    <!--  查询内转运输订单给APP 9 10 11-->
+    <select id="getNZOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT OO.ORDER_ID "orderId",
+        OO.ORDER_NUMBER "orderNumber",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        RW.WAREHOUSE_NAME "unloadName",
+        OO.ORDER_TYPE "orderType",
+        OO.ORDER_STATUS "orderStatus",
+        RS.SUPPLIER_NAME "shipperName",
+        RCG.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        APO.PURCHASING_ORGANIZATION_ID "organizationId",
+        DB.RESULT_FOREIGN_SHIP_NAME "shipName",
+        RW1.WAREHOUSE_NAME      "loadName"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+        LEFT JOIN DIL_BATCH DB
+        ON DB.BATCH_ID = APO.BATCH_ID
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        LEFT JOIN RMS_CONSIGNEE RCG
+        ON RCG.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_PLATFORM_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+        <if test="orderStatus == 4">
+            AND AIP.PLAN_EABLE_STATUS = 1
+        </if>
+    </select>
+    <!--  查询发运计划运输订单给APP  2 3 4 -->
+    <select id="getFYJHOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT OO.ORDER_ID        "orderId",
+        OO.ORDER_TYPE      "orderType",
+        OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+        OO.ORDER_NUMBER    "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        RS.SHIPPER_NAME    "loadName",
+        RW.WAREHOUSE_NAME  "unloadName"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status != null">
+            AND OO.ORDER_STATUS = 2
+        </if>
+    </select>
+    <!--  查询销售运输订单给APP 1 -->
+    <select id="getXSOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT
+        OO.ORDER_ID "orderId",
+        OO.ORDER_TYPE "orderType",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        RS.SHIPPER_NAME "shipperName",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),
+        RDA.ADDRESS_DELIVERY_ADDRESS ) "receiveAddressName",
+        ASM.SALE_WAREHOUSE "remark",
+        ASO.SALE_REMARK     "shipName"
+        FROM
+        OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2 ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
+        WHERE
+        OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+
+
+    <!--  通过运输订单号查询订单类型  -->
+    <select id="getOrderTypeByOrderNumber" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        SELECT OO.ORDER_TYPE
+        FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!--  通过车牌匹配所有已下发的 的订单Id -->
+    <select id="getOrderIdListByCapacityNumber" parameterType="string" resultType="java.util.LinkedHashMap">
+        SELECT OO.ORDER_ID "orderId",
+               OO.ORDER_TYPE  "orderType"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+          AND OO.ORDER_STATUS = 4
+        ORDER BY OO.ORDER_ID DESC
+    </select>
+
+    <!--  根据车牌号匹配所有已接收的运输订单Id  -->
+    <select id="getReceiveOrderIdListByCapacityNum" parameterType="string" resultType="java.lang.Integer">
+        SELECT OO.ORDER_ID
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+          AND OO.ORDER_STATUS in (0, 1, 5)
+    </select>
+
+    <!--    通过车牌号查询运输订单号和运输订单ID  -->
+    <select id="getAllRefuseOrderNumberByCapacity" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_ID     "orderId",
+               OO.ORDER_NUMBER "orderNumber"
+        from OMSTRUCK_ORDER OO
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
+        where RC.CAPACITY_NUMBER = #{capacityNumber}
+          AND OO.ORDER_STATUS = 6
+    </select>
+
+    <!--   通过订单号或订单ID查询订单类型 -->
+    <select id="getOrderTypeByOrderId" parameterType="map" resultType="java.lang.Integer">
+        select ORDER_TYPE
+        from OMSTRUCK_ORDER
+        where ORDER_ID = #{orderId}
+    </select>
+
+
+    <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="DECIMAL" >
+        SELECT
+            RC.CARRIER_ID AS "carrierId"
+        FROM RMS_CARRIER RC
+        WHERE RC.CARRIER_SSO_ID = #{carrierSsoId}
+    </select>
+
+    <select id="getOrderMaterialList" parameterType="DECIMAL" resultType="java.util.Map" >
+        SELECT
+            OOM.MATERIAL_ID AS "materialId",
+            RM.MATERIAL_NAME AS "materialName",
+            OOM.ORDER_MATERIAL_WEIGHT AS "materialWeight",
+            OOM.ORDER_MATERIAL_NUMBER AS "materialNumber",
+            RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE OOM.ORDER_ID = #{orderId}
+    </select>
+
+    <select id="getSporadicOrderTimes" resultType="java.util.Map">
+        select aso.sporadic_order_times "orderTimes",
+               aso.SPORADIC_TRANS_TIMES "transTimes"
+        from OMSTRUCK_ORDER oo
+                 left join  AMSTRUCK_SPORADIC_ORDER  aso
+                            on oo.ORDER_PLAN_ID=aso.sporadic_order_id
+        where oo.order_id= #{orderId}
+    </select>
+
+    <select id="getAllResultId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+        SELECT  DISTINCT TTR.RESULT_TOTAL_ID "resultTotalId",
+                         TWR.WEIGHT_TASK_RESULT_ID "weightResultId",
+                         TLR.RESULT_ID "loadResultId",
+                         TLFR.RESULT_ID "leaveResultId",
+                         TUR.RESULT_ID "unloadResultId",
+                         TER.RESULT_ID "enFactoryId"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON OO.ORDER_ID=TTR.ORDER_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                           ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+                           ON  TTR.RESULT_TOTAL_ID= TLR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                           ON TLFR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR
+                           ON TUR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                           ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        where OO.ORDER_ID=#{orderId}
+    </select>
+
+
+    <!--  查询订单是否确认  -->
+    <select id="getDriverConfirmation" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select OO.DRIVER_CONFIRMATION
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!--  查看当前订单最大路段顺序号  -->
+    <select id="getMaxLineSeqByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        select OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+               (select max(RLS.SEGMENT_SQE)
+                from RMS_LINE_SEGEMNT RLS
+                where RLS.LINE_ID = RL.LINE_ID
+               )    "segmentSqe"
+        from OMSTRUCK_ORDER OO
+                 join RMS_LINE RL
+                      on RL.LINE_ID = OO.LINE_ID
+        where OO.ORDER_ID = #{orderId}
+    </select>
+    <select id="getSporadicOrdermapAddOrder" resultType="java.util.Map">
+        select aso.sporadic_order_times "sporadicOrderTimes",
+               aso.SPORADIC_ORDER_ID "sporadicOrderId",
+               oo.CAPACITY_ID "capacityId",
+               ASO.TRANS_STATUS "transStatus"
+        from OMSTRUCK_ORDER oo
+                 left join  AMSTRUCK_SPORADIC_ORDER  aso
+                            on oo.ORDER_PLAN_ID=aso.sporadic_order_id
+        where oo.order_id= #{orderId}
+    </select>
+
+    <select id="getIsSteel" parameterType="DECIMAL" resultType="DECIMAL">
+        SELECT RL.IS_STEEL AS "isSteel"
+        FROM RMS_LINE RL
+        WHERE RL.LINE_ID = #{lineId}
+    </select>
+    <!--    采购内转运输订单-->
+    <select id="getPurInwardOrderList" resultType="java.util.Map">
+        SELECT * FROM (
+        SELECT APO.PURCHASE_ORDER_NO      AS "purchaseOrderNo",
+        RM.MATERIAL_NAME           AS "materialName",
+        RCA.CARRIER_NAME           AS "carrierName",
+        RC.CAPACITY_NUMBER         AS "capacityNumber",
+        AIR.REQUIREMENT_NUMBER     AS "requirementNumber",
+        RW.WAREHOUSE_NAME          AS "wareHouseName",
+        OO.ORDER_ID                AS "orderId",
+        RS.SUPPLIER_NAME           AS "supplierName",
+        RCE.CONSIGNEE_COMPANY_NAME AS "consigneeName",
+        OO.ORDER_NUMBER            AS "orderNo",
+        DB.RESULT_FOREIGN_SHIP_NAME AS "shipName"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+        LEFT JOIN DIL_BATCH DB
+        ON APO.BATCH_ID = DB.BATCH_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN RMS_CARRIER RCA
+        ON RCA.CARRIER_ID = AIP.CARRIER_ID
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        LEFT JOIN RMS_CONSIGNEE RCE
+        ON RCE.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        WHERE AIP.DELETED = 0
+        AND OO.ORDER_TYPE IN (10,20,15,16,23,24)
+        AND OO.ORDER_STATUS = #{orderStatus}
+        <if test="carrierId !=null">
+            AND AIP.CARRIER_ID = (SELECT RCR.CARRIER_ID FROM RMS_CARRIER RCR WHERE RCR.CARRIER_SSO_ID = #{carrierId})
+        </if>
+        <if test="planEnableStatus !=null">
+            AND AIP.PLAN_EABLE_STATUS = 1
+        </if>
+        <if test="con!=null and con!=''.toString()">
+            AND APO.PURCHASE_ORDER_NO || RC.CAPACITY_NUMBER LIKE CONCAT('%',CONCAT(#{con},'%'))
+        </if>
+        <if test="userId!=null">
+            AND OO.OPTIONER_CODE LIKE CONCAT('%',CONCAT(#{userId},'%'))
+        </if>
+        ORDER BY OO.INSERT_TIME DESC
+        )
+
+        <where>
+            <if test="shipName != null">
+                and
+                <foreach collection="shipName" item="item" open="(" separator="or" close=")">
+                    "shipName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="purchaseOrderNo != null">
+                and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderNo != null">
+                and
+                <foreach collection="orderNo" item="item" open="(" separator="or" close=")">
+                    "orderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementNumber != null">
+                and
+                <foreach collection="requirementNumber" item="item" open="(" separator="or" close=")">
+                    "requirementNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName != null">
+                and
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "wareHouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierName != null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeName != null">
+                and
+                <foreach collection="consigneeName" item="item" open="(" separator="or" close=")">
+                    "consigneeName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+    </select>
+
+    <!--删除计重实绩id-->
+    <delete id="deleteWeightResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_WEIGHT_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+    <!-- 删除装车实绩   -->
+    <delete id="deleteLoadResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_LOAD_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+
+    <!--  删除出厂实绩-->
+    <delete id="deleteLeaveResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_LEAVE_FACTORY_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+
+    <!--删除卸货实绩-->
+    <delete id="deleteUnloadResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_UNLOAD_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+    <!--删除进厂实绩-->
+    <delete id="deleteEnResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_ENFACTORY_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+    <delete id="deleteTimeTaskByTotalId" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_TIME_TASK_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+    <!--根据订单id查询运输订单信息-->
+    <select id="selectOrderMap" resultType="java.util.Map" parameterType="DECIMAL">
+        select oo.order_plan_id "planId",
+               oo.capacity_id   "capacityId",
+               oo.order_type    "orderType",
+               oo.line_id       "lineId",
+               oom.material_id  "materialId"
+        from omstruck_order oo
+                 left join omstruck_order_material oom
+                           on oom.order_id = oo.order_id
+        where oo.order_id = #{orderId}
+    </select>
+
+    <!--  通过定向派单ID查询车序号表中的priceId  -->
+    <select id="getPriceIdByDispatchId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
+        select ASOM.PRICE_ID
+        from AMS_DISPATCH_SALE_ORDER ADSO
+                 left join AMS_SALE_ORDER_MATERIAL ASOM
+                           on ASOM.SALE_ORDER_MATERIAL_ID = ADSO.SALE_ORDER_MATERIAL_ID
+        where ADSO.DISPATCH_ID  = #{dispatchId}
+    </select>
+    <select id="getInwardOrderMessageToApp" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DISTINCT
+        OO.ORDER_ID            "orderId",
+        OO.ORDER_NUMBER        "orderNumber",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        RC.CAPACITY_NUMBER     "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        OO.ORDER_TYPE          "orderType",
+        OO.ORDER_STATUS        "orderStatus",
+        RS.SHIPPER_NAME        "shipperUnitName",
+        AIR.REQUIREMENT_ID     "requirementId",
+        AIR.DUE_DATE             "saleDateOfReceipt",
+        AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
+        AIR.INSERT_UPDATE_REMARK "insertUpdateRemark",
+        RW1.WAREHOUSE_NAME       "shipperName",
+        RW1.WAREHOUSE_NAME       "loadName",
+        RW.WAREHOUSE_NAME        "unloadName",
+        RW.WAREHOUSE_NAME        "consigneeCompanyName",
+        OO.DELETED              "deleted"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+        where oo.order_id = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+    <!-- 根据运输订单id查找需求日期 -->
+    <select id="selectInwardTimeByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        select AIR.DUE_DATE  "dueTime",
+               OO.ORDER_TYPE "orderType",
+               aip.PLAN_EABLE_STATUS "planEnableStatus"
+        from OMSTRUCK_ORDER OO
+                 left join AMSTRUCK_INWARD_PLAN AIP
+                           on AIP.PLAN_ID=OO.ORDER_PLAN_ID
+                 left join AMSTRUCK_REQUIREMENT_PLAN ARP
+                           on ARP.PLAN_ID=AIP.PLAN_ID
+                 left join AMSTRUCK_INWARD_REQUIREMENT AIR
+                           on AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
+        where OO.ORDER_ID=#{orderId}
+    </select>
+    <select id="getTimeTaskEndDetail" resultType="java.util.Map" parameterType="java.util.Map">
+        select RC.CAPACITY_NUMBER "capacityNumber",
+               OO.ORDER_NUMBER "orderNumber",
+               RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+               TTTR.INSERT_TIME "insertTime",
+               (
+                   SELECT TTTR2.RESULT_TIME
+                   FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                   WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                     AND TTTR2.RESULT_TIME_TYPE = 1
+               ) "startTime",
+               (
+                   SELECT TTTR2.RESULT_TIME
+                   FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                   WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                     AND TTTR2.RESULT_TIME_TYPE = 3
+               ) "endTime",
+               ( SELECT  CONCAT( TTTR.RESULT_VALUE, RUOM.UNIT_OF_MEASURE_NAME ) FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "resultTime",
+               RM.MATERIAL_NAME "materialName",
+               RS.SHIPPER_NAME "shipperUnitName",
+               RW.WAREHOUSE_NAME "unloadName",
+               RW2.WAREHOUSE_NAME "loadName"
+        from OMSTRUCK_ORDER OO
+                 LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+                           ON AIP.PLAN_ID=OO.ORDER_PLAN_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                           ON ARP.PLAN_ID=AIP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                           ON AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+                           ON ARM.REQUIREMENT_ID=AIR.REQUIREMENT_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON ARM.REQUIREMENT_UNLOAD_UNIT_ID =RW.WAREHOUSE_ID
+                 LEFT JOIN RMS_WAREHOUSE RW2
+                           ON RW2.WAREHOUSE_ID=ARM.REQUIREMENT_PLATFORM_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID=ARM.MATERIAL_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID=OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+                           ON  TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
+                           ON TTTR.RESULT_UOM_ID=RUOM.UNIT_OF_MEASURE_ID
+                 LEFT JOIN  RMS_CAPACITY RC
+                            ON RC.CAPACITY_ID=OO.CAPACITY_ID
+                 LEFT JOIN RMS_CAPACITY_TYPE RCT
+                           ON RCT.CAPACITY_TYPE_ID=RC.CAPACITY_TYPE_ID
+        where OO.ORDER_ID= #{orderId}  AND   TTTR.RESULT_VALUE IS NOT NULL and TTTR.RESULT_TIME_TYPE = 3
+    </select>
+    <select id="getInwardTimeOrderMessageToApp" resultType="java.util.Map">
+        SELECT DISTINCT
+        OO.ORDER_ID            "orderId",
+        OO.ORDER_NUMBER        "orderNumber",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        RC.CAPACITY_NUMBER     "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        OO.ORDER_TYPE          "orderType",
+        OO.ORDER_STATUS        "orderStatus",
+        RS.SHIPPER_NAME        "shipperUnitName",
+        AIR.REQUIREMENT_ID     "requirementId",
+        AIR.DUE_DATE             "saleDateOfReceipt",
+        AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
+        RW1.WAREHOUSE_NAME       "shipperName",
+        RW1.WAREHOUSE_NAME       "loadName",
+        RW.WAREHOUSE_NAME        "unloadName",
+        RW.WAREHOUSE_NAME        "consigneeCompanyName",
+        AIR.INSERT_UPDATE_REMARK "insertUpdateRemark",
+        (
+        SELECT TTTR2.RESULT_TIME
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+        WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        AND TTTR2.RESULT_TIME_TYPE = 1
+        ) "startTime",
+        (
+        SELECT TTTR2.RESULT_TIME
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+        WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        AND TTTR2.RESULT_TIME_TYPE = 3
+        ) "endTime",
+        (
+        SELECT TTTR2.RESULT_VALUE
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+        WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        AND TTTR2.RESULT_TIME_TYPE = 3
+        ) "totalTime",
+        (
+        SELECT TTTR2.RESULT_ABOUT_TIME
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+        WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        AND TTTR2.RESULT_TIME_TYPE = 3
+        ) "aboutTime"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID=OO.ORDER_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+
+        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+        ON TTTR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
+        ON RUOM.UNIT_OF_MEASURE_ID=TTTR.RESULT_UOM_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+        where oo.order_id = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+    <select id="getPauseTimeTaskDetail" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select  (
+                    SELECT TTTR2.RESULT_TIME
+                    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                      AND TTTR2.RESULT_TIME_TYPE = 1
+                ) "startTime",
+                (
+                    SELECT TTTR2.RESULT_TIME
+                    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                      AND TTTR2.RESULT_TIME_TYPE = 3
+                ) "endTime",
+                (
+                    SELECT TTTR2.RESULT_VALUE
+                    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                      AND TTTR2.RESULT_TIME_TYPE = 3
+                ) "totalTime",
+                (
+                    SELECT TTTR2.RESULT_VALUE
+                    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                      AND TTTR2.RESULT_TIME_TYPE = 7
+                ) "pauseTime"
+        from OMSTRUCK_ORDER OO
+                 left join TMSTRUCK_TOTAL_RESULT TTR
+                           ON OO.ORDER_ID=TTR.ORDER_ID
+                 LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+                           ON TTR.RESULT_TOTAL_ID =TTTR.RESULT_TOTAL_ID
+        WHERE  OO.ORDER_ID = #{orderId}
+    </select>
+
+    <select id="getInwardOrderMessage" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        OO.ORDER_ID "orderId",
+        ( SELECT TTTR2.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR2 WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR2.RESULT_TIME_TYPE = 1 ) "startTime",
+        ( SELECT TTTR3.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR3 WHERE TTTR3.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR3.RESULT_TIME_TYPE = 3 ) "endTime",
+        ( SELECT TTTR4.RESULT_VALUE FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "time",
+        ( SELECT  CONCAT( TTTR.RESULT_VALUE, RUOM.UNIT_OF_MEASURE_NAME ) FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "resultTime",
+        RM.MATERIAL_NAME "materialName"
+        FROM
+        OMSTRUCK_ORDER OO
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR ON TTR.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
+        WHERE
+        OO.ORDER_ID = #{orderId}
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+    <select id="getTimeTaskByTotalId" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        select COUNT(*)
+        from TMSTRUCK_TOTAL_RESULT TTR
+                 LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+                           ON TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
+        WHERE TTR.RESULT_TOTAL_ID=#{resultTotalId} and TTTR.RESULT_TIME_TYPE=1
+    </select>
+
+    <select id="getSteelOrderMessageToApp" parameterType="map" resultType="map">
+        SELECT
+        OO.ORDER_ID "orderId",
+        OO.ORDER_TYPE "orderType",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        OO.ORDER_NUMBER "orderNumber",
+        CASE
+        WHEN TEMP."orderId" IS NOT NULL
+        THEN RC.CAPACITY_NUMBER || '('|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':未轧' ||')'
+        WHEN TEMP."orderId" IS NULL
+        THEN RC.CAPACITY_NUMBER || '('|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':已轧' || ')'
+        END
+        "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        RS.SHIPPER_NAME "shipperName",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
+        CONCAT(CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ),RRP.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName",
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        OO.CAN_WORK "canWork",
+        OO.ORDER_STATUS "orderStatus",
+        ASO.SALE_ORDER_ID   "saleOrderId",
+        OO.DELETED  "orderDeleted",
+        OO.UPDATE_USERNAME "deleteReason",
+        OO.PRINTNUMBER "printNumber"
+        FROM
+        OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2 ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN (
+        select OO.ORDER_ID "orderId"
+        from OMSTRUCK_ORDER OO
+        left join OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID=OOM.ORDER_ID
+        left join RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
+        where OO.ORDER_STATUS between 4 and 5
+        and (OOM.MATERIAL_PRIORITY !=71 OR OOM.MATERIAL_PRIORITY is null)
+        and
+        RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+        ) TEMP ON TEMP."orderId"=OO.ORDER_ID
+        WHERE
+        OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+        <if test="status == 333">
+            AND OO.ORDER_STATUS in (4, 5)
+        </if>
+    </select>
+    <select id="getLoadForLoadCarResult" resultType="java.util.Map" parameterType="java.util.Map">
+        select *
+        from(select
+                 COUNT(RC.CAPACITY_NUMBER) "number",
+                 sum(TWR.RESULT_NET_WEIGHT) "netWeight",
+                 TLR.CAPACITY_REMARK "LoaderCapacityNumber"
+             from OMSTRUCK_ORDER OO
+                      LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                                ON TTR.ORDER_ID=OO.ORDER_ID
+                      LEFT JOIN RMS_CAPACITY RC
+                                ON RC.CAPACITY_ID=OO.CAPACITY_ID
+                      LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+                                ON TLR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                      LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                                ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+             where TLR.CAPACITY_REMARK IS NOT NULL and TLR.CAPACITY_REMARK=#{userName}
+               and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
+             GROUP BY TLR.CAPACITY_REMARK
+            )
+    </select>
+
+    <select id="getLineSeq" parameterType="DECIMAL" resultType="DECIMAL" >
+        SELECT OO.ORDER_LINE_SEQUENCE AS "orderLineSequence"
+        FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <select id="getCapacityNumberByCapacityId" parameterType="java.math.BigDecimal" resultType="java.lang.String">
+        select CAPACITY_NUMBER from RMS_CAPACITY  where CAPACITY_ID = #{capacityId}
+    </select>
+
+    <select id="getDriverInfoForSale2" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT DISTINCT OO.ORDER_NUMBER AS "orderNumber",
+        RCC.CAPACITY_NUMBER AS "capacityNumber",
+        TWR.RESULT_NET_WEIGHT AS "netWeight",
+        TWR.RESULT_TARE_WEIGHT AS "tareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME AS "tareTime",
+        TWR.RESULT_GROSS_WEIGHT_TIME AS "grossTime",
+        TWR.RESULT_GROSS_WEIGHT AS "grossWeight",
+        RTCT.TRUCK_CALCULATE_NUMBER AS "tareCalculate",
+        RTCG.TRUCK_CALCULATE_NUMBER AS "grossCalculate",
+        TER.RESULT_ENTRY_GATE_TIME AS "enGateTime",
+        TLFR.RESULT_OUT_GATE_TIME AS "outGateTime",
+        TLR.RESULT_LOAD_START_TIME AS "loadTime",
+        RWA.WAREHOUSE_NAME AS "warehouse",
+        RM.MATERIAL_NAME AS "materialName",
+        OOM.ORDER_MATERIAL_WEIGHT AS "materialWeight",
+        RGE.GATEPOST_NAME AS "enGatepost",
+        RGL.GATEPOST_NAME AS "outGatepost",
+        OO.ORDER_STATUS AS "orderStatus",
+        ASO.DELETED AS "deleted",
+        OO.ORDER_LINE_SEQUENCE AS "lineSequence",
+        oo.ORDER_ID "orderId"
+        FROM AMS_SALE_ORDER ASO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY RCC
+        ON RCC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTCT
+        ON RTCT.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTCG
+        ON RTCG.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_GATEPOST RGE
+        ON RGE.GATEPOST_ID = TER.GATEPOST_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_WAREHOUSE RWA
+        ON RWA.WAREHOUSE_ID = TLR.LOADING_ID
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_GATEPOST RGL
+        ON RGL.GATEPOST_ID = TLFR.GATEPOST_ID
+        LEFT JOIN TMSTRUCK_RECEIPT_RESULT TRR
+        ON TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
+        AND OO.ORDER_STATUS IS NOT NULL
+        AND OO.ORDER_TYPE IN (1,2)
+        <if test="con != null">
+            AND RCC.CAPACITY_NUMBER LIKE #{con}
+        </if>
+        ORDER BY OO.ORDER_NUMBER DESC
+    </select>
+
+    <select id="getTransportOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        select  OO.DRIVER_CONFIRMATION "loadName",
+                RC.CAPACITY_NUMBER   "capacityNumber",
+                OO.ORDER_NUMBER  "orderNumber",
+                OO.ORDER_RECEIVE_REFUSE_TIME "receiveTime"
+        from OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID=RC.CAPACITY_ID
+        where  OO.ORDER_ID=#{orderId} and OO.ORDER_STATUS = #{orderStatus}
+    </select>
+
+   <!-- 判断是否为达钢厂区内转-->
+    <select id="isInwardLine" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+     select RTR.TRANS_RANGE_VALUE "rangeValue"
+      from OMSTRUCK_ORDER OO
+     LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+     ON OO.ORDER_PLAN_ID =AIP.PLAN_ID
+     LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN  ARP
+     ON AIP.PLAN_ID =ARP.PLAN_ID
+     LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+     ON AIR.REQUIREMENT_ID =ARP.REQUIREMENT_ID
+     left join RMS_TRANS_RANGE RTR
+     ON AIR.LINE_ID = RTR.TRANS_RANGE_ID
+     WHERE  OO.ORDER_ID =#{orderId}
+    </select>
+
+    <select id="canCapacityEnfactory" parameterType="java.util.Map" resultType="java.lang.String">
+        SELECT * FROM (
+        SELECT
+        TER.INSERT_UPDATE_REMARK AS "isOk"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        <where>
+            <if test="orderId != null">
+                AND OO.ORDER_ID = #{orderId}
+            </if>
+            <if test="orderNumber != null">
+                AND OO.ORDER_NUMBER = #{orderNumber}
+            </if>
+        </where>)
+        WHERE ROWNUM = 1
+    </select>
+
+    <select id="getWarehouseMes" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT DISTINCT * FROM (
+        SELECT OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        OO.ORDER_ID "orderId",
+        WOR.RESULT_ID "outboudId",
+        WORM.RESULT_MATERIAL_ID "outboudMaterialId",
+        OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+        OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+        RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
+        TWR.RESULT_GROSS_WEIGHT "grossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "grossWeightTime",
+        TWR.RESULT_TARE_WEIGHT       "tareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME  "tareWeightTime",
+        TWR.RESULT_NET_WEIGHT        "netWeight",
+        TLR.RESULT_LOAD_END_TIME     "loadTime",
+        TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
+        TER.RESULT_ENTRY_GATE_TIME   "entryGateTime",
+        ASOM.SALE_ORDER_MATERIAL_ID  "saleOrderMaterialId",
+        ASOM.SALE_ORDER_ID          "saleOrderId"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND OOM.MATERIAL_ID = TWR.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND OOM.MATERIAL_ID = TLR.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN WMSP_OUTBOUND_RESULT WOR
+        ON WOR.BILL_LADING_ID = OO.ORDER_ID
+        LEFT JOIN WMSP_OUTBOUND_RESULT_MATERIAL WORM
+        ON WORM.OUTBOUND_RESULT_ID = WOR.RESULT_ID
+        AND WORM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE OO.ORDER_STATUS = 5
+        AND OO.ORDER_TYPE = 1
+        <if test="con != null">
+            and RC.CAPACITY_NUMBER || RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL LIKE #{con}
+        </if>
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OO.INSERT_TIME
+        </if>
+        )
+        ORDER BY "orderNumber" DESC
+    </select>
+    <select id="getInwardSteelOrderMessageToApp" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT
+        OO.ORDER_ID "orderId",
+        OO.ORDER_TYPE "orderType",
+        '车皮订单' "inwardType",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        RS.SHIPPER_NAME "shipperName",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        OO.ORDER_STATUS "orderStatus",
+        RAS.ARRIVAL_NAME "sendStaionName"
+        FROM
+        OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2 ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR  ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS  ON RAS.ARRIVAL_ID=TPAR.SEND_STATION_ID
+        WHERE
+        OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+        <if test="status == 333">
+            AND OO.ORDER_STATUS in (4, 5)
+        </if>
+    </select>
+
+    <update id="closeInwardOrderByPlan" parameterType="DECIMAL" >
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS = 7
+        WHERE OO.ORDER_PLAN_ID = #{planId}
+        AND OO.ORDER_STATUS = 4
+        AND OO.ORDER_TYPE = 11
+    </update>
+    <update id="updateTotalResultNull" parameterType="DECIMAL">
+        UPDATE TMSTRUCK_TOTAL_RESULT TTR
+        SET TTR.QUEUE_ALLOW_TIME = NULL,
+            TTR.ENFACTORY_TIME = NULL,
+            TTR.QUEUE_START_TIME = NULL,
+            TTR.ORDER_STATUS = '已派单'
+        WHERE TTR.RESULT_TOTAL_ID = #{resultTotalId}
+    </update>
+
+    <select id="getMulInwardOrderMessageToApp" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DISTINCT
+        OO.ORDER_ID            "orderId",
+        OO.ORDER_NUMBER        "orderNumber",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        RC.CAPACITY_NUMBER     "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        OO.ORDER_TYPE          "orderType",
+        OO.ORDER_STATUS        "orderStatus",
+        RS.SHIPPER_NAME        "shipperUnitName",
+        AIR.REQUIREMENT_ID     "requirementId",
+        AIR.DUE_DATE             "saleDateOfReceipt",
+        AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        where oo.order_id = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+
+    <select id="getMulInwardMaterials" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DISTINCT
+        RW1.WAREHOUSE_NAME       "shipperName",
+        RW1.WAREHOUSE_NAME || '（' || RM.MATERIAL_NAME  || '）'     "loadName",
+        RW.WAREHOUSE_NAME  || '（' || RM.MATERIAL_NAME  || '）'      "unloadName",
+        RW.WAREHOUSE_NAME        "consigneeCompanyName"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID=ARM.MATERIAL_ID
+        where oo.order_id = #{orderId}
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+    <select id="getInwardMaterialMes" resultType="java.util.Map" parameterType="decimal">
+        SELECT
+        RM.MATERIAL_NAME
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        when OOM.ORDER_MATERIAL_NUMBER is not null
+        then OOM.ORDER_MATERIAL_NUMBER || '件/支'
+        end
+        ) || (
+        case
+        when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then '-'||OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        end
+        )
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE ORDER_ID = #{orderId}
+        ORDER BY RM.MATERIAL_NAME
+    </select>
+    <select id="getGoBeyondCount" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        SELECT count(oo.order_id) FROM OMSTRUCK_ORDER OO
+        WHERE sysdate - oo.INSERT_TIME &lt;= 5
+        and oo.ORDER_ID = #{orderId}
+    </select>
+    <select id="getMaterialNumByOrderId" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        SELECT count(oom.ORDER_MATERIAL_ID) FROM  OMSTRUCK_ORDER_MATERIAL OOM
+        WHERE OOM.ORDER_ID = #{orderId}
+    </select>
+    <delete id="deleteQueueList">
+        delete from QMS_QUEUE_LIST QQL where CAPACITY_ID = #{capacityId}
+    </delete>
+    <delete id="deleteQueueResult">
+        delete from QMS_QUEUE_RESULT QQR WHERE QQR.RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+    <delete id="deleteQueueSpellList">
+        delete from QMS_QUEUE_SPELLING_LIST QQSL where QQSL.QUEUE_RESULT_ID =
+        (SELECT QQR.RESULT_ID FROM QMS_QUEUE_RESULT QQR WHERE QQR.RESULT_TOTAL_ID = #{resultTotalId})
+    </delete>
+    <select id="getOrderPrintDate" resultType="java.util.Date" parameterType="java.math.BigDecimal">
+        SELECT OO.PRINTDATE FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+    <select id="getPrintFlag" resultType="java.lang.String">
+        SELECT DILV.VERSION_VALUE FROM DIL_VERSION DILV
+        WHERE DILV.VERSION_ID = 7
+    </select>
+    <select id="materialMesNewContinue" resultType="java.util.Map">
+        SELECT
+        RM.MATERIAL_NAME
+        <if test="steelJudge != null">
+            || '   ' || RW.WAREHOUSE_NAME
+        </if>
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        when OOM.ORDER_MATERIAL_NUMBER is not null
+        then OOM.ORDER_MATERIAL_NUMBER || '件/支'
+        end
+        ) || (
+        case
+        when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then '-'||OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        end
+        ) ||  '-(八点前装的)'
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID  = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON twr.result_total_id = ttr.result_total_id
+        and oom.material_id = twr.material_id
+        or oom.sale_material_id is not null and oom.sale_material_id = twr.sale_material_id
+        <if test="steelJudge != null">
+            LEFT JOIN RMS_WAREHOUSE RW
+            ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+        </if>
+        WHERE
+        OO.ORDER_STATUS = 2
+        and twr.result_net_weight is not null
+        and  OO.order_ID  = #{orderId}
+        ORDER BY RM.MATERIAL_NAME
+    </select>
+    <select id="selectContinueOrderId" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
+        SELECT OO.ORDER_ID FROM OMSTRUCK_ORDER OO
+        WHERE
+        OO.ORDER_STATUS = 2
+        AND OO.ORDER_NUMBER = (SELECT OO.ORDER_NUMBER FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId})
+    </select>
+    <update id="clsoePlanByPlan">
+        UPDATE AMSTRUCK_INWARD_PLAN AIP
+        SET AIP.PLAN_STATUS = 4
+        WHERE AIP.PLAN_ID = #{bigDecimal}
+    </update>
+</mapper>

src/main/resources/com/steerinfo/dil/mapper/RmsReceivingCompanyMapper.xml

@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.RmsReceivingCompanyMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsReceivingCompany">
+        <id column="COMPANY_ID" javaType="DECIMAL" property="companyId"/>
+        <result column="COMPANY_CODE" jdbcType="VARCHAR" property="companyCode" />
+        <result column="COMPANY_NAME" jdbcType="VARCHAR" property="companyName" />
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    </resultMap>
+    <sql id="columns">
+        t.COMPANY_ID, t.COMPANY_CODE, t.COMPANY_NAME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
+            t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+    </sql>
+    <sql id="select">
+        SELECT <include refid="columns" /> FROM rms_receiving_company t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="companyId != null">
+                and t.COMPANY_ID = #{companyId}
+            </if>
+            <if test="companyCode != null and companyCode != ''">
+                and t.COMPANY_CODE = #{companyCode}
+            </if>
+            <if test="companyName != null and companyName != ''">
+                and t.COMPANY_NAME = #{companyName}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and t.INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and t.INSERT_TIME = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and t.UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and t.UPDATE_TIME = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and t.INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete from rms_receiving_company
+        where COMPANY_ID = #{companyId, jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from rms_receiving_company
+        where 1 != 1
+        <if test="companyId != null and companyId != ''">
+            or COMPANY_ID = #{companyId}
+        </if>
+        <if test="companyCode != null and companyCode != ''">
+            or COMPANY_CODE = #{companyCode}
+        </if>
+        <if test="companyName != null and companyName != ''">
+            or COMPANY_NAME = #{companyName}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.RmsReceivingCompany">
+        insert into rms_receiving_company
+            (
+                COMPANY_ID,
+                COMPANY_CODE,
+                COMPANY_NAME,
+                INSERT_USERNAME,
+                INSERT_TIME,
+                UPDATE_USERNAME,
+                UPDATE_TIME,
+                INSERT_UPDATE_REMARK
+             )
+        values
+            (
+                #{companyId, jdbcType=DECIMAL},
+                #{companyCode, jdbcType=VARCHAR},
+                #{companyName, jdbcType=VARCHAR},
+                #{insertUsername, jdbcType=VARCHAR},
+                #{insertTime, jdbcType=TIMESTAMP},
+                #{updateUsername, jdbcType=VARCHAR},
+                #{updateTime, jdbcType=TIMESTAMP},
+                #{insertUpdateRemark, jdbcType=VARCHAR}
+             )
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsReceivingCompany">
+        insert into rms_receiving_company
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="companyId != null">
+                COMPANY_ID,
+            </if>
+            <if test="companyCode != null">
+                COMPANY_CODE,
+            </if>
+            <if test="companyName != null">
+                COMPANY_NAME,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="companyId != null">
+                #{companyId, jdbcType=DECIMAL},
+            </if>
+            <if test="companyCode != null">
+                #{companyCode, jdbcType=VARCHAR},
+            </if>
+            <if test="companyName != null">
+                #{companyName, jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername, jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime, jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername, jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime, jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark, jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsReceivingCompany">
+        update rms_receiving_company set
+            COMPANY_CODE = #{companyCode, jdbcType=VARCHAR},
+            COMPANY_NAME = #{companyName, jdbcType=VARCHAR},
+            INSERT_USERNAME = #{insertUsername, jdbcType=VARCHAR},
+            INSERT_TIME = #{insertTime, jdbcType=TIMESTAMP},
+            UPDATE_USERNAME = #{updateUsername, jdbcType=VARCHAR},
+            UPDATE_TIME = #{updateTime, jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK = #{insertUpdateRemark, jdbcType=VARCHAR}
+        where
+            COMPANY_ID = #{companyId, jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsReceivingCompany">
+        update rms_receiving_company
+        <set>
+            <if test="companyCode != null">
+                COMPANY_CODE = #{companyCode, jdbcType=VARCHAR},
+            </if>
+            <if test="companyName != null">
+                COMPANY_NAME = #{companyName, jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername, jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime, jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername, jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime, jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark, jdbcType=VARCHAR},
+            </if>
+        </set>
+        where COMPANY_ID = #{companyId, jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select" />
+        where COMPANY_ID = #{companyId, jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select" />
+        <include refid="where" />
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select" />
+        <include refid="where" />
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into rms_receiving_company
+        (
+            COMPANY_ID,
+            COMPANY_CODE,
+            COMPANY_NAME,
+            INSERT_USERNAME,
+            INSERT_TIME,
+            UPDATE_USERNAME,
+            UPDATE_TIME,
+            INSERT_UPDATE_REMARK
+        )
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+            #{companyId, jdbcType=DECIMAL},
+            #{companyCode, jdbcType=VARCHAR},
+            #{companyName, jdbcType=VARCHAR},
+            #{insertUsername, jdbcType=VARCHAR},
+            #{insertTime, jdbcType=TIMESTAMP},
+            #{updateUsername, jdbcType=VARCHAR},
+            #{updateTime, jdbcType=TIMESTAMP},
+            #{insertUpdateRemark, jdbcType=VARCHAR}
+        from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from rms_receiving_company
+        where COMPANY_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="selectAll" resultMap="BaseResultMap">
+        <include refid="select" />
+    </select>
+</mapper>

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -0,0 +1,1677 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.UniversalMapper">
+    <update id="updateLineSqe" parameterType="java.util.Map">
+        update omstruck_order oo
+        set oo.order_line_sequence = #{orderLineSqe}
+        where oo.order_id = #{orderId}
+    </update>
+    <update id="updateSaleOrderStatusById">
+        update AMS_SALE_ORDER ASO
+        SET ASO.SALE_ORDER_STATUS = 0
+        WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
+    </update>
+    <select id="getTiHuoDan" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_NUMBER             "orderNumber",
+               RC.CAPACITY_NUMBER          "capacityNumber",
+               RCA.CARRIER_NAME            "carrierName",
+               RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+
+        from OMSTRUCK_ORDER OO
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join RMS_CARRIER RCA
+                           on RCA.CARRIER_ID = RC.CARRIER_ID
+                 left join AMS_SALE_ORDER ASO
+                           on ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
+                 left join RMS_CONSIGNEE RCON
+                           on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
+        where OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+<!--    <select id="selectHuanPiaoDan">-->
+
+<!--    </select>-->
+
+    <!--  查询订单子表关联的  -->
+    <select id="getOOMMes" parameterType="string" resultType="java.util.Map">
+        select RM.MATERIAL_NAME  "materialName",
+               RPP.PLATFORM_NAME "platformName",
+               RP.PERSONNEL_NAME "personnelName",
+               (
+                   select ORDER_MATERIAL_NUMBER
+                   from OMSTRUCK_ORDER_MATERIAL OOM
+                   where OOM.ORDER_ID = OO.ORDER_ID
+                     and TLR.MATERIAL_ID = OOM.MATERIAL_ID
+               )                 "orderMaterialNumber"
+        from OMSTRUCK_ORDER OO
+                 left join TMSTRUCK_TOTAL_RESULT TTR
+                           on TTR.ORDER_ID = OO.ORDER_ID
+                 left join TMSTRUCK_LOAD_RESULT TLR
+                           on TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
+                 left join RMS_PWAREHOUSE_PLATFORM RPP
+                           on RPP.PLATFORM_ID = TLR.LOADING_ID
+                 left join RMS_MATERIAL RM
+                           on RM.MATERIAL_ID = TLR.MATERIAL_ID
+                 left join RMS_PERSONNEL RP
+                           on RP.PERSONNEL_ID = TLR.LOADER_ID
+        where ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <sql id="orderBy">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+    </sql>
+
+    <!--  模糊查询所有物资  -->
+    <select id="queryAPOMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+                SELECT RM.MATERIAL_ID "materialId",
+                    RM.MATERIAL_NAME "materialName",
+                    RM.MATERIAL_CODE "materialCode",
+                    RM.MATERIAL_SPECIFICATION "materialSpecification",
+                    RM.MATERIAL_MODEL "materialModel"
+                FROM AMS_PURCHASE_ORDER APO
+                    JOIN DIL_BATCH DB
+                        ON DB.BATCH_ID = APO.BATCH_ID
+                    JOIN RMS_MATERIAL RM
+                        ON RM.MATERIAL_ID = DB.MATERIAL_ID
+                where APO.DELETED = 0
+                    <if test="supplierId != null">
+                        and APO.SUPPLIER_UNIT_ID = #{supplierId}
+                    </if>
+                    <if test="index != null">
+                        and (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
+                    </if>
+
+                 group by RM.MATERIAL_ID,RM.MATERIAL_NAME,RM.MATERIAL_CODE,RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL
+        )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                 "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialSpecification != null">
+                and
+                <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+                    "materialSpecification" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialModel != null">
+                and
+                <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+                    "materialModel" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+    <!--    模糊查询发货单位 -->
+    <select id="querySupplierByLike" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RS.SUPPLIER_ID "supplierId",
+        RS.SUPPLIER_NAME "supplierName",
+        RS.SUPPLIER_ADDRESS "supplierAddress"
+        FROM RMS_SUPPLIER RS
+        <where>
+            <if test="index != null">
+                RS.SUPPLIER_NAME LIKE #{index}
+            </if>
+        </where>
+        )
+        <where>
+            <if test="supplierName != null">
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierAddress != null">
+                and
+                <foreach collection="supplierAddress" item="item" open="(" separator="or" close=")">
+                    "supplierAddress" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "supplierId" desc
+        </if>
+    </select>
+
+    <!--  获取所有的运力信息 -->
+    <select id="getAllCapacityByCarrierLike" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+        SELECT *
+        FROM (
+        SELECT
+        RC.CAPACITY_ID "capacityId",
+        RCC.CARRIER_ID "carrierId",
+        RCC.CAPACITY_CARRIER_ID,
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RCA.CARRIER_NAME "carrierName",
+        RCC.INSERT_UPDATE_REMARK "remark"
+        FROM
+        RMS_CAPACITY_CARRIER RCC
+        LEFT JOIN RMS_CAPACITY RC ON RCC.CAPACITY_ID = RC.CAPACITY_ID
+        JOIN RMS_CARRIER RCA ON RCA.CARRIER_ID = RCC.CARRIER_ID
+        WHERE RC.CAPACITY_SSO_ID is not NULL
+              AND RCC.DELETED = 0
+            <if test="carrierId != null" >
+                and RCC.CARRIER_ID = #{carrierId}
+            </if>
+            <if test="index != null">
+                and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0 or  instr(RC.INSERT_UPDATE_REMARK, #{index})>0)
+            </if>
+            <if test="con != null">
+                and instr(RCC.INSERT_UPDATE_REMARK, #{con}) > 0
+            </if>
+            <if test="indexText!=null">
+                and instr(RCC.CAPACITY_USER_DEP, #{indexText}) > 0
+            </if>
+        )
+        <where>
+            <if test="capacityNumber != null">
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="remark != null">
+                and
+                <foreach collection="remark" item="item" open="(" separator="or" close=")">
+                    "remark" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "capacityNumber"
+        </if>
+    </select>
+
+    <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="DECIMAL" >
+        SELECT
+            RC.CARRIER_ID AS "carrierId"
+        FROM RMS_CARRIER RC
+        WHERE RC.CARRIER_SSO_ID = #{carrierSsoId}
+    </select>
+
+<!--    通过订单ID查询物资子表信息  -->
+    <select id="getMaterialMesByOrderId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select RM.MATERIAL_NAME               "materialName",
+                        RM.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
+                        RM.MATERIAL_SPECIFICATION       "materialSpecification",
+                        RM.MATERIAL_MODEL               "materialModel",
+                        OOM.ORDER_MATERIAL_NUMBER      "orderMaterialNumber"
+
+                 from OMSTRUCK_ORDER_MATERIAL OOM
+                          left join RMS_MATERIAL RM
+                                    ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                 <where>
+                     <if test="orderId != null" >
+                         OOM.ORDER_ID = #{orderId}
+                     </if>
+                 </where>
+             )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialTheoreticalWeight != null">
+            and
+                <foreach collection="materialTheoreticalWeight" item="item" open="(" separator="or" close=")">
+                    "materialTheoreticalWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialNumber != null">
+                and
+                <foreach collection="orderMaterialNumber" item="item" open="(" separator="or" close=")">
+                    "orderMaterialNumber" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialName" desc
+        </if>
+    </select>
+    <!--查询所有物资-->
+    <select id="selectAllMaterialName" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT * FROM (
+        select distinct RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        RM.MATERIAL_CODE "materialCode",
+        RM.MATERIAL_ID AS "materialId"
+        from RMS_MATERIAL RM
+        WHERE RM.DELETED = 0
+        <if test="index != null">
+            AND instr(RM.MATERIAL_NAME, #{index}) > 0
+        </if>
+        )
+        <where>
+        <if test="materialName != null">
+        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+            "materialName" like '%${item}%'
+        </foreach>
+            </if>
+                <if test="materialSpecification != null">
+                    and
+                <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+                    "materialSpecification" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialModel != null">
+                and
+                <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+                    "materialModel" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
+<!--  通过物资ID查询该物资的发货单位信息  -->
+    <select id="getSupplierMesByMaterialId" parameterType="java.util.Map" resultType="java.util.Map">
+        select *
+        from (
+                 select distinct RS.SUPPLIER_ID      "supplierId",
+                                 RS.SUPPLIER_NAME    "supplierName",
+                                 RS.SUPPLIER_ADDRESS "supplierAddress"
+                 from DIL_BATCH DB
+                          join AMS_PURCHASE_ORDER APO
+                                    on apo.BATCH_ID = DB.BATCH_ID
+                          join RMS_SUPPLIER RS
+                                    on RS.SUPPLIER_ID = apo.SUPPLIER_UNIT_ID
+                    where APO.DELETED = 0
+                    <if test="materialId != null">
+                      and  DB.MATERIAL_ID = #{materialId}
+                    </if>
+             )
+        <where>
+            <if test="index != null">
+                "supplierName" like #{index}
+            </if>
+        </where>
+    </select>
+
+<!--  模糊查询所有的卸货点信息  -->
+    <select id="getUnloadingMesByLike" parameterType="map" resultType="java.util.Map">
+
+        select *
+        from (
+                 select
+                        RW.WAREHOUSE_ID   "warehouseId",
+                        RW.WAREHOUSE_NAME "warehouseName"
+                 from RMS_WAREHOUSE RW
+                 where DELETED=0
+                     <if test="type != null">
+                      and   RW.WAREHOUSE_TYPE_ID = #{type}
+                     </if>
+                     <if test="index != null">
+                      and   instr(RW.WAREHOUSE_NAME, #{index}) > 0
+                     </if>
+             )
+        <where>
+            <if test="warehouseName != null">
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "warehouseName" desc
+        </if>
+    </select>
+
+    <!--  模糊查询所有物资  -->
+    <select id="queryMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_CODE "materialCode",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel"
+        FROM RMS_MATERIAL RM WHERE  RM.DELETED = 0
+        <if test="index != null">
+            AND (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
+        </if>
+        )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialSpecification != null">
+                and
+                <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+                    "materialSpecification" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialModel != null">
+                and
+                <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+                    "materialModel" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialId" desc
+        </if>
+    </select>
+
+<!--  查询所有的批次及其关联的采购订单号  -->
+    <select id="getBatchAndOrderMes" parameterType="map" resultType="java.util.Map">
+        select *
+        from (
+                 select
+                        DB.BATCH_ID                 "batchId",
+                        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+                        RM.MATERIAL_NAME            "materialName",
+                        APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
+                        APO.INSERT_TIME             "insetTime",
+                        APO.PURCHASE_ORDER_ID        "purchaseOrderId"
+                 from DIL_BATCH DB
+                          left join AMS_PURCHASE_ORDER APO
+                                    on APO.BATCH_ID = DB.BATCH_ID
+                          left join RMS_MATERIAL RM
+                                    on RM.MATERIAL_ID = DB.MATERIAL_ID
+                 <where>
+                     <if test="index != null">
+                         instr(DB.RESULT_FOREIGN_SHIP_NAME, #{index}) > 0
+                     </if>
+                 </where>
+             )
+        <where>
+            <if test="resultForeignShipName != null">
+                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
+                    "resultForeignShipName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="purchaseOrderNo != null">
+                and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "insetTime" desc
+        </if>
+    </select>
+
+    <!-- 边输边查承运商   -->
+    <select id="getCarrierMesByLike" parameterType="string" resultType="java.util.Map">
+        select
+            RC.CARRIER_ID "carrierId",
+            RC.CARRIER_NAME "value",
+            RC.CARRIER_NAME "carrierName",
+            RC.CARRIER_ABBREVIATION "value1"
+        from RMS_CARRIER RC
+        where
+            instr(RC.CARRIER_NAME, #{index}) > 0 and rownum &lt; 10
+        order by "value"
+    </select>
+
+
+<!--  边输边查发货单位  -->
+    <select id="getSupplierMesByLike" parameterType="string" resultType="java.util.Map">
+        select
+            RS.SUPPLIER_ID "supplierId",
+            RS.SUPPLIER_NAME "value",
+            RS.SUPPLIER_NAME "supplierName"
+        from RMS_SUPPLIER RS
+        where instr(RS.SUPPLIER_NAME, #{index}) > 0 and rownum &lt; 10
+        order by "value"
+    </select>
+    <!--  获取承运商下拉框,并且判断ssoId是否为空，如果ssoId不为空就展示  -->
+    <select id="getAllCarrierIdForSso" resultType="java.util.LinkedHashMap">
+        select RC.CARRIER_ID "carrierId",
+               RC.CARRIER_NAME "carrierName"
+        from RMS_CARRIER RC
+         where RC.CARRIER_SSO_ID is not null
+    </select>
+   <!--  根据承运商id获取ssoId  -->
+    <select id="getUserIdbyCarrierId" parameterType="java.math.BigDecimal" resultType="java.lang.String">
+     select RC.CARRIER_SSO_ID "carrierSsoId"
+     from RMS_CARRIER RC
+     where RC.CARRIER_ID=#{carrierId}
+    </select>
+    <!--  边输边查收货单位 -->
+    <select id="getConsigneeByLike" parameterType="string" resultType="java.util.Map">
+        select
+        RC.CONSIGNEE_ID "consigneeId",
+        RC.CONSIGNEE_COMPANY_NAME "value",
+        RC.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        from  RMS_CONSIGNEE RC
+        where instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum &lt; 10
+        order by "value"
+    </select>
+    <select id="getCarrierListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
+        select
+        *
+        from(
+        select
+        RC.CARRIER_ID "carrierId",
+        RC.CARRIER_NAME "carrierName"
+        from RMS_CARRIER RC
+        <where>
+            <if test="index != null">
+                RC.CARRIER_NAME  like #{index}
+            </if>
+        </where>
+        order by RC.CARRIER_NAME
+        )
+    </select>
+
+    <select id="queryConsigneeByLike" resultType="java.util.Map" parameterType="java.util.Map" >
+        SELECT
+               *
+        FROM (
+        SELECT
+        RCO.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
+        RCO.CONSIGNEE_CODE AS "consigneeCode",
+        RCO.CONSIGNEE_ID AS "consigneeId"
+        FROM RMS_CONSIGNEE RCO
+        <where>
+            <if test="index != null">
+                instr(RCO.CONSIGNEE_COMPANY_NAME, #{index}) > 0
+            </if>
+        </where>
+        )
+        <where>
+            <if test="consigneeCompanyName != null">
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCode != null">
+                and
+                <foreach collection="consigneeCode" item="item" open="(" separator="or" close=")">
+                    "consigneeCode" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="getConsigneeHistory" resultType="java.util.Map">
+        SELECT distinct
+        RC.CONSIGNEE_ID "consigneeId",
+        RC.CONSIGNEE_COMPANY_NAME "value",
+        RC.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        FROM  AMS_SALE_ORDER ASO
+        LEFT JOIN RMS_CONSIGNEE RC
+        ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+        WHERE ASO.SALE_TYPE=4 and RC.CONSIGNEE_COMPANY_NAME is not null
+    </select>
+
+<!--  通过订单ID查询订单下所有物资  -->
+    <select id="getOrderMaterialMesByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        select RM.MATERIAL_NAME     "materialName",
+               CONCAT(RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL)     "materialModel",
+               (case
+                   when OOM.ORDER_MATERIAL_WEIGHT is not null
+                        then OOM.ORDER_MATERIAL_WEIGHT
+                   else OOM.ORDER_MATERIAL_NUMBER
+               end) "weightNum"
+        from OMSTRUCK_ORDER_MATERIAL OOM
+            left join RMS_MATERIAL  RM
+            on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        where OOM.ORDER_ID = #{orderId}
+    </select>
+
+<!--  边输边查卸货点  -->
+    <select id="selectUnloadingPoint" parameterType="string" resultType="java.util.Map">
+        select RW.WAREHOUSE_NAME "warehouseName",
+               RW.WAREHOUSE_ID "warehouseId",
+        RW.WAREHOUSE_NAME "value"
+        from RMS_WAREHOUSE RW
+        where RW.DELETED = 0
+        <if test="index1 != null">
+            and RW.WAREHOUSE_NAME LIKE #{index}
+        </if>
+        order by "warehouseName"
+    </select>
+
+    <select id="getAllGatepost" resultType="java.util.Map" >
+        SELECT
+            RG.GATEPOST_ID AS "gatepostId",
+            RG.GATEPOST_NAME AS "gatepostName"
+        FROM RMS_GATEPOST RG
+    </select>
+
+    <!-- 模糊查询收货单位 -->
+    <select id="getConsigneeListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT
+        RC.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName"
+        FROM RMS_CONSIGNEE RC
+        WHERE
+        <if test="index != null">
+            RC.CONSIGNEE_COMPANY_NAME like #{index}
+        </if>
+        order by "consigneeCompanyName"
+    </select>
+
+    <select id="queryAllSupplierByLike" resultType="java.util.Map">
+        select *
+        from (
+        select distinct RS.SUPPLIER_ID      "supplierId",
+        RS.SUPPLIER_NAME    "supplierName",
+        RS.SUPPLIER_ADDRESS "supplierAddress"
+        from RMS_SUPPLIER RS
+        )
+        <where>
+            <if test="index != null">
+                "supplierName" like #{index}
+            </if>
+        </where>
+    </select>
+
+    <select id="getSaleOrderStatus" parameterType="DECIMAL" resultType="java.lang.Integer">
+        SELECT ASO.SALE_ORDER_STATUS AS "saleOrderStatus"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+<!--  通过运输订单号查询订单类型和ID  -->
+    <select id="getOrderMesByOrderNumber" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_ID "orderId",
+               OO.ORDER_TYPE "orderType"
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+<!--   查询所有的汽车衡  -->
+    <select id="getAllCalculateMes" resultType="java.util.Map">
+        select
+            RTC.TRUCK_CALCULATE_ID "id",
+            RTC.TRUCK_CALCULATE_ID "value",
+            RTC.TRUCK_CALCULATE_NUMBER "label"
+        from
+            RMS_TRUCK_CALCULATE RTC
+    </select>
+
+    <select id="getAllMaterialCoke" resultType="java.util.Map">
+        SELECT RMC.MATERIAL_COKE_ID   "id",
+               RMC.MATERIAL_COKE_NAME "label"
+        FROM RMS_MATERIAL_COKE RMC
+    </select>
+    <select id="getRequireUnitName" resultType="java.util.Map">
+        SELECT
+	    RS.SHIPPER_ID "shipperId",
+	    RS.SHIPPER_NAME "shipperName"
+        FROM
+	    RMS_SHIPPER RS
+        <where>
+            <if test="index != null">
+                RS.SHIPPER_NAME like #{index}
+            </if>
+        </where>
+    </select>
+
+    <!--  边输边查车牌号  -->
+    <select id="getCapacityByLike" parameterType="string" resultType="java.util.Map">
+        select
+            RC.CAPACITY_ID "capacityId",
+            RC.CAPACITY_NUMBER "value",
+            RC.CAPACITY_NUMBER "capacityNumber"
+        from RMS_CAPACITY RC
+        where instr(RC.CAPACITY_NUMBER, #{index}) > 0
+        order by "value"
+    </select>
+
+    <select id="getCarrierByCapacityId" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RC.CARRIER_ID   AS "id",
+               RC.CARRIER_ID   AS "value",
+               RC.CARRIER_NAME AS "label"
+        FROM RMS_CAPACITY_CARRIER RCC
+                 LEFT JOIN RMS_CARRIER RC
+                           ON RC.CARRIER_ID = RCC.CARRIER_ID
+        WHERE RCC.CAPACITY_ID = #{capacityId}
+    </select>
+
+    <select id="getCarrierByConsignee" parameterType="String" resultType="java.util.Map">
+        SELECT RC.CARRIER_ID   AS "carrierId",
+               RC.CARRIER_NAME AS "carrierName"
+        FROM RMS_CARRIER RC
+        WHERE RC.CARRIER_NAME = #{consigneeName}
+    </select>
+
+    <select id="isInCapacityCarrier" parameterType="java.util.Map" resultType="DECIMAL">
+        SELECT RCC.CAPACITY_CARRIER_ID AS "capacityCarrierId"
+        FROM RMS_CAPACITY RCA
+                 LEFT JOIN RMS_CAPACITY_CARRIER RCC
+                           ON RCC.CAPACITY_ID = RCA.CAPACITY_ID
+        WHERE RCA.CAPACITY_NUMBER = #{capacityNumber}
+          <if test="carrierId != null" >
+              AND RCC.CARRIER_ID = #{carrierId}
+          </if>
+        AND rownum = 1
+    </select>
+
+    <select id="isInCapacity" parameterType="java.util.Map" resultType="DECIMAL">
+        SELECT RC.CAPACITY_ID AS "capacityId"
+        FROM RMS_CAPACITY RC
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+    </select>
+
+    <select id="getOilFormula" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT BF.FORMULA_ID     AS "formulaId",
+               BF.FORMULA_NAME   AS "formulaName",
+               BF.FORMULA_STRING AS "formulaString"
+        FROM BMSTRUCK_FORMULA BF
+        <where>
+            <if test="con !=null and con!=''.toString()">
+                FORMULA_NAME LIKE  concat('%',concat(#{con},'%'))
+            </if>
+        </where>
+    </select>
+
+    <select id="getBatchByLike" parameterType="string" resultType="java.util.Map">
+        select *
+        from (
+                 select 		DB.BATCH_ID       "batchId",
+                               DB.RESULT_FOREIGN_SHIP_NAME      "foreignShipName",
+                               CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME) "value"
+                 from DIL_BATCH DB
+                          left join RMS_MATERIAL RM
+                                    on RM.MATERIAL_ID = DB.MATERIAL_ID
+                          join AMS_PURCHASE_ORDER APO
+                               on APO.BATCH_ID = DB.BATCH_ID
+                 where DB.RESULT_FOREIGN_SHIP_NAME is not null
+             )
+        where instr("value", #{index}) > 0
+
+    </select>
+
+    <select id="getPortId" resultType="java.util.Map">
+        SELECT rp.PORT_ID   "id",
+               rp.PORT_ID   "value",
+               rp.PORT_NAME "label"
+        FROM RMS_PORT rp
+    </select>
+
+
+    <select id="getOrderNumber" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_NUMBER  "orderNumber",
+               OO.ORDER_ID      "orderId"
+        from OMSTRUCK_ORDER OO
+        left join RMS_CAPACITY RC
+            ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        where OO.CAPACITY_ID = #{capacityId} and OO.ORDER_STATUS = 5
+    </select>
+
+    <select id="getCapacityNumber" parameterType="string" resultType="java.util.Map">
+        select RC.CAPACITY_NUMBER "capacityNumber",
+               RC.CAPACITY_ID   "capacityId"
+        from RMS_CAPACITY RC
+        where instr(RC.CAPACITY_NUMBER, #{num}) > 0
+    </select>
+
+    <select id="getMaterialIdByOrderId" resultType="java.util.Map">
+        select OOM.MATERIAL_ID "materialId",
+              CONCAT(CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION),RM.MATERIAL_MODEL) "materialName",
+               RM.MATERIAL_NAME "good",
+               RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "goodspa"
+        from OMSTRUCK_ORDER_MATERIAL  OOM
+            left join RMS_MATERIAL RM
+                on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        where OOM.ORDER_ID = #{orderId}
+    </select>
+
+
+    <select id="getMaterialByLike" parameterType="string" resultType="java.util.Map">
+        select *
+        from (
+                 select RM.MATERIAL_ID   "materialId",
+                        CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION) || RM.MATERIAL_MODEL "value",
+                        CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION) || RM.MATERIAL_MODEL "materialName"
+                 from RMS_MATERIAL RM
+                 where instr(RM.MATERIAL_NAME, #{index}) > 0
+             )
+        where rownum &lt; 10
+    </select>
+
+    <select id="getRmsCarrierByCarrierSsoId" resultType="java.util.Map">
+        select r_carrier.CARRIER_NAME "carrierName", r_carrier.CARRIER_ID "carrierId"
+        from RMS_CARRIER r_carrier
+        where r_carrier.CARRIER_SSO_ID = #{carrierSsoId}
+    </select>
+
+    <select id="getCapacityType" resultType="java.util.Map" parameterType="java.util.Map">
+        select RCT.CAPACITY_TYPE_ID "capacityTypeId",
+                RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+                RCT.WHETHER_CAR "whether"
+        from RMS_CAPACITY_TYPE RCT
+        where RCT.DELETED=0
+        <if test="index!=null and index!=''">
+            and instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
+        </if>
+    </select>
+
+
+    <select id="getWarranty" resultType="java.util.Map" parameterType="java.lang.String">
+        select oo "warrantyCode"
+        from OMSTRUCK_ORDER oo
+        left join OMSTRUCK_ORDER_MATERIAL oom
+        on oom.ORDER_ID = oo.ORDER_ID
+        where oo.ORDER_NUMBER = #{orderNumber}
+    </select>
+    <select id="getPlanCount" resultType="java.lang.Integer">
+        SELECT
+            COUNT( * )
+        FROM
+            ( SELECT AIR2.REQUIREMENT_ID FROM AMSTRUCK_INWARD_REQUIREMENT AIR2 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON AIR2.REQUIREMENT_ID = ARP.REQUIREMENT_ID WHERE ARP.PLAN_ID IS NULL ) AIRP
+                LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = AIRP.REQUIREMENT_ID
+        WHERE
+            AIR.REQUIREMENT_STATUS = 2
+          AND AIR.DELETED = 0
+    </select>
+    <select id="getTransRange" resultType="java.util.Map">
+        SELECT
+        RTR.TRANS_RANGE_ID "value",
+        RTR.TRANS_RANGE_VALUE "label",
+        RTR.TRANS_RANGE_ID  "id"
+        FROM
+        RMS_TRANS_RANGE RTR
+    </select>
+
+    <select id="getResultMaterialId" resultType="DECIMAL" parameterType="DECIMAL">
+    select worm.RESULT_MATERIAL_ID from WMSP_OUTBOUND_RESULT_MATERIAL worm
+    where worm.OUTBOUND_RESULT_ID = #{resultId} and worm.STATUS=2
+  </select>
+
+    <select id="selectOutbound" parameterType="java.lang.String" resultType="java.util.Map">
+            select distinct
+            substr(rm.MATERIAL_SPECIFICATION,2) "size",
+            rm.MATERIAL_MODEL "brand",
+            rms.MATERIAL_FURNACE_NUMBER "heatNum"
+            from OMSTRUCK_ORDER oo
+            left join WMSP_OUTBOUND_RESULT wor
+            on wor.BILL_LADING_ID = oo.ORDER_ID
+            left join WMSP_OUTBOUND_RESULT_MATERIAL worm
+            on worm.OUTBOUND_RESULT_ID = wor.RESULT_ID
+            left join RMS_MATERIAL rm
+            on rm.MATERIAL_ID = worm.MATERIAL_ID
+            left join WMSP_OUTBOUND_SCAN_RESULT wosr
+            on wosr.RESULT_MATERIAL_ID = worm.RESULT_MATERIAL_ID
+            left join WMSP_INBOUND_SCAN_RESULT wisr
+            on wisr.RESULT_MATERIAL = wosr.RESULT_MATERIAL
+            left join RMS_MATERIAL_STEEL rms
+            on rms.MATERIAL_STEEL_ID = wisr.MATERIAL_ID
+        where oo.ORDER_NUMBER= #{orderNumber}
+    </select>
+
+    <select id="selectNum" parameterType="java.lang.String" resultType="java.util.Map">
+        select distinct
+        rc.CAPACITY_NUMBER "carNum",
+        oo.ORDER_NUMBER "driveNo"
+        from OMSTRUCK_ORDER oo
+        left join RMS_CAPACITY rc
+        on rc.CAPACITY_ID = oo.CAPACITY_ID
+        where oo.ORDER_NUMBER= #{ORDER_NUMBER}
+    </select>
+
+    <!--  模糊查询所有物资  -->
+    <select id="getSteelMaterial" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_CODE "materialCode",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        RM.MATERIAL_NAME || RM.MATERIAL_MODEL "nameModel",
+        RM.MATERIAL_COUNT "materialCount"
+        FROM RMS_MATERIAL RM
+        WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
+        AND RM.MATERIAL_ID != 2533
+        AND RM.MATERIAL_ID != 3465
+        <if test="materialNameText != null">
+            AND (instr(RM.MATERIAL_NAME || RM.MATERIAL_MODEL, #{materialNameText}) > 0)
+        </if>
+        <if test="materialSpecificationText != null">
+            AND (instr(RM.MATERIAL_SPECIFICATION, #{materialSpecificationText}) > 0)
+        </if>
+        )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialSpecification != null">
+                and
+                <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+                    "materialSpecification" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialModel != null">
+                and
+                <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+                    "materialModel" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialCount" DESC nulls last
+        </if>
+    </select>
+
+    <select id="getAllProvince" resultType="java.util.Map">
+        SELECT DISTINCT RRA.ADDRESS_PROVINCE AS "addressProvince",
+                        RRA.ADDRESS_PROVINCE AS "id"
+        FROM RMS_RECEIVE_ADDRESS RRA
+    </select>
+
+    <select id="getDistrictByProvince" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT DISTINCT RRA.ADDRESS_DISTRICT AS "addressDistrict",
+                        RRA.ADDRESS_DISTRICT AS "id"
+        FROM RMS_RECEIVE_ADDRESS RRA
+        WHERE RRA.ADDRESS_PROVINCE = #{addressProvince}
+    </select>
+
+    <select id="getTownByDistrict" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT DISTINCT RRA.ADDRESS_TOWN AS "addressTown",
+                        RRA.ADDRESS_TOWN AS "id"
+        FROM RMS_RECEIVE_ADDRESS RRA
+        WHERE RRA.ADDRESS_DISTRICT = #{addressDistrict}
+    </select>
+
+    <select id="getPlaceByAllAddress" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT RRA.ADDRESS_ID AS "addressId"
+        FROM RMS_RECEIVE_ADDRESS RRA
+        WHERE RRA.ADDRESS_DISTRICT = #{addressDistrict}
+          AND RRA.ADDRESS_TOWN = #{addressTown}
+          AND RRA.ADDRESS_PROVINCE = #{addressProvince}
+    </select>
+
+    <select id="getSalerList" resultType="java.util.Map" >
+        SELECT RS.SALER_ID   "id",
+               RS.SALER_ID   "value",
+               RS.SALER_NAME "label"
+        FROM RMS_SALER RS
+    </select>
+
+    <select id="getSaleArea" parameterType="DECIMAL" resultType="java.lang.String" >
+        SELECT
+                RSA.AREA_NAME AS "areaName"
+        FROM RMS_CONSIGNEE RC
+                 LEFT JOIN RMS_SALE_AREA RSA
+                           ON RSA.AREA_ID = RC.AREA_ID
+        WHERE RC.CONSIGNEE_ID = #{receiveId}
+    </select>
+
+    <select id="getNoListCarrier" resultType="java.util.Map" >
+        SELECT RC.CARRIER_ID AS "id",
+               RC.CARRIER_ID AS "value",
+               RC.CARRIER_NAME AS "label"
+        FROM RMS_CARRIER RC
+        WHERE RC.CARRIER_ID &gt;= 3720
+        AND RC.CARRIER_ID &lt;= 3727
+    </select>
+
+    <select id="getNotReceiveOrderQuantity" resultType="java.lang.Integer">
+        select count(ORDER_ID)
+        from OMSTRUCK_ORDER OO
+        where OO.CAPACITY_ID = (select CAPACITY_ID from RMS_CAPACITY where CAPACITY_NUMBER = #{capacityNumber})
+        and OO.ORDER_STATUS = 4
+    </select>
+
+    <select id="getXiNanCarrier" resultType="java.util.Map" >
+        SELECT RCA.CARRIER_ID   "id",
+               RCA.CARRIER_ID   "value",
+               RCA.CARRIER_NAME "label"
+        FROM RMS_CARRIER RCA
+        WHERE RCA.CARRIER_NAME LIKE '%西南水泥%'
+    </select>
+
+    <!-- 边输边查发站-->
+    <select id="getArrivalByLike" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT RAS.ARRIVAL_NAME AS "arrivalName",
+               RAS.ARRIVAL_ID AS "arrivalId"
+        FROM RMSTRAIN_ARRIVAL_SEND RAS
+        <if test="index!=null and index != ''.toString()">
+            WHERE instr(RAS.ARRIVAL_NAME,#{index}) > 0
+        </if>
+    </select>
+
+    <select id="getOrderNum" parameterType="string" resultType="java.lang.Integer">
+        SELECT COUNT(OO.ORDER_ID)
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+              AND OO.ORDER_STATUS = 4
+    </select>
+
+    
+    <select id="getSteelWarehouse" resultType="java.util.Map">
+        SELECT RW.WAREHOUSE_ID   "id",
+               RW.WAREHOUSE_NAME "value"
+        FROM RMS_WAREHOUSE RW
+        WHERE RW.WAREHOUSE_TYPE_ID = 9
+    </select>
+
+    <select id="getShipNameMesByLike" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DB.RESULT_FOREIGN_SHIP_NAME "value",
+               RS.SUPPLIER_ID "supplierId",
+               RS.SUPPLIER_NAME "supplierName",
+               APO.PURCHASE_ORDER_ID "purchaseOrderId",
+               APO.PURCHASE_ORDER_NO  "purchaseOrderNo"
+               FROM DIL_BATCH DB
+               left join AMS_PURCHASE_ORDER APO
+               ON APO.BATCH_ID = DB.BATCH_ID
+               left join RMS_SUPPLIER RS
+               ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+               WHERE  APO.PURCHASE_ORDER_ID IS NOT NULL
+               and DB.RESULT_FOREIGN_SHIP_NAME like #{index}
+               and DB.MATERIAL_ID = #{materialId}
+               and APO.DELETED = 0
+    </select>
+    <select id="getCapacityTel" resultType="java.util.Map" parameterType="decimal">
+        SELECT RC.CAPACITY_TEL "capacityTel" FROM RMS_CAPACITY RC
+        WHERE RC.CAPACITY_ID = #{capacityId}
+    </select>
+
+    <select id="getConsigneeMesByLike" resultType="java.util.Map" parameterType="java.lang.String" >
+        select
+            RC.CONSIGNEE_ID "consigneeId",
+            RC.CONSIGNEE_COMPANY_NAME "value",
+            RC.CONSIGNEE_COMPANY_NAME "consigneeName"
+        from RMS_CONSIGNEE RC
+        where
+            instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum &lt; 10
+        order by "value"
+    </select>
+
+    <select id="getConsigneeByuserid" resultType="java.util.Map" parameterType="string">
+        select
+        RC.CONSIGNEE_ID "consigneeId",
+        RC.CONSIGNEE_CODE "consigneeCode",
+        RC.CONSIGNEE_COMPANY_NAME   "consigneeCompanyName"
+        from RMS_CONSIGNEE RC
+        WHERE RC.CONSIGNEE_SSO_ID = #{userId}
+    </select>
+    <select id="getQueueCount" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM (SELECT QQL.LIST_ID "soleP"
+              FROM QMS_QUEUE_LIST QQL
+              WHERE QQL.ENTRY_SURE_TIME is null
+              union all
+              SELECT QQSL.SPELLING_RESULT_ID "soleP"
+              from QMS_QUEUE_SPELLING_LIST QQSL
+              WHERE QQSL.ENTRY_SURE_TIME is null)
+    </select>
+
+    <update id="updateDriverTel" parameterType="java.util.Map">
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.DRIVER_TEL = #{driverTel}
+        WHERE oo.order_type = 1
+        <if test="orderId != null">
+            and oo.order_id = #{orderId}
+        </if>
+        <if test="saleOrderMaterialId != null">
+            and oo.order_plan_id = #{saleOrderMaterialId}
+        </if>
+
+    </update>
+
+    <update id="updateCapacityDriverTel">
+        update RMS_CAPACITY RC
+        SET RC.CAPACITY_TEL=#{driverTel}
+        where RC.CAPACITY_ID IN(
+        SELECT RC.CAPACITY_ID
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID=OO.CAPACITY_ID
+        WHERE OO.ORDER_ID=#{orderId})
+    </update>
+
+    <select id="getReceiverAllPlaceUsed" parameterType="java.lang.Integer" resultType="java.util.Map" >
+        SELECT RRP.PLACE_ID   AS "placeId",
+               RRP.ADDRESS_ID AS "addressId",
+               RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN AS "address",
+               RRP.ADDRESS_DELIVERY_ADDRESS AS "place"
+        FROM AMS_SALE_ORDER ASO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN RMS_RECEIVE_PLACE RRP
+                           ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRP.PLACE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRP.ADDRESS_ID = RRA.ADDRESS_ID
+        WHERE ASO.RECEIVE_ID = #{receiveId}
+    </select>
+
+    <select id="getSaleAreaByLike" parameterType="java.lang.String" resultType="java.util.Map" >
+        SELECT RSA.AREA_ID "id",
+               RSA.AREA_NAME "value",
+               RSA.AREA_ID "areaId",
+               RSA.AREA_NAME "label"
+        FROM RMS_SALE_AREA RSA
+        WHERE RSA.AREA_NAME LIKE #{index}
+    </select>
+
+    <select id="isReceiveHaveArea" parameterType="java.lang.Integer" resultType="DECIMAL" >
+        SELECT RC.AREA_ID AS "areaId"
+        FROM RMS_CONSIGNEE RC
+        WHERE RC.CONSIGNEE_ID = #{receiveId}
+    </select>
+
+    <update id="bandSaleArea" parameterType="java.util.Map">
+        UPDATE RMS_CONSIGNEE RC
+        SET RC.AREA_ID = #{areaId}
+        WHERE RC.CONSIGNEE_ID = #{receiveId}
+    </update>
+
+    <select id="getSteelOrderNum" resultType="java.lang.Integer">
+        SELECT
+            COUNT( * )
+        FROM
+            OMSTRUCK_ORDER OO
+                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE
+            OO.ORDER_LINE_SEQUENCE >= 1
+          AND OO.ORDER_STATUS = 5
+          AND TLFR.RESULT_OUT_GATE_TIME IS NULL
+          AND OO.ORDER_TYPE = 1
+    </select>
+    <select id="getInwardWeightMaterial" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT * FROM (SELECT
+            RMT.MATERIAL_TYPE_ID "materialTypeId",
+            rm.MATERIAL_ID "materialId",
+            rm.MATERIAL_NAME "materialName",
+            rmt.MATERIAL_TYPE_NAME "materialTypeName"
+        FROM
+            RMS_MATERIAL RM
+                LEFT JOIN RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
+        WHERE
+        RM.DELETED = 0
+        AND RMT.MATERIAL_ISINWARD = 1
+        <if test="index != null">
+            AND instr(RM.MATERIAL_NAME, #{index}) > 0
+        </if>
+           )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialTypeName != null">
+                and
+                <foreach collection="materialTypeName" item="item" open="(" separator="or" close=")">
+                    "materialTypeName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="getPlaceAndAddress" parameterType="java.lang.String" resultType="java.util.Map" >
+        SELECT RRP.PLACE_ID                 "placeId",
+               RRA.ADDRESS_ID               "shipperAddressId",
+               RRP.ADDRESS_DELIVERY_ADDRESS "place",
+               RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
+               RRP.ADDRESS_DELIVERY_ADDRESS "adressAndPlace",
+               RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
+               RRP.ADDRESS_DELIVERY_ADDRESS "value",
+               RRA.ADDRESS_PROVINCE     "province",
+               RRA.ADDRESS_DISTRICT     "district",
+               RRA.ADDRESS_TOWN         "town",
+               RRP.ADDRESS_DELIVERY_ADDRESS "place"
+        FROM RMS_RECEIVE_PLACE RRP
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+        WHERE (instr(RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS,
+                     #{index}) > 0)
+    </select>
+
+    <select id="getMaterialNameLike" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT DISTINCT RM.MATERIAL_NAME "materialName"
+        FROM RMS_MATERIAL RM
+        WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
+        <if test="index != null">
+            AND RM.MATERIAL_NAME LIKE #{index}
+        </if>
+    </select>
+
+    <select id="getSpecificationModelLike" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT DISTINCT RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpecificationModel",
+        RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_ID "value",
+        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "label",
+        RM.MATERIAL_ID "id",
+        RM.MATERIAL_NAME "materialName"
+        FROM RMS_MATERIAL RM
+        WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
+        <if test="materialName != null">
+            AND (instr (RM.MATERIAL_NAME,#{materialName}) > 0)
+        </if>
+        <if test="specificationModel != null">
+            AND (instr (RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL, #{specificationModel}) >0)
+        </if>
+    </select>
+
+    <select id="findPassedOrder" resultType="java.util.Map">
+        SELECT
+        distinct
+        OO.ORDER_ID "orderId",RC.CAPACITY_NUMBER "capacityNumber"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                 ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                 ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        WHERE OO.ORDER_TYPE = 1
+          AND OO.ORDER_STATUS IN (4,5)
+          and TWR.RESULT_NET_WEIGHT is null
+          AND ASOM.SALE_DATE_OF_RECEIPT between
+          sysdate-1 and sysdate
+          ORDER BY OO.ORDER_ID DESC
+    </select>
+
+
+<!-- 查询进口矿得采购订单-->
+    <select id="selectPurchaseOrderForShip" resultType="java.util.Map" parameterType="java.util.Map">
+        select
+            DB.BATCH_ID                 "batchId",
+            DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+            RM.MATERIAL_NAME            "materialName",
+            APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
+            APO.INSERT_TIME             "insetTime",
+            APO.PURCHASE_ORDER_ID        "purchaseOrderId"
+        from AMS_PURCHASE_ORDER APO
+                 left join DIL_BATCH DB
+                           on APO.BATCH_ID = DB.BATCH_ID
+                 left join RMS_MATERIAL RM
+                           on RM.MATERIAL_ID = DB.MATERIAL_ID
+        WHERE    DB.RESULT_FOREIGN_SHIP_NAME IS NOT NULL
+                 <if test="index!=null">
+                     and (INSTR(DB.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(RM.MATERIAL_NAME,#{index}) > 0)
+                 </if>
+    </select>
+
+    <select id="getBatchOfNotice" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DISTINCT
+        DBI.BATCH_ID "batchId",
+        APO.PURCHASE_ORDER_ID "purchaseOrderId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        RM.MATERIAL_NAME "materialName",
+        RP.PORT_NAME "portName",
+        RPT.PORT_TYPE_NAME "portTypeName"
+        from AMSSHIP_DELIVERY_NOTICE ADN
+        LEFT JOIN DIL_BATCH_INFACOTRY DBI ON ADN.BATCH_ID=DBI.BATCH_INFACOTRY_ID
+        LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID=DBI.BATCH_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO ON APO.BATCH_ID=DB.BATCH_ID
+        LEFT JOIN RMS_PORT RP ON ADN.PORT_ID=RP.PORT_ID
+        LEFT JOIN RMS_PORT_TYPE RPT ON RP.PORT_TYPE_ID=RPT.PORT_TYPE_ID
+        LEFT JOIN RMS_MATERIAL RM ON DB.MATERIAL_ID=RM.MATERIAL_ID
+        WHERE RP.PORT_TYPE_ID IS NOT NULL
+        AND APO.PURCHASE_ORDER_NO IS NOT NULL
+        AND RP.DELETED=0
+        AND ADN.NOTICE_DISTRIBUTION_STATUS=1
+        AND ADN.DELETED=0
+        <if test="index!=null and index!=''.toString()">
+            and (INSTR(DB.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(RM.MATERIAL_NAME,#{index}) > 0)
+        </if>
+    </select>
+
+    <select id="findBatchHavingLoad" resultType="java.util.Map">
+        SELECT  distinct	db.BATCH_ID "batchId",
+        db.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        rm.MATERIAL_NAME "materialName",
+        apo.PURCHASE_ORDER_NO       "purchaseOrderNo",
+        apo.PURCHASE_ORDER_ID        "purchaseOrderId"
+        FROM TMSSHIP_LOAD_SHIP_RESULT tlsr
+        LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
+        ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
+        LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
+        ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
+        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+        ON osi.SHIPMENT_INSTRUCTIONS_ID = oic.INSTRUCTIONS_ID
+        LEFT JOIN DIL_BATCH_INFACOTRY dbi
+        ON dbi.BATCH_INFACOTRY_ID = osi.BATCH_ID
+        LEFT JOIN DIL_BATCH db
+        ON db.BATCH_ID = dbi.BATCH_ID
+        LEFT JOIN TMSSHIP_WATER_QUALITY_RESULT twqr
+        ON ttr.RESULT_ID = twqr.TOTAL_RESULT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER apo
+        ON apo.BATCH_ID=db.BATCH_ID
+        LEFT JOIN RMS_MATERIAL rm
+        ON rm.MATERIAL_ID=db.MATERIAL_ID
+        WHERE     tlsr.DELETED=0
+        <if test="index!=null">
+            and (INSTR(db.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(rm.MATERIAL_NAME,#{index}) > 0)
+        </if>
+    </select>
+    <!-- 获取发站-->
+    <select id="getInwardSendStation" resultType="java.util.Map">
+        select
+            RAS.ARRIVAL_NAME "sendStation",
+            RAS.ARRIVAL_ID		"sendStationId"
+            from RMSTRAIN_ARRIVAL_SEND RAS
+            WHERE RAS.ARRIVAL_TYPE_ID = 1
+
+    </select>
+
+    <select id="getInwardInboundResult" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DISTINCT
+               RC.CAPACITY_NUMBER "capacityNumber",
+               OO.ORDER_NUMBER "orderNumber",
+               OO.ORDER_ID "orderId",
+               RPG.INSERT_TIME "insertTime",
+               RPG.UPDATE_TIME  "updateTime",
+               DECODE(WGM.DELETED, 1, '已出库', '未出库') "gmStatus",
+               OTO.ORDER_WAGON_NO "wagonNo",
+               OTO.ORDER_ID     "trainOrderId",
+               RPG.INSERT_UPDATE_REMARK "remark",
+               RP.PERSONNEL_NAME    "personName",
+               RP1.PERSONNEL_NAME   "outPersonName",
+               RAS.ARRIVAL_NAME     "toTheStation",
+               RAS1.ARRIVAL_NAME    "sendStation",
+               RC2.CONSIGNEE_COMPANY_NAME   "consigneeName"
+        FROM WMSP_GRID_MATERIAL WGM
+                 LEFT JOIN RMS_PWAREHOUSE_GRID RPG
+                           ON RPG.GRID_ID = WGM.GRID_ID
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_ID = RPG.STACKING_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN TMSTT_ORDER TTO
+                           ON TTO.TRUCK_ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN OMSTRAIN_ORDER OTO
+                           ON OTO.ORDER_ID = TTO.TRAIN_ORDER_ID
+                 LEFT JOIN RMS_PERSONNEL RP
+                           ON RP.PERSONNEL_SSO_ID = RPG.INSERT_USERNAME
+                 LEFT JOIN RMS_PERSONNEL RP1
+                           ON RP1.PERSONNEL_SSO_ID = RPG.UPDATE_USERNAME
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
+                 LEFT JOIN RMS_CONSIGNEE  RC2
+                           ON RC2.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR
+                           ON TPAR.RAIL_PLAN_ID = ASM.SALE_MATERIAL_ID
+                 LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS
+                           ON RAS.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
+                 LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS1
+                           ON RAS1.ARRIVAL_ID = TPAR.SEND_STATION_ID
+        WHERE RPG.GRID_TYPE = 1
+          AND OO.ORDER_ID IS NOT NULL
+          and RPG.INSERT_TIME > sysdate - 3
+        <if test="gmStatus != null and gmStatus != -1">
+            AND WGM.DELETED = #{gmStatus}
+        </if>
+        order by RPG.INSERT_TIME desc
+    </select>
+    <select id="getMaterialList" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT RM.MATERIAL_ID "materialId",
+               RM.MATERIAL_NAME||'-'||RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_SPECIFICATION||')'||'-'||OOM.ORDER_MATERIAL_NUMBER||'件' "materialName",
+               TWR.INSERT_UPDATE_REMARK "weightNo"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        AND TWR.SALE_MATERIAL_ID = OOM.SALE_MATERIAL_ID
+        WHERE OOM.ORDER_ID = #{orderId}
+    </select>
+    <select id="getLuhaoNum" resultType="java.util.Map" parameterType="decimal">
+        SELECT
+            RMS.MATERIAL_FURNACE_NUMBER "materialFurnaceNumber",
+            COUNT( WOSR.RESULT_ID ) "materialNum"
+        FROM
+            WMSP_OUTBOUND_RESULT WOR
+                LEFT JOIN WMSP_OUTBOUND_RESULT_MATERIAL WORM ON WORM.OUTBOUND_RESULT_ID = WOR.RESULT_ID
+                LEFT JOIN WMSP_OUTBOUND_SCAN_RESULT WOSR ON WORM.RESULT_MATERIAL_ID = WOSR.RESULT_MATERIAL_ID
+                LEFT JOIN WMSP_INBOUND_RESULT WIR ON WOSR.INBOUND_RESULT_ID = WIR.INBOUND_ID
+                LEFT JOIN RMS_MATERIAL_STEEL RMS ON WIR.MATERIAL_ID = RMS.MATERIAL_STEEL_ID
+        WHERE WOR.BILL_LADING_ID = #{orderId}
+          AND WORM.MATERIAL_ID = #{materialId}
+        GROUP BY
+            RMS.MATERIAL_FURNACE_NUMBER
+    </select>
+
+
+    <update id="closePassedOrder" >
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS=7
+        WHERE OO.ORDER_ID IN
+        (SELECT OO.ORDER_ID ,RC.CAPACITY_NUMBER "capacityNumber"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                 ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                 ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        WHERE OO.ORDER_TYPE = 1
+          AND OO.ORDER_STATUS IN (4,5)
+          AND TER.RESULT_ENTRY_GATE_TIME IS NULL
+          and (TWR.RESULT_TARE_WEIGHT =0
+					or TWR.RESULT_TARE_WEIGHT is NULL)
+          AND ASOM.SALE_DATE_OF_RECEIPT between
+          sysdate-1 and sysdate
+        )
+    </update>
+
+    <delete id="delectQueueS">
+        delete from QMS_QUEUE_LIST qql
+        where qql.LIST_ID=#{capacityIdM}
+    </delete>
+
+    <delete id="delectQueueM">
+        delete from QMS_QUEUE_SPELLING_LIST qqsl
+        where qqsl.SPELLING_RESULT_ID=#{capacityIdM}
+    </delete>
+
+    <select id="queueMore" resultType="java.math.BigDecimal">
+        select
+        distinct
+        qqsl.SPELLING_RESULT_ID
+        from OMSTRUCK_ORDER oo
+        LEFT JOIN QMS_QUEUE_RESULT qqr
+        on qqr.capacity_id=oo.capacity_id
+        LEFT JOIN QMS_QUEUE_SPELLING_LIST qqsl
+        on qqsl.queue_result_id=qqr.result_total_id
+        where oo.order_id=#{orderId}
+    </select>
+
+    <select id="sumNetWeight" resultType="java.math.BigDecimal">
+       select COALESCE(sum(TWR.RESULT_NET_WEIGHT),0) "sum"  from TMSTRUCK_TOTAL_RESULT TTR
+       LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+       ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+       WHERE TTR.ORDER_ID=#{orderId}
+    </select>
+
+    <update id="updateStatusTwo">
+        update OMSTRUCK_ORDER OO
+        set OO.ORDER_STATUS=2,
+            OO.INSERT_UPDATE_REMARK = '八点完成订单'
+        WHERE OO.ORDER_ID=#{orderId}
+    </update>
+
+    <update id="updateStatusSeven">
+        update OMSTRUCK_ORDER OO
+        set OO.ORDER_STATUS=7
+        WHERE OO.ORDER_ID=#{orderId}
+    </update>
+
+    <select id="queueSingle" resultType="java.math.BigDecimal">
+        select qql.LIST_ID
+        from OMSTRUCK_ORDER oo
+        LEFT JOIN QMS_QUEUE_LIST qql
+        on qql.capacity_id=oo.capacity_id
+        where oo.order_id=#{orderId}
+    </select>
+    <select id="getDispachSwitch" resultType="java.util.Map">
+        SELECT IS_OK "isOk" FROM AMS_DISPATCH_SWITCH
+        fetch NEXT 1 rows only
+    </select>
+    <select id="getReleaseFlag" resultType="string">
+        SELECT VERSION_VALUE FROM DIL_VERSION WHERE VERSION_ID = 6
+    </select>
+    <update id="updateDispachSwitch">
+        UPDATE AMS_DISPATCH_SWITCH SET IS_OK=#{isOk}
+    </update>
+    <select id="getConsigneeInfo" resultType="java.util.Map">
+        SELECT RC.CONSIGNEE_ID "consigneeId",
+               RC.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+               FROM RMS_CONSIGNEE RC
+        WHERE RC.CONSIGNEE_COMPANY_NAME = #{consigneeName}
+    </select>
+    <select id="getColumnNoRoutList" resultType="java.lang.String" parameterType="map">
+        select DTCR.COLUMN_NAME from DIL_TABLE_COLUMN_ROLE DTCR
+        left join DIL_ROLE_ORGCODE_TABLE DROT
+        ON DTCR.PRIMARY_ID = DROT.COLUMN_ID
+        WHERE
+        DTCR.TABLE_NAME = #{tableName}
+        <if test="orgCode != null">
+            and DROT.ORG_CODE = #{orgCode}
+        </if>
+    </select>
+    <select id="getWareHouseNameLike" resultType="java.util.Map">
+        SELECT
+            RMS_WAREHOUSE.WAREHOUSE_ID "warehouseId",
+            RMS_WAREHOUSE.WAREHOUSE_NAME "warehouseName"
+        FROM RMS_WAREHOUSE WHERE DELETED=0 AND WAREHOUSE_NAME LIKE #{index}
+    </select>
+    <select id="getSteelReportDetailsBySmId" resultType="java.util.Map" parameterType="decimal">
+        SELECT distinct OO.ORDER_ID "orderId",
+                        ASO.SALE_ORDER_ID "saleOrderId",
+                        ASO.SALE_NUMBER "saleOrderNo",
+                        ASO.SALE_REMARK "saleRemark",
+                        ASO.SALER_ID    "salerId",
+                        ASO.SHIPPER_ID  "shipperId",
+                        ASO.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
+                        RC.CONSIGNEE_COMPANY_NAME "consigneeName",
+                        RC.CONSIGNEE_ID "receiveId",
+                        ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
+                        ASOM.TRUCK_REMARK   "truckRemark",
+                        RS.SHIPPER_NAME "shipperName",
+                        (CASE WHEN
+                                  RCA.CAPACITY_NUMBER = '空白'
+                                  then null
+                              else RCA.CAPACITY_NUMBER
+                            END) "capacityNo",
+                        (CASE WHEN
+                                  RCA.CAPACITY_NUMBER = '空白'
+                                  then null
+                              else RCA.CAPACITY_NUMBER
+                            END) "capacityNoFlag",
+                        NVL(OO.CAPACITY_ID,0)  "capacityIds",
+                        OO.CAPACITY_ID "capacityId",
+                        ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
+                        ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+                        OO.ORDER_LINE_SEQUENCE "lineSequence",
+                        ASO.SALE_ORDER_ISSELF_MENTION "isSelfMention",
+                        RSR.SALER_NAME "saler",
+                        RSR.SALER_ID    "saler",
+                        R_CARRIER.CARRIER_ABBREVIATION "carrierName",
+                        OO.ORDER_NUMBER "orderNo",
+                        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+                        RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
+                        RRP.PLACE_ID "placeId",
+                        RRP.ADDRESS_DELIVERY_ADDRESS "place",
+                        RRA.ADDRESS_ID "shipperAddressId",
+                        RRA.ADDRESS_PROVINCE "addressProvince",
+                        RRA.ADDRESS_DISTRICT "addressDistrict",
+                        RRA.ADDRESS_TOWN "addressTown",
+                        OO.ORDER_LINE_SEQUENCE "lineSqe",
+                        OO.DRIVER_TEL "capacityTel",
+                        TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
+                        TER.RESULT_ENTRY_GATE_TIME   "entryGateTime",
+                        QQR.RESULT_START_TIME       "queueStartTime",
+                        ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",
+                        R_CARRIER.CARRIER_ID        "carrierId",
+                        NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
+                        OO.ORDER_STATUS              "carStatus",
+                        OO.REMARK "remark",
+                        OO.URL "urls",
+                        DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
+                               2,'销售已提交',
+                               4,'财务已审批',
+                               0,'销售订单未上报') "saleOrderStatus",
+                        DECODE(nvl(OO.ORDER_STATUS,0) ,2,'已完成',4,'已派发',5,'已接收',0,'未派发',7,'已关闭',8,'已关闭')
+                            "orderStatus",
+                        oo.ORDER_STATUS "orderStatu"
+        FROM AMS_SALE_ORDER ASO
+                 LEFT JOIN RMS_CONSIGNEE RC
+                           ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN RMS_SALER RSR
+                           ON RSR.SALER_ID = ASO.SALER_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+                 LEFT JOIN RMS_RECEIVE_PLACE RRP
+                           ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+                 LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN RMS_CARRIER R_CARRIER
+                           ON R_CARRIER.CARRIER_ID = ADSO.CARRIER_ID
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                               AND NVL(OO.ORDER_TYPE,0) in (0,1)
+                 LEFT JOIN RMS_CAPACITY RCA
+                           ON RCA.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN QMS_QUEUE_RESULT QQR
+                           ON QQR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                           ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                           ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE ASO.SALE_TYPE = 1
+          AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    </select>
+    <select id="getColumnShowData" resultType="java.util.Map" parameterType="map">
+        SELECT DTCR.COLUMN_NAME "key",
+               DTCR.COLUMN_NAME "label"
+        FROM DIL_TABLE_COLUMN_ROLE DTCR
+        LEFT JOIN DIL_ROLE_ORGCODE_TABLE DROT on DTCR.PRIMARY_ID = DROT.COLUMN_ID
+        WHERE
+        DTCR.TABLE_NAME = #{tableName}
+        <if test="userName != null">
+            AND nvl(DROT.USER_NAME,'0') != #{userName}
+        </if>
+        <if test="schemeName != null">
+            AND nvl(DROT.PRIMARY_NAME,'0') != #{schemeName}
+        </if>
+    </select>
+    <select id="getColumnHiddenData" resultType="string" parameterType="map">
+        SELECT DTCR.COLUMN_NAME FROM DIL_ROLE_ORGCODE_TABLE DROT
+        LEFT JOIN DIL_TABLE_COLUMN_ROLE DTCR on DTCR.PRIMARY_ID = DROT.COLUMN_ID
+        WHERE
+        DTCR.TABLE_NAME = #{tableName}
+        <if test="userName != null">
+            AND DROT.USER_NAME = #{userName}
+        </if>
+        <if test="orgCode != null">
+            AND DROT.ORG_CODE = #{orgCode}
+        </if>
+        <if test="schemeName != null">
+            AND nvl(DROT.PRIMARY_NAME,'0') = #{schemeName}
+        </if>
+    </select>
+    <select id="getColumnAllData" resultType="java.util.Map" parameterType="map">
+        SELECT DTCR.COLUMN_NAME "key",
+               DTCR.COLUMN_NAME "label"
+        FROM DIL_TABLE_COLUMN_ROLE DTCR
+        WHERE
+            DTCR.TABLE_NAME = #{tableName}
+    </select>
+
+    <update id="updateRemark">
+        UPDATE OMSTRUCK_ORDER
+        SET REMARK = #{remark}
+        WHERE ORDER_ID = #{orderId}
+    </update>
+    <select id="getColumnAllScheme" resultType="java.util.LinkedHashMap" parameterType="map">
+      SELECT
+            distinct
+             DROT.PRIMARY_NAME "schemeName",
+             DROT.ENABLE_STATUS "enableStatus" ,
+             DROT.USER_NAME "userName",
+             DROT.ORG_CODE  "orgCode",
+             DTCR.TABLE_NAME "tableName"
+      FROM DIL_ROLE_ORGCODE_TABLE DROT
+      LEFT JOIN DIL_TABLE_COLUMN_ROLE DTCR on DROT.COLUMN_ID = DTCR.PRIMARY_ID
+      WHERE DROT.USER_NAME = #{userName}
+      AND DROT.ORG_CODE = #{orgCode}
+      AND DTCR.TABLE_NAME = #{tableName}
+      AND NVL(DROT.PRIMARY_NAME,'') != '默认方案'
+    </select>
+
+    <update id="updateRemarkPic">
+        UPDATE OMSTRUCK_ORDER
+        SET URL = #{urls}
+        WHERE ORDER_ID = #{orderId}
+    </update>
+
+    <select id="getWlUrl" resultType="java.lang.String">
+        SELECT DL.VERSION_VALUE FROM DIL_VERSION DL
+        WHERE DL.VERSION_ID = 11
+    </select>
+    <update id="updateTruckRemark">
+        UPDATE AMS_SALE_ORDER_MATERIAL ASOM
+        SET ASOM.TRUCK_REMARK = #{truckRemark}
+        WHERE 1 != 1
+        <if test="saleOrderMaterialId != null">
+           or ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+        </if>
+    </update>
+</mapper>

src/main/resources/log4j.properties

@@ -0,0 +1,80 @@
+## LOG4J配置
+log4j.rootCategory=INFO,file, RUNNING,errorfile
+## 控制台输出
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+
+## root日志输出到文件
+log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.file.file=/logsdata/logs/springboot-log4j-root.log
+log4j.appender.file.DatePattern='.'yyyy-MM-dd
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+
+## 按不同package进行输出
+## com.steer包下的日志配置
+log4j.category.market=DEBUG, steerfile
+log4j.category.com.hnshituo=DEBUG, steerfile
+#log4j.category.com.steer=${logging.level.com.steer}, steerfile
+log4j.category.com.steer=DEBUG, steerfile
+# com.steer下的日志输出
+log4j.appender.steerfile=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.steerfile.file=/logsdata/logs/springboot-log4j-steer.log
+log4j.appender.steerfile.DatePattern='.'yyyy-MM-dd
+log4j.appender.steerfile.layout=org.apache.log4j.PatternLayout
+#log4j.appender.steerfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
+log4j.appender.steerfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+
+
+## ERROR级别输出到特定的日志文件中
+log4j.logger.error=errorfile
+## 异常日志####
+log4j.appender.errorfile=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.errorfile.file=/logs/exception/exc.log
+log4j.appender.errorfile.DatePattern='.'yyyy-MM-dd
+log4j.appender.errorfile.Threshold = ERROR
+log4j.appender.errorfile.layout=org.apache.log4j.PatternLayout
+#log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
+log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+
+### 运行日志 ###
+log4j.appender.RUNNING = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.RUNNING.File =/logs/log/running.log
+log4j.appender.RUNNING.Append = true
+log4j.appender.RUNNING.Threshold = INFO
+log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd.
+log4j.appender.RUNNING.layout = org.apache.log4j.PatternLayout
+log4j.appender.RUNNING.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+
+### 指定类###
+log4j.logger.com.steer.rbac.sysdebuglog.service.DebugLogRecord = DEBUG,DEB
+## 调试日志 ###
+log4j.appender.DEB = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.DEB.File = /logs/debug/debug.log
+log4j.appender.DEB.Append = true
+log4j.appender.DEB.Threshold = DEBUG 
+log4j.appender.DEB.DatePattern='.'yyyy-MM-dd
+log4j.appender.DEB.layout = org.apache.log4j.PatternLayout
+log4j.appender.DEB.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+####[%p] [%-d{yyyy-MM-dd HH:mm:ss}] %C.%M(%L) | %m%n
+
+#### 业务日志###
+log4j.logger.com.steer.rbac.sysoperlog.service.BizLogRecord = INFO,BIZ
+log4j.appender.BIZ = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.BIZ.File = /logs/business/biz.log
+log4j.appender.BIZ.Append = true
+log4j.appender.BIZ.Threshold = INFO
+log4j.appender.BIZ.DatePattern='.'yyyy-MM-dd
+log4j.appender.BIZ.layout = org.apache.log4j.PatternLayout
+log4j.appender.BIZ.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+#
+#
+#### 资源日志###
+#log4j.appender.ENV = org.apache.log4j.DailyRollingFileAppender
+#log4j.appender.ENV.File = ../logs/env/env.log
+#log4j.appender.ENV.Append = true
+#log4j.appender.ENV.Threshold = INFO
+#log4j.appender.ENV.DatePattern='.'yyyy-MM-dd
+#1420.3og4j.appender.ENV.layout = org.apache.log4j.PatternLayout
+#log4j.appender.ENV.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n

src/main/resources/message.properties

@@ -0,0 +1,4 @@
+succeed=操作成功
+failed=操作失败
+unreg=帐号或手机号码未注册
+passerr=密码错误