luobang hace 2 años
padre
commit
88ecba3588

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

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

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

@@ -732,7 +732,8 @@ public interface TmsTruckFeign {
                                            @RequestParam("capacityNo") String capacityNo,
                                            @RequestParam("carrierName") String carrierName,
                                            @RequestParam("consigneeName") String consigneeName,
-                                           @RequestParam("saler") String saler
+                                           @RequestParam("saler") String saler,
+                                           @RequestParam("easPrimaryId") String easPrimaryId
                                            );
 
     @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelReport")

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

@@ -9,7 +9,7 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign: