luobang 3 years ago
parent
commit
a414c85692

+ 3 - 2
src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -2218,8 +2218,9 @@ public class TMSController extends BaseRESTfulController {
                                                   Integer pageSize,
                                                   Integer pageSize,
                                                   String startTime,
                                                   String startTime,
                                                   String endTime,
                                                   String endTime,
-                                                  String con){
-        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con);
+                                                  String con,
+                                                  String yes){
+        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con,yes);
     }
     }
 
 
     @ApiOperation("厂外抵达作业")
     @ApiOperation("厂外抵达作业")

+ 2 - 1
src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -543,7 +543,8 @@ public interface TmsTruckFeign {
                                           @RequestParam Integer pageSize,
                                           @RequestParam Integer pageSize,
                                             @RequestParam String startTime,
                                             @RequestParam String startTime,
                                             @RequestParam String endTime,
                                             @RequestParam String endTime,
-                                          @RequestParam String con
+                                          @RequestParam String con,
+                                            @RequestParam String yes
                                          );
                                          );
 
 
     @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptResult")
     @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptResult")

+ 2 - 2
src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ openfeign:
   ColumnDataFeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
   BmstrainFeign:
@@ -31,7 +31,7 @@ openfeign:
   WMSFeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.166:8093}
     url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:
   JoinFeign: