修改内转钢材到异地库以及销售汽运结算

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

@@ -744,4 +744,20 @@ public class BMSController extends BaseRESTfulController {
         }
         return bmsshipFeign.findLoadByBatch(mapVal, pageNum, pageSize, apiId,batchId);
     }
+
+    @PostMapping("getSteelTruckDetailsOrder")
+    public Map<String,Object> getSteelTruckDetailsOrder(@RequestBody(required = false) Map<String,Object>map,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        Integer apiId,
+                                                        Integer orderType,
+                                                        String carrierSsoId,
+                                                        String startTime,
+                                                        String endTime,
+                                                        String con){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmstruckFeign.getSteelTruckDetailsOrder(map,pageNum,pageSize,apiId,orderType,carrierSsoId,startTime,endTime,con);
+    }
 }

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

@@ -275,7 +275,16 @@ public interface BmstruckFeign {
                                            @RequestParam("endTime") String endTime);
 
 
-
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getSteelTruckDetailsOrder")
+    Map<String, Object> getSteelTruckDetailsOrder(@RequestBody(required = false) Map<String, Object> map,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer orderType,
+                                                  @RequestParam String carrierSsoId,
+                                                  @RequestParam String startTime,
+                                                  @RequestParam String endTime,
+                                                  @RequestParam String con);
 }
 
 

src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161: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:
@@ -19,19 +19,19 @@ openfeign:
   BmstruckFeign:
     url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
+    url: ${QMSTRUCKFEIGN_URL:localhost:8047}
   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:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+    url: ${WMSFEIGN_URL:localhost: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: