tijiao

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

@@ -2401,4 +2401,21 @@ public class TMSController extends BaseRESTfulController {
         System.out.println(map);
         return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName);
     }
+
+    @ApiOperation(value = "销售钢材统计报表")
+    @PostMapping("/getSaleSteelReport")
+    public Map<String,Object> getSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
+                                                 Integer apiId,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String carrierSsoId,
+                                                 String receiveName,
+                                                 String materialName,
+                                                 String specification,
+                                                 String remark){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleSteelReport(map,apiId,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark);
+    }
 }

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

@@ -702,6 +702,17 @@ public interface TmsTruckFeign {
                                                 @RequestParam("orgCode")String orgCode,
                                                 @RequestParam("isPage")String isPage,
                                                 @RequestParam("index")String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReport")
+    Map<String, Object> getSaleSteelReport(@RequestBody(required = false)Map<String, Object> map,
+                                           @RequestParam("apiId")Integer apiId,
+                                           @RequestParam("startTime")String startTime,
+                                           @RequestParam("endTime")String endTime,
+                                           @RequestParam("carrierSsoId")String carrierSsoId,
+                                           @RequestParam("receiveName")String receiveName,
+                                           @RequestParam("materialName")String materialName,
+                                           @RequestParam("specification")String specification,
+                                           @RequestParam("remark")String remark);
 }
 
 

src/main/resources/application-prod.yml

@@ -9,9 +9,9 @@ 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}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
@@ -23,7 +23,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:

src/main/resources/bootstrap.yml

@@ -18,12 +18,12 @@ eureka:
     service-url:
 
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
-    register-with-eureka: true #表示向EurekaServer注册自己 默认为true
-    fetch-registry: true #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
+    fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
 
 
   instance:
-    prefer-ip-address: true
+    prefer-ip-address: false
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}