'框计算'

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

@@ -45,7 +45,7 @@ public class AMScontroller{
     }
 
     /*
-
+        框计算
      */
     @PostMapping("/getAllPurPlan/{apiId}")
     public Map<String, Object> getDetailListByCon(@PathVariable("apiId") Integer apiId,

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

@@ -47,11 +47,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer apiId) {
+                                                     Integer apiId,
+                                                     String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getBargeOperationList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getBargeOperationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("selectBargeOperation/{bargeOperationId}")
@@ -110,11 +111,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
+                                               Integer apiId,
+                                               String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getLoadShipList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("getLoadShip/{resultId}")
@@ -161,11 +163,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    Integer pageNum,
                                                    Integer pageSize,
-                                                   Integer apiId) {
+                                                   Integer apiId,
+                                                   String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getShipLocationList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getShipLocationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("getShipLocation/{locationId}")
@@ -212,11 +215,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             Integer apiId) {
+                                             Integer apiId,
+                                             String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.listAllOrders(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     /**
@@ -254,11 +258,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                  Integer pageNum,
                                                  Integer pageSize,
-                                                 Integer apiId) {
+                                                 Integer apiId,
+                                                 String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getUnLoadShipList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getUnLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("getUnloadShip/{resultId}")
@@ -305,11 +310,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                          Integer pageNum,
                                                          Integer pageSize,
-                                                         Integer apiId) {
+                                                         Integer apiId,
+                                                         String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getWaterQualityResultList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("getWaterQuality/{resultId}")
@@ -402,11 +408,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getShipMentInstructionsList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                            Integer pageNum,
                                                            Integer pageSize,
-                                                           Integer apiId) {
+                                                           Integer apiId,
+                                                           String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getShipMentInstructionsList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("getShipmentInstructions/{instructionsId}")
@@ -453,11 +460,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                                 Integer pageNum,
                                                                 Integer pageSize,
-                                                                Integer apiId) {
+                                                                Integer apiId,
+                                                          String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("insertamsshipCargoTransferResult")
@@ -498,11 +506,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                               Integer pageNum,
                                                               Integer pageSize,
-                                                              Integer apiId) {
+                                                              Integer apiId,
+                                                        String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("insertshipDeliveryAttorney")
@@ -549,11 +558,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getshipDeliveryNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                          Integer pageNum,
                                                          Integer pageSize,
-                                                         Integer apiId) {
+                                                         Integer apiId,
+                                                         String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getshipDeliveryNoticeList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("insertDeliveryNotice")
@@ -598,6 +608,12 @@ public class TMSController extends BaseRESTfulController {
         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() {
@@ -761,10 +777,15 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getBatchId();
     }
 
-    @ApiOperation(value = "获取装车车皮号")
-    @GetMapping(value = "/getWagonNo/{resultType}")
-    public Map<String, Object> getWagonNo(@PathVariable("resultType") Integer resultType) {
-        return tmsTrainFeign.getWagonNo(resultType);
+
+    @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 = "查询所有发运计划")
@@ -1035,13 +1056,13 @@ public class TMSController extends BaseRESTfulController {
             @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) {
-        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType);
+    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 = "新增汽车装车实绩")
@@ -1091,13 +1112,14 @@ public class TMSController extends BaseRESTfulController {
             @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
-    ) {
-        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
+    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 = "通过采集系统传来的数据新增进厂作业实绩")
@@ -1128,12 +1150,12 @@ public class TMSController extends BaseRESTfulController {
             @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) {
-        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
+    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 = "查询计皮实绩")
@@ -1145,12 +1167,13 @@ public class TMSController extends BaseRESTfulController {
             @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) {
-        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
+    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);
     }
 
 
@@ -1183,13 +1206,14 @@ public class TMSController extends BaseRESTfulController {
             @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
-    ) {
-        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
+    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 = "添加卸货实绩")
@@ -1221,20 +1245,20 @@ public class TMSController extends BaseRESTfulController {
             @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
-    ) {
-        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
+    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 = "查询出厂实绩")
+    @ApiOperation(value="查询出厂实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId(110)", value = "动态表头", required = false, dataType = "Integer"),
@@ -1243,16 +1267,17 @@ public class TMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getLeaveFactoryResult")
-    public Map<String, Object> getLeaveFactoryResult(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                                      Integer apiId,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer orderType
-    ) {
-        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
+                                                     Integer orderType,String con
+    ){
+        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
     }
 
-    @ApiOperation(value = "PAD扫描汽车出厂实绩")
+
+    @ApiOperation(value="PAD扫描汽车出厂实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
@@ -1283,12 +1308,12 @@ public class TMSController extends BaseRESTfulController {
             @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
-    ) {
-        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,String con
+    ){
+        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
     }
 
     @ApiOperation(value = "通过ID获取质检实绩 ")

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

@@ -1,6 +1,7 @@
 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;
@@ -61,10 +62,13 @@ public interface TmsTrainFeign {
     @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getBatchId")
     public Map<String, Object> getBatchId();
 
-
-    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getWagonNo/{resultType}")
-    public Map<String, Object> getWagonNo(@PathVariable("resultType")Integer resultType);
-
+    @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

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

@@ -27,8 +27,9 @@ public interface TmsTruckFeign {
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("status") Integer status ,
-                                                @RequestParam("orderType") Integer orderType);
+                                          @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,
@@ -70,7 +71,8 @@ public interface TmsTruckFeign {
                                                @RequestParam("apiId") Integer apiId,
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("orderType")Integer orderType
+                                               @RequestParam("orderType")Integer orderType,
+                                               @RequestParam("con")      String con
     );
 
 
@@ -99,7 +101,8 @@ public interface TmsTruckFeign {
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
-                                                 @RequestParam("orderType") Integer orderType
+                                                 @RequestParam("orderType") Integer orderType,
+                                                 @RequestParam("con")     String con
                                                  );
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
@@ -107,7 +110,8 @@ public interface TmsTruckFeign {
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("orderType") Integer orderType);
+                                                @RequestParam("orderType") Integer orderType,
+                                                @RequestParam("con") String con);
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
     public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue);
@@ -125,7 +129,8 @@ public interface TmsTruckFeign {
                                          @RequestParam("apiId") Integer apiId,
                                          @RequestParam("pageNum") Integer pageNum,
                                          @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("orderType") Integer orderType
+                                         @RequestParam("orderType") Integer orderType,
+                                         @RequestParam("con")      String con
     );
 
     @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
@@ -144,7 +149,8 @@ public interface TmsTruckFeign {
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("orderType") Integer orderType);
+                                          @RequestParam("orderType") Integer orderType,
+                                          @RequestParam("con")  String con);
 
     /*
     TmstruckLeaveFactoryResultController
@@ -156,7 +162,8 @@ public interface TmsTruckFeign {
                                                @RequestParam("apiId") Integer apiId,
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("orderType") Integer orderType
+                                               @RequestParam("orderType") Integer orderType,
+                                               @RequestParam("con") String con
     );
 
     @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")
@@ -178,7 +185,8 @@ public interface TmsTruckFeign {
     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("pageSize") Integer pageSize,
+                                          @RequestParam("con")String con);
 
 
     @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResultById/{resultId}")

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

@@ -28,7 +28,8 @@ public interface TmsshipFeign {
     Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId);
+                                        @RequestParam Integer apiId,
+                                              @RequestParam String con);
 
     /**
      * 查询驳船作业信息
@@ -106,7 +107,8 @@ public interface TmsshipFeign {
     Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                   @RequestParam Integer pageNum,
                                   @RequestParam Integer pageSize,
-                                  @RequestParam Integer apiId);
+                                  @RequestParam Integer apiId,
+                                        @RequestParam String con);
 
     /**
      * 查询装船作业表单
@@ -166,7 +168,8 @@ public interface TmsshipFeign {
     Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize,
-                                      @RequestParam Integer apiId);
+                                      @RequestParam Integer apiId,
+                                            @RequestParam String con);
 
     /**
      * 查询位置作业信息
@@ -226,7 +229,8 @@ public interface TmsshipFeign {
     Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                 @RequestParam Integer pageNum,
                                 @RequestParam Integer pageSize,
-                                @RequestParam Integer apiId);
+                                @RequestParam Integer apiId,
+                                      @RequestParam String con);
 
     /**
      * 展示船只信息
@@ -256,7 +260,8 @@ public interface TmsshipFeign {
     Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
-                                    @RequestParam Integer apiId);
+                                    @RequestParam Integer apiId,
+                                          @RequestParam String con);
 
     /**
      * 查询卸船作业信息
@@ -316,7 +321,8 @@ public interface TmsshipFeign {
     Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId);
+                                            @RequestParam Integer apiId,
+                                                  @RequestParam String con);
 
     /**
      * 查询水分质检信息
@@ -428,7 +434,8 @@ public interface TmsshipFeign {
     Map<String, Object> getShipMentInstructionsList(@RequestBody(required = false) Map<String, Object> mapValue,
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
-                                              @RequestParam Integer apiId);
+                                              @RequestParam Integer apiId,
+                                                    @RequestParam String con);
 
     /**
      * 查询装船指令
@@ -524,6 +531,10 @@ public interface TmsshipFeign {
     @GetMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getBatchId")
     Map<String, Object> getBatchId();
 
+    //获取船运物资id
+    @GetMapping("/api/v1/shipTms/amsshipcargotransferresults/getMaterialId")
+    Map<String,Object> getMaterialId();
+
     /**
      * 展示货权转移
      *
@@ -537,7 +548,8 @@ public interface TmsshipFeign {
     Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize,
-                                                   @RequestParam Integer apiId);
+                                                   @RequestParam Integer apiId,
+                                                         @RequestParam String con);
 
     /**
      * 新增货权转移
@@ -588,7 +600,8 @@ public interface TmsshipFeign {
     Map<String, Object> getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
-                                                 @RequestParam Integer apiId);
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam String con);
 
     /**
      * 新增提货委托
@@ -648,7 +661,8 @@ public interface TmsshipFeign {
     Map<String, Object> getshipDeliveryNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId);
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String con);
 
     /**
      * 新增放货通知
@@ -694,4 +708,8 @@ public interface TmsshipFeign {
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/sendDeliveryNotice/{noticeId}")
     Map<String, Object> sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId);
+
+
+
+
 }

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:localhost}:${EUREKA_PORT:8061}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/