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

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

@@ -727,13 +727,21 @@ public class BMSController extends BaseRESTfulController {
         return bmsshipFeign.getTruckDetailsByBatch(batchId);
     }
 
+
     /**
      * 根据批次查询装船作业
      * @param
      * @return
      */
-    @PostMapping("/findLoadByBatch/{batchId}")
-    public Map<String,Object> findLoadByBatch(@PathVariable("batchId") BigDecimal batchId){
-        return bmsshipFeign.findLoadByBatch(batchId);
+    @PostMapping("/findLoadByBatch")
+    public Map<String,Object> findLoadByBatch(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      BigDecimal batchId){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmsshipFeign.findLoadByBatch(mapVal, pageNum, pageSize, apiId,batchId);
     }
 }

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/BmsshipFeign.java

@@ -307,6 +307,10 @@ public interface BmsshipFeign {
     @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findBatchHavingLoad")
     Map<String,Object> findBatchHavingLoad(String con);
 
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findLoadByBatch/{batchId}")
-    Map<String,Object> findLoadByBatch(@PathVariable("batchId")BigDecimal batchId);
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findLoadByBatch")
+    Map<String, Object> findLoadByBatch(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                @RequestParam("pageNum")Integer pageNum,
+                                                @RequestParam("pageSize")Integer pageSize,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("batchId") BigDecimal batchId);
 }

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:

src/main/resources/application-prod.yml

@@ -41,7 +41,7 @@ openfeign:
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image
-  #path: C:\Users\24390\Desktop\work\a
+  # path: C:\Users\24390\Desktop\work\a
   path: /shared
 server:
   port: 8080

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1220,10 +1220,6 @@
         LEFT JOIN RMS_MATERIAL rm
         ON rm.MATERIAL_ID=db.MATERIAL_ID
         WHERE     tlsr.DELETED=0
-        and db.BATCH_ID not in (
-        select DISTINCT BATCH_ID
-        from BMSSHIP_FEE bf
-        where FEE_TYPE=3)
         <if test="index!=null">
             and (INSTR(db.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(rm.MATERIAL_NAME,#{index}) > 0)
         </if>