修改

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

@@ -1112,4 +1112,40 @@ public class RMScontroller {
     public Map<String, Object> getCapacityInfoById(@PathVariable("id") Integer id){
         return rmsFeign.getCapacityInfoById(id);
     }
+
+   //获取货权转移送达单位列表
+    @PostMapping(value = "/getCargoDep")
+    public Map<String,Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     Integer apiId,
+                                     Integer pageNum,
+                                     Integer pageSize,
+                                     String con){
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return rmsFeign.getCargoDep(mapValue,apiId,pageNum,pageSize,con);
+    }
+    //删除货权转移送达单位
+    @PostMapping(value = "/deleteCargoDep")
+    public Map<String, Object> deleteCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.deleteCargoDep(map);
+    }
+    @PostMapping(value = "/getCargoDepById/{id}")
+    public Map<String,Object> getCargoDepById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getCargoDepById(id);
+    }
+
+    //更新货权转移送达单位
+    @PostMapping(value = "/updateCargoDep")
+    public Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.updateCargoDep(map);
+    }
+
+    //新增货权转移送达单位
+    @PostMapping(value = "/insertCargoDep")
+    public Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.insertCargoDep(map);
+    }
+
+
 }

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

@@ -970,6 +970,16 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getUnloadingPointName();
     }
 
+
+    //下拉框
+    @ApiOperation(value = "获取货权转移图片")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/downLoadDeilveryNotice")
+    public Map<String, Object> downLoadDeilveryNotice(@RequestParam Integer noticeId) {
+        return tmsshipFeign.downLoadDeilveryNotice(noticeId);
+    }
+
     @ApiOperation(value = "获取卸车路径名称")
     @ApiImplicitParams({
     })
@@ -1941,9 +1951,10 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageSize,
                                                String startTime,
                                                String endTime,
-                                               Integer orderType
+                                               Integer orderType,
+                                               String con
     ){
-        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
+        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType,con);
     }
     @ApiOperation(value="查询销售统计报表")
     @PostMapping("/getAllSaleReport")

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

@@ -608,4 +608,23 @@ public interface RmsFeign {
 
     @PostMapping("api/v1/rms/rmscapacity/getCapacityInfoById/{id}")
     Map<String,Object> getCapacityInfoById(@PathVariable("id") Integer id);
+
+    @PostMapping("api/v1/rms/rmscargodeps/getCargoDep")
+    Map<String, Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("con") String con);
+
+    @PostMapping("api/v1/rms/rmscargodeps/deleteCargoDep")
+    Map<String,Object> deleteCargoDep(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/updateCargoDep")
+    Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/insertCargoDep")
+    Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/getCargoDepById/{id}")
+    Map<String, Object> getCargoDepById(@PathVariable("id") BigDecimal id);
 }

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

@@ -253,4 +253,5 @@ public interface TmsTrainFeign {
     @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

@@ -372,7 +372,8 @@ public interface TmsTruckFeign {
                                       @RequestParam("pageSize") Integer pageSize,
                                       @RequestParam("startTime") String startTime,
                                       @RequestParam("endTime")   String endTime,
-                                      @RequestParam("orderType") Integer orderType
+                                      @RequestParam("orderType") Integer orderType,
+                                      @RequestParam("con")String con
     );
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/cgNzLoadingResult")

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.feign;
 
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -756,4 +757,8 @@ public interface TmsshipFeign {
     @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
     Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
 
+    @ApiOperation(value = "查看货权转移图片")
+    @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/downLoadDeilveryNotice")
+    Map<String, Object> downLoadDeilveryNotice(@RequestParam("noticeId") Integer noticeId);
+
 }

src/main/resources/application-dev.yml

@@ -33,7 +33,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8060}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   OTMSFeign: