'eureka'

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

@@ -1892,9 +1892,11 @@ public class AMScontroller{
                                                   Integer pageSize,
                                                   Integer apiId,
                                                   String con,
-                                                  Integer deleted
+                                                  Integer deleted,
+                                                  @RequestParam(required = false) String startTime,
+                                                  @RequestParam(required = false)String endTime
     ) {
-        return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,new BigDecimal(deleted));
+        return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,new BigDecimal(deleted),startTime,endTime);
     }
 
     @ApiOperation(value = "修改销售订单中的物资")
@@ -1938,4 +1940,10 @@ public class AMScontroller{
         return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,startTime,endTime);
     }
 
+    @ApiOperation(value = "修改厂内未装货车辆的运单车牌号")
+    @PostMapping(value = "/updateCapacityNumberInFactory")
+    public Map<String,Object> updateCapacityNumberInFactory(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.updateCapacityNumberInFactory(mapValue);
+    }
+
 }

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

@@ -1668,7 +1668,9 @@ public interface AmsFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer apiId,
                                            @RequestParam String con,
-                                           @RequestParam BigDecimal deleted);
+                                           @RequestParam BigDecimal deleted,
+                                           @RequestParam(required = false) String startTime,
+                                           @RequestParam(required = false)String endTime);
 
     // 展示副产品销售订单列表
     @PostMapping(value = "/api/v1/ams/amssaleorders/updateAllMaterialInSale")
@@ -1692,4 +1694,8 @@ public interface AmsFeign {
                                                  @RequestParam String consigneeSsoId,
                                                  @RequestParam(required = false) String startTime,
                                                  @RequestParam(required = false) String endTime);
+
+    // 修改厂内未装货车辆的运单车牌号
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateCapacityNumberInFactory")
+    Map<String,Object> updateCapacityNumberInFactory(@RequestBody Map<String, Object> mapValue);
 }

src/main/resources/bootstrap.yml

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