Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev

pom.xml

@@ -105,9 +105,9 @@
                 <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>
+                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
+                    <user>dil</user>
+                    <password>Dil123789</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>

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

@@ -9,6 +9,7 @@ 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.*;
 
@@ -46,11 +47,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             Integer apiId) {
+                                             Integer apiId,
+                                             String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getDetailsOrderList(mapValue, pageNum, pageSize, apiId);
+        return bmsshipFeign.getDetailsOrderList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getBatch")
@@ -58,11 +60,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getBatch(@RequestBody(required = false) Map<String, Object> mapValue,
                                   Integer pageNum,
                                   Integer pageSize,
-                                  Integer apiId) {
+                                  Integer apiId,
+                                  String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getBatch(mapValue, pageNum, pageSize, apiId);
+        return bmsshipFeign.getBatch(mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("getPortHandlingFeeList")
@@ -70,11 +73,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getPortHandlingFeeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                 Integer pageNum,
                                                 Integer pageSize,
-                                                Integer apiId) {
+                                                Integer apiId,
+                                                String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getPortHandlingFeeList(mapValue, pageNum, pageSize, apiId);
+        return bmsshipFeign.getPortHandlingFeeList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("addPortHandlingFee")
@@ -106,11 +110,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                        Integer pageNum,
                                                        Integer pageSize,
-                                                       Integer apiId) {
+                                                       Integer apiId,
+                                                       String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getUncomplateDetailsOrderList(mapValue, pageNum, pageSize, apiId);
+        return bmsshipFeign.getUncomplateDetailsOrderList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("addDetailsOrder/{resultId}")
@@ -124,11 +129,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          Integer apiId) {
+                                          Integer apiId,
+                                          String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getStatementList(mapValue, pageNum, pageSize, apiId);
+        return bmsshipFeign.getStatementList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getLossStatementList")
@@ -136,11 +142,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getLossStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              Integer apiId) {
+                                              Integer apiId,
+                                              String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getLossStatementList(mapValue, pageNum, pageSize, apiId);
+        return bmsshipFeign.getLossStatementList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getWaterResult")
@@ -176,15 +183,16 @@ public class BMSController extends BaseRESTfulController {
     @PostMapping("getStatementDetailsOrderList")
     @ApiOperation(value = "展示账单下的详单")
     public RESTfulResult getStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                      BigDecimal batchId,
+                                                      Integer batchId,
                                                       Integer pageNum,
                                                       Integer pageSize,
                                                       Integer apiId,
-                                                      BigDecimal statementId) {
+                                                      Integer statementId,
+                                                      String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmsshipFeign.getStatementDetailsOrderList(batchId, mapValue, pageNum, pageSize, apiId,statementId);
+        return bmsshipFeign.getStatementDetailsOrderList(new BigDecimal(batchId), mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId), con);
     }
 
     @PostMapping("getShipResult")
@@ -223,11 +231,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getTrainDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                   Integer pageNum,
                                                   Integer pageSize,
-                                                  Integer apiId) {
+                                                  Integer apiId,
+                                                  String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstrainFeign.getTrainDetailsOrderList(mapValue, pageNum, pageSize, apiId);
+        return bmstrainFeign.getTrainDetailsOrderList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getUncomplateTrainDetailsList")
@@ -235,11 +244,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getUncomplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                        Integer pageNum,
                                                        Integer pageSize,
-                                                       Integer apiId) {
+                                                       Integer apiId,
+                                                       String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstrainFeign.getUncomplateTrainDetailsList(mapValue, pageNum, pageSize, apiId);
+        return bmstrainFeign.getUncomplateTrainDetailsList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getTrainResultList")
@@ -265,11 +275,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
+                                               Integer apiId,
+                                               String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstrainFeign.getTrainStatementList(mapValue, pageNum, pageSize, apiId);
+        return bmstrainFeign.getTrainStatementList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getStatementTrainResultList")
@@ -287,16 +298,17 @@ public class BMSController extends BaseRESTfulController {
 
     @PostMapping("getComplateTrainDetailsList")
     @ApiOperation(value = "展示账单下的详单")
-    public RESTfulResult getComplateTrainDetailsList(BigDecimal batchId,
+    public RESTfulResult getComplateTrainDetailsList(Integer batchId,
                                                      @RequestBody(required = false) Map<String, Object> mapValue,
                                                      Integer pageNum,
                                                      Integer pageSize,
                                                      Integer apiId,
-                                                     BigDecimal statementId) {
+                                                     Integer statementId,
+                                                     String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstrainFeign.getComplateTrainDetailsList(batchId,mapValue, pageNum, pageSize, apiId,statementId);
+        return bmstrainFeign.getComplateTrainDetailsList(new BigDecimal(batchId), mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId), con);
     }
 
     @PostMapping("addTrainStatement")
@@ -304,8 +316,8 @@ public class BMSController extends BaseRESTfulController {
     RESTfulResult addTrainStatement(@RequestBody List<Map<String, Object>> mapList) {
         return bmstrainFeign.addTrainStatement(mapList);
     }
-  
-      @ApiModelProperty(value = "展示销售火运结算列表")
+
+    @ApiModelProperty(value = "展示销售火运结算列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
@@ -315,11 +327,12 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getSettlementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer apiId) {
+                                           Integer apiId,
+                                           String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstrainFeign.getSettlementList(mapValue, pageNum, pageSize, apiId);
+        return bmstrainFeign.getSettlementList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     @ApiModelProperty(value = "新增销售火运结算")
@@ -327,7 +340,7 @@ public class BMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "bmstrainSettlement", value = "销售火运结算实体", required = false, dataType = "BmstrainSettlement"),
     })
     @PostMapping("/addTrainSettlement")
-    public Map<String,Object> addTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
+    public Map<String, Object> addTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
         return bmstrainFeign.addTrainSettlement(bmstrainSettlement);
     }
 
@@ -336,7 +349,7 @@ public class BMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "bmstrainSettlement", value = "销售火运结算实体", required = false, dataType = "BmstrainSettlement"),
     })
     @PostMapping("/updateTrainSettlement")
-    public Map<String,Object> updateTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
+    public Map<String, Object> updateTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
         return bmstrainFeign.updateTrainSettlement(bmstrainSettlement);
     }
 
@@ -345,7 +358,7 @@ public class BMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "settlementId", value = "结算id", required = false, dataType = "BigDecimal"),
     })
     @PostMapping("/deleteTrainSettlement/{settlementId}")
-    public Map<String,Object> deleteTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId) {
+    public Map<String, Object> deleteTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId) {
         return bmstrainFeign.deleteTrainSettlement(settlementId);
     }
 
@@ -354,7 +367,7 @@ public class BMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "settlementId", value = "结算id", required = false, dataType = "BigDecimal"),
     })
     @PostMapping("/selectTrainSettlement/{settlementId}")
-    public Map<String,Object> selectTrainSettlement(@PathVariable("settlementId") Integer settlementId) {
+    public Map<String, Object> selectTrainSettlement(@PathVariable("settlementId") Integer settlementId) {
         return bmstrainFeign.selectTrainSettlement(new BigDecimal(settlementId));
     }
 
@@ -364,11 +377,12 @@ public class BMSController extends BaseRESTfulController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId,
-                                                  Integer orderType) {
+                                                  Integer orderType,
+                                                  String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType);
+        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType, con);
     }
 
     @PostMapping("getTruckResultList")
@@ -387,56 +401,60 @@ public class BMSController extends BaseRESTfulController {
     @PostMapping("getTruckStatementList")
     @ApiOperation(value = "展示汽运账单信息")
     public RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer apiId) {
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId);
+        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) {
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer apiId,
+                                        String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getInvoiceList(mapValue, pageNum, pageSize, apiId);
+        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) {
+                                                               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));
+        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) {
+                                                            Integer pageNum,
+                                                            Integer pageSize,
+                                                            Integer apiId,
+                                                            Integer orderType,
+                                                            String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getUnFinishedTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType);
+        return bmstruckFeign.getUnFinishedTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType, con);
     }
 
     @PostMapping("addBmstruckInvoice")
     @ApiOperation(value = "新增发票")
-    RESTfulResult addBmstruckInvoice(@RequestBody Map<String,Object> mapVal) {
+    RESTfulResult addBmstruckInvoice(@RequestBody Map<String, Object> mapVal) {
         return bmstruckFeign.addBmstruckInvoice(mapVal);
     }
 
@@ -445,7 +463,7 @@ public class BMSController extends BaseRESTfulController {
     RESTfulResult updateBmstruckCheck(@RequestParam Integer statementId,
                                       @RequestParam Integer status,
                                       @RequestParam Integer person) {
-        return bmstruckFeign.updateBmstruckCheck(new BigDecimal(statementId),status,person);
+        return bmstruckFeign.updateBmstruckCheck(new BigDecimal(statementId), status, person);
     }
 
     @PostMapping("getSmallTruckFormula")
@@ -462,7 +480,7 @@ public class BMSController extends BaseRESTfulController {
 
     @PostMapping("addTruckStatement")
     @ApiOperation(value = "新增汽运详单")
-    RESTfulResult addTruckStatement(@RequestBody List<Map<String,Object>> mapList) {
+    RESTfulResult addTruckStatement(@RequestBody List<Map<String, Object>> mapList) {
         return bmstruckFeign.addTruckStatement(mapList);
     }
 
@@ -471,8 +489,10 @@ public class BMSController extends BaseRESTfulController {
     RESTfulResult addTruckDetailsOrder(@PathVariable("orderId") BigDecimal orderId) {
         return bmstruckFeign.addTruckDetailsOrder(orderId);
     }
+
     /**
      * 展示汽运未生成账单的详单信息
+     *
      * @param mapVal
      * @param pageNum
      * @param pageSize
@@ -484,10 +504,10 @@ public class BMSController extends BaseRESTfulController {
             @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")
+            @ApiImplicitParam(name = "orderType", value = "1:计时,2:计数，3：计重，4：包月", required = false, dataType = "Integer")
     })
     @PostMapping("/getUnFinishedConvertedTruckDetailsOrderList")
-    public RESTfulResult getUnFinishedConvertedTruckDetailsOrderList(@RequestBody(required = false) Map<String,Object> mapVal,
+    public RESTfulResult getUnFinishedConvertedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapVal,
                                                                      Integer pageNum,
                                                                      Integer pageSize,
                                                                      Integer apiId,
@@ -505,6 +525,7 @@ public class BMSController extends BaseRESTfulController {
 
     /**
      * 生成内转汽运账单
+     *
      * @param mapList
      * @return
      */
@@ -515,12 +536,13 @@ public class BMSController extends BaseRESTfulController {
     }
 
     /**
-     *删除汽运账单
+     * 删除汽运账单
      */
     @PostMapping("/deleteConvertedTruckStatement/{statementId}")
     public RESTfulResult deleteConvertedTruckStatement(@PathVariable("statementId") BigDecimal statementId) {
         return bmstruckFeign.delete(statementId);
     }
+
     /**
      * 审批计费账单
      */

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

@@ -264,7 +264,9 @@ public class OMSController {
                                                                  @RequestParam Integer pageSize) {
         return omsFeign.getWaterSlagDayPlanAndRecivedList(carrierId, apiId, pageNum, pageSize);
     }
-
-
+    @PostMapping("/selectNewOrderId")
+    public Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map){
+        return omsFeign.selectNewOrderId(map);
+    }
 
 }

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

@@ -0,0 +1,298 @@
+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;
+    @ApiOperation(value="展示司机信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(218)", 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("/getCarDriverList")
+    public Map<String, Object> getCarDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize
+    ){
+        return   rmsFeign.getCarDriverList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="创建", notes="根据RmsCarDriver对象创建")
+    @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
+    //@RequiresPermissions("rmscardriver:create")
+    @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/{id}")
+//    RESTfulResult updateCarDriver(@PathVariable("id") String id) {
+//        return rmsFeign.updateCarDriver(id);
+//    }
+    @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="获取承运商列表")
+    @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
+    ){
+        return   rmsFeign.getCarrierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+    @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="获取物资列表")
+    @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
+    ){
+        return   rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+    @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="获取人员信息列表")
+    @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> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize
+    ){
+        return   rmsFeign.getPersonnelList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+    @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="根据rmsCarrier对象创建")
+    @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="获取承运商列表")
+    @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
+    ){
+        return   rmsFeign.getShipperList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+    @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);
+    }
+    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @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="展示供应商信息")
+    @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
+    ){
+        return   rmsFeign.getSupplierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="新增供应商信息", notes="根据rmsShipper对象创建")
+    @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="根据rmsCarrier对象创建")
+    @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="展示运力信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(219)", 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("/getCapacityList")
+    public Map<String, Object> getCapacityList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize
+    ){
+        return   rmsFeign.getCapacityList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+    @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="展示汽车衡列表")
+    @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("/getTruckCalculateList")
+    public Map<String, Object> getTruckCalculateList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize
+    ){
+        return   rmsFeign.getTruckCalculateList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+    @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="分页查询")
+    @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 = "/getWarehouseList")
+    public Map<String, Object> getWarehouseList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize
+    ){
+        return   rmsFeign.getWarehouseList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+    @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);
+    }
+    //*******************************下拉框************************
+    @GetMapping("getCapacityId")
+    @ApiOperation(value = "得到下拉运力id")
+    public Map<String, Object> getCapacityId() {
+        return rmsFeign.getCapacityId();
+    }
+
+
+}

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

@@ -641,7 +641,11 @@ public class TMSController extends BaseRESTfulController {
     Map<String, Object> sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId) {
         return tmsshipFeign.sendDeliveryNotice(noticeId);
     }
-
+    //船舶动态表
+    @PostMapping("/selectAll")
+    Map<String, Object> selectAll(){
+        return tmsshipFeign.selectAll();
+    }
 
     /**
      * 下拉框
@@ -1629,4 +1633,6 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> updateTruckCalculate(@PathVariable("orderId") Integer orderId) {
         return tmsTruckFeign.isNextNeedJl(orderId);
     }
+
+
 }

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

@@ -30,7 +30,8 @@ public interface BmsshipFeign {
     RESTfulResult getPortHandlingFeeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                          @RequestParam("pageNum") Integer pageNum,
                                          @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("apiId") Integer apiId);
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("con") String con);
 
     /**
      * 展示批次信息
@@ -45,7 +46,8 @@ public interface BmsshipFeign {
     RESTfulResult getBatch(@RequestBody(required = false) Map<String, Object> mapValue,
                            @RequestParam("pageNum") Integer pageNum,
                            @RequestParam("pageSize") Integer pageSize,
-                           @RequestParam("apiId") Integer apiId);
+                           @RequestParam("apiId") Integer apiId,
+                           @RequestParam("con") String con);
 
     /**
      * 生成港口装卸费
@@ -96,7 +98,8 @@ public interface BmsshipFeign {
     RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,
-                                      @RequestParam("apiId") Integer apiId);
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("con") String con);
 
     /**
      * 展示未生成账单的详单信息
@@ -111,7 +114,8 @@ public interface BmsshipFeign {
     RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                 @RequestParam("pageNum") Integer pageNum,
                                                 @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("apiId") Integer apiId);
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("con") String con);
 
     /**
      * 生成水运计费详单
@@ -137,7 +141,8 @@ public interface BmsshipFeign {
     RESTfulResult getStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                    @RequestParam("pageNum") Integer pageNum,
                                    @RequestParam("pageSize") Integer pageSize,
-                                   @RequestParam("apiId") Integer apiId);
+                                   @RequestParam("apiId") Integer apiId,
+                                   @RequestParam("con") String con);
 
     /**
      * 展示途损费账单信息
@@ -152,7 +157,8 @@ public interface BmsshipFeign {
     RESTfulResult getLossStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam("pageNum") Integer pageNum,
                                        @RequestParam("pageSize") Integer pageSize,
-                                       @RequestParam("apiId") Integer apiId);
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("con") String con);
 
     /**
      * 展示水分质检实绩
@@ -215,7 +221,8 @@ public interface BmsshipFeign {
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
                                                @RequestParam("apiId") Integer apiId,
-                                               @RequestParam BigDecimal statementId);
+                                               @RequestParam("statementId") BigDecimal statementId,
+                                               @RequestParam("con") String con);
 
     /**
      * 展示详单下的船运实绩

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

@@ -33,7 +33,8 @@ public interface BmstrainFeign {
     RESTfulResult getTrainDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("apiId") Integer apiId);
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("con") String con);
 
     /**
      * 展示未转账单的火运详单
@@ -48,7 +49,8 @@ public interface BmstrainFeign {
     RESTfulResult getUncomplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                 @RequestParam("pageNum") Integer pageNum,
                                                 @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("apiId") Integer apiId);
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("con") String con);
 
     /**
      * 展示火运实绩
@@ -87,7 +89,8 @@ public interface BmstrainFeign {
     RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("apiId") Integer apiId);
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("con") String con);
 
     /**
      * 展示火运实绩
@@ -115,12 +118,13 @@ public interface BmstrainFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getComplateTrainDetailsList")
-    RESTfulResult getComplateTrainDetailsList(@RequestParam BigDecimal batchId,
+    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("statementId") BigDecimal statementId,
+                                              @RequestParam("con") String con);
 
     /**
      * 生成火运费账单
@@ -141,9 +145,10 @@ public interface BmstrainFeign {
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/getSettlementList")
     RESTfulResult getSettlementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                    @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize,
-                                    @RequestParam Integer apiId);
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("con") String con);
 
     /**
      * 新增火运结算

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

@@ -31,7 +31,8 @@ public interface BmstruckFeign {
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("orderType") Integer orderType);
+                                           @RequestParam("orderType") Integer orderType,
+                                           @RequestParam("con") String con);
 
     /**
      * 展示汽运实绩信息
@@ -116,7 +117,8 @@ public interface BmstruckFeign {
     RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("apiId") Integer apiId);
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("con") String con);
 
     /**
      * 生成销售汽运计费账单
@@ -142,10 +144,12 @@ public interface BmstruckFeign {
                                                         @RequestParam("pageNum") Integer pageNum,
                                                         @RequestParam("pageSize") Integer pageSize,
                                                         @RequestParam("apiId") Integer apiId,
-                                                        @RequestParam("statementId") BigDecimal statementId);
+                                                        @RequestParam("statementId") BigDecimal statementId,
+                                                        @RequestParam("con") String con);
 
     /**
      * 审核
+     *
      * @param statementId
      * @param status
      * @param person
@@ -158,6 +162,7 @@ public interface BmstruckFeign {
 
     /**
      * 查询销售汽运离100KM差距10KM内计费公式
+     *
      * @return
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckformulas/getSmallTruckFormula")
@@ -165,6 +170,7 @@ public interface BmstruckFeign {
 
     /**
      * 查询销售汽运离100KM差距10KM外计费公式
+     *
      * @return
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckformulas/getBigTruckFormula")
@@ -172,6 +178,7 @@ public interface BmstruckFeign {
 
     /**
      * 展示发票
+     *
      * @param mapValue
      * @param pageNum
      * @param pageSize
@@ -182,10 +189,12 @@ public interface BmstruckFeign {
     RESTfulResult getInvoiceList(@RequestBody(required = false) Map<String, Object> mapValue,
                                  @RequestParam("pageNum") Integer pageNum,
                                  @RequestParam("pageSize") Integer pageSize,
-                                 @RequestParam("apiId") Integer apiId);
+                                 @RequestParam("apiId") Integer apiId,
+                                 @RequestParam("con") String con);
 
     /**
      * 新增发票
+     *
      * @param mapVal
      * @return
      */
@@ -194,6 +203,7 @@ public interface BmstruckFeign {
 
     /**
      * 展示汽运未生成账单的详单信息
+     *
      * @param mapValue
      * @param pageNum
      * @param pageSize
@@ -203,8 +213,9 @@ public interface BmstruckFeign {
      */
     @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("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/OmsFeign.java

@@ -138,5 +138,9 @@ public interface OmsFeign {
                                                          @RequestParam Integer apiId,
                                                          @RequestParam Integer pageNum,
                                                          @RequestParam Integer pageSize);
+
+    //通过物资id查询批次表匹配最新的批次，关联最新的采购订单号
+    @PostMapping("api/v1/oms/omstruckorders/selectNewOrderId")
+    Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map);
 }
 

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

@@ -121,18 +121,18 @@ public interface QmsTruckFeign {
 
     @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("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
                                                @RequestParam("gridType") Integer gridType
     );
 
 
     @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("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize
     );
 
 

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

@@ -0,0 +1,136 @@
+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;
+
+@FeignClient(value = "DIL-RMS-API-DEV", url = "${openfeign.RmsFeign.url}")
+public interface RmsFeign {
+    //展示司机信息
+    @PostMapping(value = "api/v1/rms/rmscardriver/getCarDriverList")
+    Map<String,Object> getCarDriverList  (@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize
+
+                                           );
+    //新增司机信息
+    @PostMapping(value = "api/v1/rms/rmscardriver/insertCarDriver")
+    Map<String, Object> insertCarDriver(@RequestBody(required = false) Map<String, Object> map);
+    //删除司机信息
+    @PostMapping(value = "api/v1/rms/rmscardriver/deleteCarDriver/{id}")
+    Map<String, Object> deleteCarDriver(@PathVariable("id") BigDecimal id);
+    //获取托运人列表
+    @PostMapping(value = "api/v1/rms/rmscarriers/getCarrierList")
+    Map<String,Object>     getCarrierList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize
+
+    );
+    //新增托运人
+    @PostMapping(value = "api/v1/rms/rmscardriver/insertCarrier")
+    Map<String, Object> insertCarrier(@RequestBody(required = false) Map<String, Object> map);
+    //删除托运人
+    @PostMapping(value = "api/v1/rms/rmscardriver/deleteCarrier/{id}")
+    Map<String, Object> deleteCarrier(@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
+
+    );
+    //新增物资
+    @PostMapping(value = "api/v1/rms/rmsmaterial/insertMaterial")
+    Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map);
+    //删除物资
+    @PostMapping(value = "api/v1/rms/rmscardriver/deleteMaterial/{id}")
+    Map<String, Object> deleteMaterial(@PathVariable("id") BigDecimal id);
+    //获得人员列表
+    @PostMapping(value = "api/v1/rms/rmspersonnel/getPersonnelList")
+    Map<String,Object>   getPersonnelList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize
+
+    );
+    @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/rmsshippers/getShipperList")
+    Map<String,Object>   getShipperList (@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize
+
+    );
+    //新增承运商信息
+    @PostMapping(value = "api/v1/rms/rmsshippers/insertShipper")
+    Map<String, Object> insertShipper(@RequestBody(required = false) Map<String, Object> map);
+    //删除承运商
+    @PostMapping(value = "api/v1/rms/rmsshippers/deleteShipper/{id}")
+    Map<String, Object> deleteShipper(@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
+
+    );
+    //新增供应商信息
+    @PostMapping(value = "api/v1/rms/rmsshippers/insertSupplier")
+    Map<String, Object> insertSupplier(@RequestBody(required = false) Map<String, Object> map);
+    //删除承运商
+    @PostMapping(value = "api/v1/rms/rmsshippers/deleteSupplier/{id}")
+    Map<String, Object> deleteSupplier(@PathVariable("id") BigDecimal id);
+    @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityList")
+    Map<String,Object>   getCapacityList (@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize
+
+    );
+    //新增运力
+    @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/rmstruckcalculate/getTruckCalculateList")
+    Map<String,Object>   getTruckCalculateList (@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("pageNum") Integer pageNum,
+                                                @RequestParam("pageSize") Integer pageSize
+    );
+    //新增汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculate")
+    Map<String, Object> insertTruckCalculate(@RequestBody(required = false) Map<String, Object> map);
+    //根据id删除汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculate/{id}")
+    Map<String, Object> deleteTruckCalculate(@PathVariable("id") BigDecimal id);
+
+    @PostMapping(value = "api/v1/rms/rmswarehouse/getWarehouseList")
+    Map<String,Object>   getWarehouseList (@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize
+    );
+    //新增仓库
+    @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);
+    //******************************************下拉框*******************************
+    @GetMapping(value = "/api/v1/rms/rmscapacity/getCapacityId")
+    Map<String, Object> getCapacityId();
+
+}

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

@@ -262,6 +262,8 @@ public interface TmsTruckFeign {
      */
     @PostMapping("api/v1/truckTms/tmstruckweightresults/{orderId}")
     Map<String,Object> isNextNeedJl(@PathVariable("orderId") Integer orderId);
+
+
 }
 
 

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

@@ -729,7 +729,8 @@ public interface TmsshipFeign {
     @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();
 
 }

src/main/resources/bootstrap.yml

@@ -48,6 +48,8 @@ openfeign:
     url: ${WMSFEIGN_URL:localhost:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
+  RmsFeign:
+    url: ${RMSFEIGN_HRL:localhost:8060}
 
 
 genxml: