master

pom.xml

@@ -57,6 +57,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.0.7.RELEASE</version>
         </dependency>
 
         <!--mybatisPlus-->
@@ -94,35 +95,41 @@
             <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>com.steerinfo</groupId>
-                <artifactId>generator-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <connUrl>jdbc:oracle:thin:@192.168.1.51:1521:steerinfo</connUrl>
-                    <user>dilusr</user>
-                    <password>stinf#0420</password>
-                    <!--包名-->
-                    <targetPackage>com.steerinfo.dil</targetPackage>
-                    <tables>
-                        <param>[table-name]</param><!--运力-->
-                    </tables>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>steerinfo</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+<!--            &lt;!&ndash;             自动生成代码文件 &ndash;&gt;-->
+<!--            <plugin>-->
+<!--                <groupId>com.steerinfo</groupId>-->
+<!--                <artifactId>generator-maven-plugin</artifactId>-->
+<!--                <version>3.0</version>-->
+<!--                <configuration>-->
+<!--                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>-->
+<!--                    <user>dil</user>-->
+<!--                    <password>Dil123789</password>-->
+<!--                    &lt;!&ndash;包名&ndash;&gt;-->
+<!--                    <targetPackage>com.steerinfo.dil</targetPackage>-->
+<!--                    <tables>-->
+<!--                        <table></table>-->
+<!--                    </tables>-->
+<!--                </configuration>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <phase>compile</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>steerinfo</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
 
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -143,7 +150,6 @@
                     <include>**/*.xml</include>
                 </includes>
             </resource>
-
             <resource>
                 <directory>src/main/resources</directory>
             </resource>

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

@@ -0,0 +1,1207 @@
+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 oracle.jdbc.proxy.annotation.Post;
+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);
+    }
+
+    @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) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    /**
+     * 获取收货地址
+     * @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) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId);
+    }
+
+    /**
+     * 新增汽运单价
+     * @param mapVal
+     * @return
+     */
+    @PostMapping("addAmsContractTransportUnitPrice1")
+    @ApiOperation(value = "新增汽运单价")
+    Map<String, Object> addAmsContractTransportUnitPrice1(@RequestBody Map<String, Object> mapVal) {
+        return amsFeign.addAmsContractTransportUnitPrice1(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() {
+        return amsFeign.batchUpdateTransportPriceByOilPrice1();
+    }
+    @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();
+    }
+
+    @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(@RequestParam BigDecimal saleOrderId) {
+        return amsFeign.deleteAmsSaleOrderBySaleOrderId(saleOrderId);
+    }
+    @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("/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,
+                                                Integer carrierId,
+                                                Integer planId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId);
+    }
+    /**
+     *用车单位提出需求
+     *新增用车需求
+     */
+    @PostMapping("/addTruckRequirement")
+    public Map<String,Object> addTruckRequirement(@RequestBody  Map<String, Object> mapVal) {
+        return amsFeign.addTruckRequirement(mapVal);
+    }
+    //删除用车需求
+    @PostMapping("/deleteTruckRequirement/{requirementId}")
+    public Map<String,Object> deleteTruckRequirement(@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);
+    }
+
+    /**
+     * 展示用车需求
+     * @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 con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con);
+    }
+
+    @ApiOperation(value="查询app端公开抢单")
+    @PostMapping("/getDispatchSaleOrderList")
+    public Map<String, Object> getDispatchSaleOrderList() {
+        return amsFeign.getDispatchSaleOrderList();
+    }
+
+    @ApiOperation(value="抢单/接收订单锁定")
+    @PostMapping("/lockDispatchSaleOrder")
+    public Map<String, Object> lockDispatchSaleOrder(Integer dispatchId,Integer carrierId) {
+        return amsFeign.lockDispatchSaleOrder(dispatchId, carrierId);
+    }
+
+    @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,
+                                                           Integer carrierId){
+        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierId);
+    }
+
+    //获取到站名称
+    @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,
+                                                      String con) {
+        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType, con);
+    }
+
+    @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);
+    }
+}

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

@@ -0,0 +1,554 @@
+package com.steerinfo.dil.controller;
+
+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 io.swagger.models.auth.In;
+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 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;
+
+    /**
+     * 水运结算
+     *
+     * @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("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 con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType, con);
+    }
+
+    @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 con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId, 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,
+                                                               String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getSaleTruckStatementDetailsOrderList(mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId), con);
+    }
+
+    @PostMapping("getUnFinishedTruckDetailsOrderList")
+    @ApiOperation(value = "展示汽运未生成账单的详单信息")
+    public RESTfulResult getUnFinishedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                            Integer pageNum,
+                                                            Integer pageSize,
+                                                            Integer apiId,
+                                                            Integer orderType,
+                                                            String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getUnFinishedTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType, con);
+    }
+
+    @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(@RequestBody List<Map<String, Object>> mapList) {
+        return bmstruckFeign.addTruckStatement(mapList);
+    }
+
+    @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);
+    }
+
+}

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

@@ -0,0 +1,632 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.OmsFeign;
+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 io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.HashSet;
+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 con) {
+        return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
+                orderStatus, planId, orderType, fuelOrder, con);
+    }
+
+    @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("/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="司机接单信息")
+    @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 con){
+        return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
+                 orderType, orderStatus, fuelOrder, con);
+    }
+
+    /**
+     * 展示承运商接收销售公司已接受的销售订单
+     *
+     * @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);
+    }
+    /**
+     * 销售物流：司机接单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,
+                                            Integer carrierId
+    )
+    {
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierId);
+    }
+
+
+
+    /**
+     * 查询所有已经接收的焦炭发运日计划
+     *
+     * @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(Integer dispatchId,
+                                                Integer orderType,
+                                                String capacityNumber,
+                                                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(@RequestParam Integer orderId) {
+        Map<String, Object> map = omsFeign.closeOmstruckOrder(orderId);
+        return 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) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con);
+        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,
+                                                  Integer carrierId,
+                                                  String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con);
+        return map;
+    }
+
+    @ApiOperation(value = "司机APP端查询下发给自己运输订单")
+    @PostMapping("/sendOrderToApp")
+    public List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber) {
+        return omsFeign.sendOrderToApp(capacityNumber);
+    }
+
+    @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);
+    }
+}

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

@@ -0,0 +1,384 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.QmsTruckFeign;
+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 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 QmsTruckFeign qmsTruckFeign;
+
+    @ApiOperation(value="触发电子围栏-->新增排队实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addQueueResult")
+    public Map<String, Object> addQueueResult(@RequestBody(required = false) Map<String, Object> map){
+        return qmsTruckFeign.addQueueResult(map);
+    }
+
+
+    @ApiOperation(value="指令接收-->新增排队链表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/addQueueList")
+    public Map<String, Object> addQueueList(@RequestBody(required = false) Map<String, Object> mapValue){
+        return qmsTruckFeign.addQueueList(mapValue);
+    }
+
+    @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 qmsTruckFeign.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 qmsTruckFeign.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 gridId,
+                                                     String con
+    ){
+        return qmsTruckFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, gridId,con);
+    }
+
+
+    @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 qmsTruckFeign.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 qmsTruckFeign.changeQueue(mapValue);
+    }
+
+
+    @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 qmsTruckFeign.getChangeQueue(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    }
+
+
+    @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 qmsTruckFeign.queueCancel(mapValue);
+    }
+
+    @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 qmsTruckFeign.getQueueCancel(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @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 qmsTruckFeign.getQueueCancelByResultId(resultId);
+    }
+
+
+    @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 qmsTruckFeign.updateQueueCancel(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 qmsTruckFeign.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 qmsTruckFeign.getQueueInsert(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @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 qmsTruckFeign.queueEnd(mapValue);
+    }
+
+    @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 qmsTruckFeign.getQueueEndResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @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 qmsTruckFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize, gridType,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,
+                                           String con
+    ){return qmsTruckFeign.listMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
+    @PostMapping("/getQueueStatusList")
+    public Map<String, Object> getQueueStatusList(){
+        return qmsTruckFeign.getQueueStatusList();
+    }
+
+    @ApiOperation(value="通过车牌号查询司机接单")
+    @PostMapping("/getOrderReceive/{capacityNumber}")
+    public Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber){
+        return qmsTruckFeign.getOrderReceive(capacityNumber);
+    }
+
+    @ApiOperation(value="通过车牌号取消排队")
+    @PostMapping("/cancelQueue")
+    public Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue){
+        return qmsTruckFeign.cancelQueue(mapValue);
+    }
+
+    @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 qmsTruckFeign.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 qmsTruckFeign.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 qmsTruckFeign.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 qmsTruckFeign.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 qmsTruckFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    }
+}

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

@@ -0,0 +1,739 @@
+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 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 = "根据主键查询出数据以供修改")
+    @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 = "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) {
+
+        return rmsFeign.getCapacityList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
+    @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="根据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("/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 = "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="根据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="根据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);
+    }
+
+
+//*******************************下拉框************************
+
+    @GetMapping("getNoticeTypeId")
+    @ApiOperation(value = "得到公告类型Id")
+    public Map<String,Object> getNoticeTypeId(){
+        return rmsFeign.getNoticeTypeId();
+    }
+
+}

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

@@ -0,0 +1,1873 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.TmsshipFeign;
+import com.steerinfo.dil.feign.TmsTrainFeign;
+import com.steerinfo.dil.feign.TmsTruckFeign;
+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 io.swagger.models.auth.In;
+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:11
+ */
+
+@RestController
+@RequestMapping("${api.version}/tms")
+public class TMSController extends BaseRESTfulController {
+    @Autowired
+    private TmsTruckFeign tmsTruckFeign;
+    @Autowired
+    private TmsTrainFeign tmsTrainFeign;
+    @Autowired
+    TmsshipFeign tmsshipFeign;
+
+    /*======================================船运==========================================*/
+
+    /**
+     * 驳船
+     *
+     * @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,
+                                                     String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getBargeOperationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
+    @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,
+                                               String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
+    @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) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getShipLocationList(mapValue==null?new HashMap<>():mapValue);
+    }
+
+    @PostMapping("getShipLocation/{locationId}")
+    @ApiOperation(value = "查询位置作业")
+    Map<String, Object> getShipLocation(@PathVariable("locationId") BigDecimal locationId) {
+        return tmsshipFeign.getShipLocation(locationId);
+    }
+
+    @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,
+                                            String con){
+        return  tmsshipFeign.getBatchList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+
+  //框计算计算货权转移中出现的批次
+  @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);
+  }
+
+
+    /**
+     * 展示船只信息
+     *
+     * @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) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId,con);
+    }
+
+    /**
+     * 卸船作业
+     * @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,
+                                                         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) {
+        return tmsshipFeign.addWaterQualityResult(map);
+    }
+
+    /**
+     * 船只信息
+     *
+     * @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 con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,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("updateIssueStatus/{shipmentInstructionsId}")
+    @ApiOperation(value = "修改状态")
+    Map<String, Object> updateIssueStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId) {
+        return tmsshipFeign.updateIssueStatus(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,
+                                                                String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+    @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,
+                                                              String con,
+                                                              Integer status) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
+    }
+
+    @PostMapping("insertshipDeliveryAttorney")
+    @ApiOperation(value = "新增提货委托")
+    Map<String, Object> insertshipDeliveryAttorney(@RequestBody Map<String, Object> amsshipDeliveryAttorney) {
+        return tmsshipFeign.insertshipDeliveryAttorney(amsshipDeliveryAttorney);
+    }
+
+    @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,
+                                                         String con,
+                                                         Integer status) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
+    }
+
+    @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("/selectAll")
+    Map<String, Object> selectAll(){
+        return tmsshipFeign.selectAll();
+    }
+
+    /**
+     * 下拉框
+     *
+     * @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,
+                                                    String con) {
+        return tmsTrainFeign.getTmstrainWagonLoad(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType, con);
+    }
+
+
+    @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({
+    })
+    @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 = "获取批次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){
+        return tmsTrainFeign.getWagonNo(resultType, mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+    }
+
+    @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({
+    })
+    @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 = "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){
+        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType, con);
+    }
+
+    @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 con
+    ){
+        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+    }
+
+    @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 Map<String, Object> enFactoryResultByPDA(@RequestBody(required = false) Map<String, Object> mapValue) {
+        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){
+        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+    }
+
+    @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) {
+        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+    }
+
+
+    @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
+    ){
+        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+    }
+
+    @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
+    ){
+        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+    }
+
+
+    //****************************************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
+    ){
+        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+    }
+
+
+    @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 = "查询计量委托 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllMeasureCommission/{type}")
+    public Map<String, Object> getAllMeasureCommission(@PathVariable("type") Integer type) {
+        return tmsTruckFeign.getAllMeasureCommission(type);
+    }
+
+    //****************************************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
+    ){
+        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,orderType, con);
+    }
+
+    @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);
+    }
+
+    @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);
+    }
+
+    /**
+     * 内转物流卸货装车实绩
+     *
+     * @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
+    ){
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @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 = "/addDomesticLoadResult")
+    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.addDomesticLoadResult(map);
+    }
+
+    @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,Integer resultType) {
+        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType);
+    }
+
+    @ApiOperation(value = "批量新增计量委托")
+    @PostMapping(value = "/batchSendMeasureCommission")
+    public Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.batchSendMeasureCommission(map);
+    }
+}

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

@@ -0,0 +1,306 @@
+package com.steerinfo.dil.controller;
+
+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.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+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.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 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 selfServiceMachineService;
+
+    @Autowired
+    UniversalMapper universalMapper;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+
+    @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 = selfServiceMachineService.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 + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.querySupplierByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.querySupplierByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, 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 + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.getSupplierMesByMaterialId(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getSupplierMesByMaterialId(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+
+    @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("/getAllCapacityByCarrierLike")
+    public RESTfulResult getAllCapacityByCarrierLike(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        String index
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index + "%");
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
+        return success(pageList);
+    }
+
+
+    @ApiOperation(value="通过订单ID查询订单下所有物资")
+    @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("/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);
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allCapacity = universalMapper.getMaterialMesByOrderId(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getMaterialMesByOrderId(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
+        return success(pageList);
+    }
+
+    @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 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 + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryAPOMaterialByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryAPOMaterialByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, 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){
+            mapValue.put("index", "%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.getUnloadingMesByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getUnloadingMesByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, 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,
+                                             String startNum) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(startNum != null){
+            mapValue.put("startNum", startNum + "%");
+        }
+        if(index != null){
+            mapValue.put("index", "%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryMaterialByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryMaterialByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, 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 + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.getBatchAndOrderMes(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getBatchAndOrderMes(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, 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("/getCarrierMesByLike")
+    public RESTfulResult getCarrierMesByLike(@RequestParam("index") String index) {
+        if(index != null){
+            if(index.length() == 0){
+                index = null;
+            }else {
+                index += "%";
+            }
+        }
+        List<Map<String, Object>> list = universalMapper.getCarrierMesByLike(index);
+        return success(list);
+    }
+}

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

@@ -0,0 +1,758 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.QMSFeign;
+import com.steerinfo.dil.feign.QmsTruckFeign;
+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.Date;
+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 = "90", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   String  con) {
+        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,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,
+                                                     String  con) {
+        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
+    }
+
+    @PostMapping("/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("/insertwmspOutboundScanResult")
+    public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
+        return resTfulResult;
+    }
+
+    @PostMapping("/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 con) {
+        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
+
+    }
+
+
+    //通过成品仓库网格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("/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 Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
+        return resTfulResult;
+    }
+
+    //下发倒垛单
+    @PostMapping("/dispatchDistrubtionStatus/{resultId}")
+    public Map<String, Object> dispatchDistrubtionStatus(@PathVariable Integer 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);
+    }
+
+    @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(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( Map<String, Object> mapValue,
+                                                           Integer apiId,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer inboundId,
+                                                           String con) {
+
+        return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId,con);
+    }
+   //根据物资信息获取原来垛位信息
+   @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(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(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(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(Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String  con) {
+        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    @PostMapping("/getSendReceive")
+    @ApiOperation(value = "展示收发存实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getSendReceive(Map<String, Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        String con) {
+        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+    }
+
+    /**
+     * 展示未下发吊钢工扫描吊牌实绩
+     *
+     * @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 List<Map<String, Object>> mapList) {
+        return wmsFeign.insertInboundResult(mapList);
+    }
+
+    /**
+     * 新增退库实绩
+     *
+     * @param mapList
+     * @return
+     */
+    @ApiOperation("新增退库实绩")
+    @PostMapping("/insertReboundResult")
+    @Transactional
+    public String addReboundResult(@RequestBody 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 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("/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(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);
+    }
+}

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

@@ -0,0 +1,139 @@
+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.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/12 9:54
+ * @Version:V2.0
+ */
+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("getLoadPortStockList")
+    @ApiOperation(value = "展示万州港港存库库存列表")
+    public RESTfulResult getLoadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getLoadPortStockList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    /**
+     * 查询所有港存库入库实绩
+     *
+     * @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("addResult")
+    @ApiOperation(value = "添加港存库出库实绩")
+    RESTfulResult addResult(@RequestBody Map<String, Object> map) {
+        return wmshFeign.addResult(map);
+    }
+}

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

@@ -0,0 +1,1238 @@
+package com.steerinfo.dil.feign;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+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 Integer pageNum,
+                                       @RequestParam Integer pageSize,
+                                       @RequestParam Integer apiId);
+
+
+
+    /**
+     * 下拉框
+     * @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 Integer pageNum,
+                                       @RequestParam Integer pageSize,
+                                       @RequestParam Integer apiId);
+    /**
+     *销售合同新增汽运单价
+     */
+    @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();
+    /**
+     * 获取线路编号
+     * @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 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);
+    /**
+     * 查询已上报销售订单信息
+     * @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(@RequestParam BigDecimal saleOrderId);
+    @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("carrierId") Integer carrierId);
+
+    /**
+     * 新增销售订单物资信息
+     * @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/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 Integer carrierId,
+                                         @RequestParam Integer planId);
+    /**
+     *新增用车需求
+     */
+    @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 con);
+
+    @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 Integer carrierId);
+
+    @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 con) ;
+
+    @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);
+}

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

@@ -0,0 +1,267 @@
+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-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();
+}

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,221 @@
+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("con") String con);
+
+    /**
+     * 展示汽运实绩信息
+     *
+     * @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("con") String con);
+
+    /**
+     * 生成销售汽运计费账单
+     *
+     * @param mapList
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/addTruckStatement")
+    RESTfulResult addTruckStatement(@RequestBody List<Map<String, Object>> mapList);
+
+    /**
+     * 展示账单下的详单
+     *
+     * @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,
+                                                        @RequestParam("con") String con);
+
+    /**
+     * 审核
+     *
+     * @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("con") String con);
+}

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

@@ -12,7 +12,7 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "192.168.1.241:8083")
+@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/OmsFeign.java

@@ -0,0 +1,356 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+import oracle.jdbc.proxy.annotation.Post;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+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("con")String con);
+
+    @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/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("con")      String con);
+    /**
+     * 展示承运商接收销售公司已接受的销售订单
+     * @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("apiId")      Integer apiId,
+                                            @RequestParam("pageNum")    Integer pageNum,
+                                            @RequestParam("pageSize")   Integer pageSize,
+
+                                            @RequestParam("orderType")  Integer orderType,
+                                            @RequestParam("orderStatus")Integer orderStatus,
+                                            @RequestParam("con")        String con,
+                                            @RequestParam("carrierId")  Integer carrierId
+    );
+
+    /**
+     * 销售司机派单
+     */
+
+    @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(@RequestParam Integer orderId);
+
+    @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);
+
+    @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 Integer carrierId,
+                                           @RequestParam String con);
+
+    // 分派计划
+    @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);
+}
+

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

@@ -0,0 +1,20 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-10-13 9:09
+ */
+@FeignClient(value = "DAL-TRICK-QMS-DEV",url = "${openfeign.OMSFeign.url}")
+public interface QMSFeign {
+    @RequestMapping(value = "/api/v1/queueTruck/qmsqueuegrids/getStackingId",method = RequestMethod.POST)
+    Map<String,Object> getStackingId(@RequestParam BigDecimal warehouseId,
+                                     @RequestParam int size);
+}

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

@@ -0,0 +1,193 @@
+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.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/1 17:19
+ */
+
+@FeignClient(name = "dil-trick-queue-dev", url = "${openfeign.QmsTruckFeign.url}")
+public interface QmsTruckFeign {
+
+    /*
+    QmsQueueResultController /  QmsQueueListController
+     */
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
+    public Map<String, Object> addQueueResult(@RequestBody(required = false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
+    public Map<String, Object> addQueueList(@RequestBody(required = false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
+    public 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")
+    public 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/getAllQueueMes")
+    public 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/qmsqueueresults/getQueueListByQueueUp")
+    public Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     @RequestParam("apiId") Integer apiId,
+                                                     @RequestParam("pageNum") Integer pageNum,
+                                                     @RequestParam("pageSize") Integer pageSize,
+                                                     @RequestParam("gridId") Integer gridId,
+                                                     @RequestParam("con")String con
+    );
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/changeQueue")
+    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getChangeQueue")
+    public 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")
+    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancel")
+    public 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/getQueueCancelByResultId/{resultId}")
+    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateQueueCancel")
+    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCutInLine")
+    public Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueInsert")
+    public 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")
+    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueEndResult")
+    public 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/qmsqueueresults/capacityMonitor")
+    public 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/qmsqueuelists/listMonitor")
+    public Map<String, Object> listMonitor(@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/getQueueStatusList")
+    public Map<String, Object> getQueueStatusList();
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getOrderReceive/{capacityNumber}")
+    public Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/cancelQueue")
+    public Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllExecutionOrder")
+    public 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
+    );
+}

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

@@ -0,0 +1,412 @@
+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.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 = "根据主键查询出数据以供修改")
+    @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/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/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);
+
+    //根据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/updateTruckCalculate")
+    Map<String, Object> updateTruckCalculate(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);
+    //模糊查询汽车衡
+    @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/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);
+
+
+    //******************************************下拉框*******************************
+    @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);
+
+
+//******************************************下拉框*******************************
+
+
+    //公告下拉框,须摸清实现原理
+    @GetMapping(value = "api/v1/rms/dilnotices/getNoticeTypeId")
+    Map<String,Object> getNoticeTypeId();
+
+
+}

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

@@ -0,0 +1,256 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+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;
+
+/**
+ * @ 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("con") String con);
+
+
+    @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);
+
+    //下拉框
+
+    @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);
+
+    /*
+        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/addDomesticLoadResult")
+    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @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
+                                               );
+
+    @ApiOperation(value = "批量新增计量委托")
+    @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
+    Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
+
+}

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

@@ -0,0 +1,344 @@
+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.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);
+
+    @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);
+
+    @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("con")      String con
+    );
+    @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")
+    public 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
+                                                 );
+
+    @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);
+
+    @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
+    );
+
+    @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/tmstruckreceiptresults/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);
+
+    /*
+    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
+    );
+
+    @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/{type}")
+    public Map<String, Object> getAllMeasureCommission(@PathVariable("type") Integer type);
+
+
+    /*
+    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);
+
+
+    @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);
+
+    @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);
+
+}
+
+

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

@@ -0,0 +1,763 @@
+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;
+
+/**
+ * @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,
+                                              @RequestParam String con);
+
+    /**
+     * 查询驳船作业信息
+     *
+     * @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 Integer pageNum,
+                                  @RequestParam Integer pageSize,
+                                  @RequestParam Integer apiId,
+                                        @RequestParam String con);
+
+    /**
+     * 查询装船作业表单
+     *
+     * @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 map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/addLoadShip")
+    Map<String, Object> addLoadShip(@RequestBody Map<String, Object> map);
+
+    /**
+     * 展示位置作业信息列表
+     *
+     * @param mapValue
+<<<<<<< HEAD
+     * @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);
+
+
+    /**
+     * 查询位置作业信息
+     *
+     * @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 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 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 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/updateIssueStatus/{shipmentInstructionsId}")
+    Map<String, Object> updateIssueStatus(@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,
+                                     @RequestParam String con);
+
+
+
+    @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);
+
+    //获取船运物资id
+    @GetMapping("/api/v1/shipTms/amsshipcargotransferresults/getMaterialId")
+    Map<String,Object> getMaterialId();
+
+    /**
+     * 展示货权转移
+     *
+     * @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,
+                                                         @RequestParam String con);
+    @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 String con,
+                                                 @RequestParam Integer status);
+
+    /**
+     * 新增提货委托
+     *
+     * @param amsshipDeliveryAttorney
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/insertshipDeliveryAttorney")
+    Map<String, Object> insertshipDeliveryAttorney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
+
+    /**
+     * 逻辑删除提货委托
+     *
+     * @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 String con,
+                                            @RequestParam Integer  status);
+
+    /**
+     * 新增放货通知
+     *
+     * @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/selectAll")
+    Map<String, Object> selectAll();
+
+    //    模糊查询江船名
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
+    Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
+
+}

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

@@ -0,0 +1,612 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+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 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 String con);
+
+    /**
+     * 新增出库实绩
+     * @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);
+
+    /**
+     * 装卸工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 con);
+
+    /**
+     *  通过成品仓库网格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 Integer resultId);
+
+    /**
+     * 下发倒垛单pc端
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/dispatchDistrubtionStatus/{resultId}")
+    Map<String,Object> dispatchDistrubtionStatus(@PathVariable Integer 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
+                                                  );
+    /**
+     *  修改倒垛单
+     * @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 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/inboundResult/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,
+                                                   @RequestParam String con);
+    //根据物资信息查找暂存的垛位
+    @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 con);
+
+    /**
+     * 收发存报表
+     */
+    @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);
+
+    /**
+     * 展示未下发吊钢工扫描吊牌实绩
+     * @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);
+
+}
+

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

@@ -0,0 +1,126 @@
+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);
+
+    /**
+     * 查询所有港存库入库实绩
+     *
+     * @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);
+
+}

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

@@ -0,0 +1,49 @@
+package com.steerinfo.dil.mapper;
+
+import org.mapstruct.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 通用接口
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:03
+ */
+
+@Mapper
+public interface UniversalMapper {
+    //通过运输订单号查询订单信息
+    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>> 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);
+
+}

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

@@ -0,0 +1,18 @@
+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);
+}

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

@@ -0,0 +1,49 @@
+package com.steerinfo.dil.service.impl;
+import com.steerinfo.dil.mapper.UniversalMapper;
+import com.steerinfo.dil.service.UniversalService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:05
+ */
+
+@Service
+public class UniversalServiceImpl implements UniversalService {
+
+    @Resource
+    private UniversalMapper universalMapper;
+    /**
+     * 打印提货单
+     * @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;
+    }
+
+
+}

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>> list, List<Map<String,Object>> data) {
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条件
+            columnData.put("filters", setListMap(list, columnData.get("prop").toString()));
+        }
+        PageListAdd pageList = new PageListAdd(data);
+        pageList.setColumnData(columnDataList);
+        return pageList;
+    }
+}

src/main/resources/application-dev.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: DIL0901
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: [name]
+    name: dil-api
 

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: DIL0901
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: [name]
+    name: dil-api

src/main/resources/bootstrap.yml

@@ -1,3 +1,4 @@
+api.version: api/v1
 spring:
   application:
     name: dil-dazhou-service
@@ -19,13 +20,16 @@ spring:
       trace:
         enabled: false
       enabled: false
-server:
-  port: 80
+
 eureka:
   client:
-    serviceUrl:
-        defaultZone: http://root:root@${EUREKA_HOST:localhost}:${EUREKA_PORT:8061}/eureka/
-#      defaultZone: http://root:root@http://172.16.2.149:32101/eureka/
+    service-url:
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
+    instance:
+      prefer-ip-address: true
+      status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
+      instance-id: ${spring.cloud.client.ip-address}:${server.port}
+
     metadata-map:
       cluster: ribbon
   instance:
@@ -49,4 +53,65 @@ feign:
     config:
       default:
         connect-timeout: 5000
-        read-timeout: 10000
+        read-timeout: 10000
+
+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_HRL:172.16.33.166:8060}
+
+genxml:
+  pth: com/a
+cache:
+  level: 2
+redis:
+  host: 10.10.50.28
+  port: 6379
+  pwd: 123456
+  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
+server:
+  port: 8080
+
+

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

@@ -0,0 +1,381 @@
+<?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">
+    <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 DISTINCT 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
+                    LEFT JOIN DIL_BATCH DB
+                        ON DB.BATCH_ID = APO.BATCH_ID
+                    LEFT JOIN RMS_MATERIAL RM
+                        ON RM.MATERIAL_ID = DB.MATERIAL_ID
+                <where>
+                    <if test="index != null">
+                        RM.MATERIAL_NAME LIKE #{index}
+                    </if>
+                </where>
+        )
+        <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="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",
+                        RC.CAPACITY_NUMBER     "capacityNumber",
+                        RCA.CARRIER_NAME       "carrierName"
+                 FROM RMS_CAPACITY RC
+                          LEFT JOIN RMS_CARRIER RCA
+                                    ON RCA.CARRIER_ID = RC.CARRIER_ID
+                 WHERE RC.CAPACITY_STATUS = 0 AND RC.CAPACITY_TYPE_ID = 1
+                   <if test="index != null">
+                       and RCA.CARRIER_NAME LIKE #{index}
+                   </if>
+                   <if test="index == null">
+                       and rownum &lt; 21
+                   </if>
+             )
+    </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 OOM.ORDER_ID = #{orderId}
+             )
+        <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>
+
+<!--  通过物资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
+                          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>
+                    <if test="materialId != null">
+                        DB.MATERIAL_ID = #{materialId}
+                    </if>
+                 </where>
+             )
+        <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>
+                     <if test="type != null">
+                         RW.WAREHOUSE_TYPE_ID = #{type}
+                     </if>
+                 </where>
+             )
+        <where>
+            <if test="index != null">
+                "warehouseName" like #{index}
+            </if>
+            <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>
+            <if test="startNum != null">
+                RM.MATERIAL_CODE LIKE #{startNum}
+            </if>
+            <if test="startNum == null">
+                RM.MATERIAL_CODE LIKE '010%' OR RM.MATERIAL_CODE LIKE '0801%'
+            </if>
+        </where>
+        )
+        <where>
+            <if test="index != null">
+                "materialName" LIKE #{index}
+            </if>
+            <if test="materialName != null">
+                and
+                <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"
+                 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">
+                         "resultForeignShipName" like #{index}
+                     </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
+        *
+        from(
+        select
+            RC.CARRIER_ID "carrierId",
+            RC.CARRIER_NAME "carrierName"
+        from RMS_CARRIER RC
+        order by "carrierName"
+        )
+        <where>
+            <if test="index != null">
+                "carrierName"  like #{index}
+            </if>
+            <if test="index == null">
+                rownum &lt; 10
+            </if>
+        </where>
+    </select>
+</mapper>