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

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

@@ -30,7 +30,8 @@ public interface TmsTrainFeign {
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("resultType") Integer resultType);
+                                              @RequestParam("resultType") Integer resultType,
+                                                    @RequestParam("con") String con);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/insertTmstrainLoadingResult")
@@ -78,7 +79,8 @@ public interface TmsTrainFeign {
                                                 @RequestParam("apiId") Integer apiId,
                                                 @RequestParam("pageNum") Integer pageNum,
                                                 @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("resultType") Integer resultType);
+                                                @RequestParam("resultType") Integer resultType,
+                                                      @RequestParam("con") String con);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/deleteTmstrainWagonUnLoadResultByUnLoadingId")
@@ -97,7 +99,8 @@ public interface TmsTrainFeign {
     public Map<String, Object> getTmstrainresult(@RequestBody(required=false) Map<String,Object> mapValue,
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize);
+                                           @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("con") String con);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainWagonUnLoadResultByUnLoadingId/{unloadingId}")
@@ -122,7 +125,8 @@ public interface TmsTrainFeign {
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("status") Integer status,
-                                                 @RequestParam("resultType") Integer resultType
+                                                 @RequestParam("resultType") Integer resultType,
+                                                 @RequestParam("con") String con
                                                  );
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getWagonPleaseById/{resultId}")
@@ -156,7 +160,8 @@ public interface TmsTrainFeign {
                                                   @RequestParam("apiId") Integer apiId,
                                                   @RequestParam("pageNum") Integer pageNum,
                                                   @RequestParam("pageSize") Integer pageSize,
-                                                        @RequestParam("resultType") Integer resultType
+                                                        @RequestParam("resultType") Integer resultType,
+                                                        @RequestParam("con") String con
     );
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveWagonPleaseById/{resultId}")
@@ -180,8 +185,8 @@ public interface TmsTrainFeign {
     Map<String,Object> getTmstrainWagonLoadForConverted(@RequestBody(required=false)
                                                         @RequestParam("apiId") Integer apiId,
                                                         @RequestParam("pageNum") Integer pageNum,
-                                                        @RequestParam("pageSize") Integer pageSize
-                                                        );
+                                                        @RequestParam("pageSize") Integer pageSize,
+                                                        @RequestParam("con") String con);
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getPleasePlanByResultId/{resultId}")
     Map<String,Object> getPleasePlanByResultId(@PathVariable("resultId")BigDecimal resultId);
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveByResultId/{resultId}")
@@ -191,11 +196,13 @@ public interface TmsTrainFeign {
     Map<String,Object>  selectWagonUnLoadResultForConverted(
                                                             @RequestParam("apiId") Integer apiId,
                                                             @RequestParam("pageNum") Integer pageNum,
-                                                            @RequestParam("pageSize") Integer pageSize);
+                                                            @RequestParam("pageSize") Integer pageSize,
+                                                            @RequestParam("con") String con);
     @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/selectTrainUnLoadResultForConverted")
     Map<String,Object>  selectTrainUnLoadResultForConverted(@RequestParam("apiId") Integer apiId,
                                                             @RequestParam("pageNum") Integer pageNum,
-                                                            @RequestParam("pageSize") Integer pageSize);
+                                                            @RequestParam("pageSize") Integer pageSize,
+                                                            @RequestParam("con") String con);
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonApprove")
     Map<String,Object> addWagonApprove(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
 }

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

@@ -25,7 +25,7 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+    url: ${COLUMNDATAFEIGN_URL:192.168.1.102:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:localhost:8099}
   BmsshipFeign: