tijiao

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

@@ -2419,10 +2419,13 @@ public class TMSController extends BaseRESTfulController {
                                                  String materialName,
                                                  String specification,
                                                  String remark,
+                                                 String capacityNo,
+                                                 String carrierName,
+                                                 String consigneeName,
                                                  String saler){
         if(map==null){
             map=new HashMap<>();
         }
-        return tmsTruckFeign.getSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,saler);
+        return tmsTruckFeign.getSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler);
     }
 }

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

@@ -712,7 +712,11 @@ public interface TmsTruckFeign {
                                            @RequestParam("materialName")String materialName,
                                            @RequestParam("specification")String specification,
                                            @RequestParam("remark")String remark,
-                                           @RequestParam("saler") String saler);
+                                           @RequestParam("capacityNo") String capacityNo,
+                                           @RequestParam("carrierName") String carrierName,
+                                           @RequestParam("consigneeName") String consigneeName,
+                                           @RequestParam("saler") String saler
+                                           );
 }
 
 

src/main/resources/application-prod.yml

@@ -9,7 +9,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.166:8079}
   BmsshipFeign:
@@ -23,15 +23,15 @@ 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}
+    url: ${TMSSHIPFEIGN_URL:172.16.33.161:8090}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   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}
   JoinFeign: