tijiao

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);

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

@@ -305,7 +305,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

@@ -1192,7 +1192,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/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

@@ -28,7 +28,7 @@ openfeign:
     ColumnDataFeign:
       url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
     AmsFeign:
-      url: ${AMSFEIGN_URL:172.16.33.166:8079}
+      url: ${AMSFEIGN_URL:localhost:8079}
     BmsshipFeign:
       url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
     BmstrainFeign:
@@ -40,7 +40,7 @@ openfeign:
     TmsTrainFeign:
       url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
     TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+      url: ${TMSTRUCKFEIGN_URL:localhost:8088}
     TmsshipFeign:
       url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
     WMSHFeign:
@@ -48,9 +48,9 @@ openfeign:
     WMSFeign:
       url: ${WMSFEIGN_URL:172.16.33.166:8093}
     OMSFeign:
-      url: ${OMSFEIGN_URL:172.16.33.166:8095}
+      url: ${OMSFEIGN_URL:localhost:8095}
     RmsFeign:
-      url: ${RMSFEIGN_URL:172.16.33.166:8060}
+      url: ${RMSFEIGN_URL:localhost:8060}
 
 
   #测试环境