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

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

@@ -1004,7 +1004,7 @@ public class AMScontroller{
                                                 Integer pageSize,
                                                 Integer apiId,
                                                 Integer planStatus,
-                                                Integer carrierId,
+                                                String carrierId,
                                                 Integer planId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();

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

@@ -155,8 +155,7 @@ public class OMSController {
                                                Integer pageSize,
                                                @PathVariable Integer orderReceiveStatus,
                                                Integer orderType,
-                                               Integer orderStatus,
-                                                     String con
+                                               Integer orderStatus, String con
     ){
         return omsFeign.getReceiveRefuseOrder(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum,
                 pageSize, orderReceiveStatus, orderType, orderStatus, con);
@@ -516,11 +515,12 @@ public class OMSController {
                                                         Integer apiId,
                                                         Integer pageNum,
                                                         Integer pageSize,
-                                                        String con) {
+                                                        String con,
+                                                        String carrierId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con);
+        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con,carrierId);
         return map;
     }
 
@@ -562,7 +562,7 @@ public class OMSController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer orderStatus,
-                                                  Integer carrierId,
+                                                  String carrierId,
                                                   String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();

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

@@ -1685,6 +1685,21 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.selectCountList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
     }
 
+    //采购内转待装车实绩
+    @ApiOperation(value = "查询待装车运单列表")
+    @PostMapping("/cgNzLoadingResult")
+    public Map<String, Object> cgNzLoadingResult(@RequestBody(required = false) Map<String, Object> mapVal,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               Integer orderStatus
+    ) {
+        return tmsTruckFeign.cgNzLoadingResult(mapVal==null?new HashMap<>():mapVal, apiId, pageNum, pageSize,orderType,orderStatus);
+    }
+
+
+
     /**
      * 内转物流卸货装车实绩
      *

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

@@ -300,7 +300,8 @@ public class UniversalController extends BaseRESTfulController {
             if(index.length() == 0){
                 index = null;
             }else {
-                index += "%";
+//                index += "%";
+                index = "%"+index+"%";
             }
         }
         List<Map<String, Object>> list = universalMapper.getCarrierMesByLike(index);

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

@@ -1107,7 +1107,7 @@ public interface AmsFeign {
                                          @RequestParam Integer pageSize,
                                          @RequestParam Integer apiId,
                                          @RequestParam Integer planStatus,
-                                         @RequestParam Integer carrierId,
+                                         @RequestParam String carrierId,
                                          @RequestParam Integer planId);
     /**
      *新增用车需求
@@ -1193,7 +1193,7 @@ public interface AmsFeign {
 
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getWareHouse")
-    Map<String, Object> getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
+    Map<String, Object>getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
                                      @RequestParam Integer apiId,

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

@@ -284,7 +284,8 @@ public interface OmsFeign {
                                                  @RequestParam Integer apiId,
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
-                                                 @RequestParam String con);
+                                                 @RequestParam String con,
+                                                 @RequestParam String carrierId);
 
     @GetMapping("api/v1/oms/omstruckorders/getReceivingUnit")
     public Map<String, Object> getReceivingUnit();
@@ -307,7 +308,7 @@ public interface OmsFeign {
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer orderStatus,
-                                           @RequestParam Integer carrierId,
+                                           @RequestParam String carrierId,
                                            @RequestParam String con);
 
     // 分派计划

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

@@ -346,6 +346,14 @@ public interface TmsTruckFeign {
                                       @RequestParam("pageSize") Integer pageSize,
                                       @RequestParam("orderType") Integer orderType
     );
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/cgNzLoadingResult")
+    Map<String, Object> cgNzLoadingResult(@RequestBody(required = false) Map<String, Object> mapval,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer orderType,
+                                          @RequestParam Integer orderStatus);
 }
 
 

src/main/resources/bootstrap.yml

@@ -21,11 +21,8 @@ eureka:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
-
-
 openfeign:
 #  正式环境
-
     ColumnDataFeign:
       url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
     AmsFeign:
@@ -51,8 +48,7 @@ openfeign:
     OMSFeign:
       url: ${OMSFEIGN_URL:172.16.33.166:8095}
     RmsFeign:
-      url: ${RMSFEIGN_HRL:172.16.33.166:8060}
-
+      url: ${RMSFEIGN_URL:172.16.33.166:8060}
   #测试环境
 #  ColumnDataFeign:
 #    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}