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

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

@@ -2433,6 +2433,21 @@ public class TMSController extends BaseRESTfulController {
 
     }
 
+    //根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话
+    @ApiOperation(value="根据发货通知中用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话", notes="模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "personName",value = "用户输入的输入提货联系人", required = false, dataType = "String")
+    })
+
+    @PostMapping("/getNoticeContactNumberByPerson")
+    public Map<String,Object>  getNoticeContactNumberByPerson(@RequestParam(value ="personName")String personName){
+        return tmsshipFeign.getNoticeContactNumberByPerson(personName);
+
+    }
+
+
+
+
     @ApiOperation(value="获取内转报表")
     @PostMapping("/getOutFactoryInwardList")
     public Map<String, Object> getOutFactoryInwardList(@RequestBody(required=false) Map<String,Object> mapValue,

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

@@ -804,5 +804,6 @@ public interface TmsshipFeign {
     String uploadCargoPic(@RequestPart("file") MultipartFile multipartFile);
 
 
-
+    @PostMapping(value =  "api/v1/shipTms/dilbatchs/getNoticeContactNumberByPerson")
+    Map<String, Object> getNoticeContactNumberByPerson(@RequestParam("personName") String personName);
 }

src/main/resources/application-dev.yml

@@ -26,7 +26,7 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
@@ -50,7 +50,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   OTMSFeign: