sf

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

@@ -1895,9 +1895,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 = "修改销售订单中的物资")
@@ -1941,4 +1943,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/controller/OMSController.java

@@ -40,15 +40,19 @@ public class OMSController {
     })
     @PostMapping("/getAllTruckOrder")
     public Map<String, Object> getAllTruckOrder(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer orderStatus,
-                                          Integer planId,
-                                          Integer orderType,
-                                          Integer fuelOrder,String carrierSSOId,String con) {
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer orderStatus,
+                                                Integer planId,
+                                                Integer orderType,
+                                                Integer fuelOrder,
+                                                String carrierSSOId,
+                                                String con,
+                                                String startTime,
+                                                String endTime) {
         return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderStatus, planId, orderType, fuelOrder,carrierSSOId, con);
+                orderStatus, planId, orderType, fuelOrder,carrierSSOId, con,startTime,endTime);
     }
 
     @ApiOperation(value = "不适用表头返回数据")
@@ -232,9 +236,11 @@ public class OMSController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer orderType,
-                                              Integer orderStatus, Integer fuelOrder,String carrierSSOId,String con){
+                                              Integer orderStatus, Integer fuelOrder,String carrierSSOId,String con,
+                                                    String startTime,
+                                                    String endTime){
         return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                 orderType, orderStatus, fuelOrder,carrierSSOId,con);
+                 orderType, orderStatus, fuelOrder,carrierSSOId,con,startTime,endTime);
     }
 
     /**

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

@@ -1340,8 +1340,10 @@ public class TMSController extends BaseRESTfulController {
                                                 Integer orderType,
                                                 String con,
                                                 String userId,
-                                                String userIds) {
-        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
+                                                String userIds,
+                                                String startTime,
+                                                String endTime) {
+        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
     }
 
 
@@ -1421,9 +1423,11 @@ public class TMSController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
-                                                Integer orderType,String con
+                                                Integer orderType,String con,
+                                                String startTime,
+                                                String endTime
     ){
-        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,startTime,endTime);
     }
 
 
@@ -1487,13 +1491,15 @@ public class TMSController extends BaseRESTfulController {
     })
     @PostMapping("/getQualityResult")
     public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer orderType,
-                                          String con
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer orderType,
+                                                String con,
+                                                String startTime,
+                                                String endTime
     ){
-        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,orderType, con);
+        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,orderType, con,startTime,endTime);
     }
 
     @ApiOperation(value = "通过ID获取质检实绩 ")

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

@@ -1672,7 +1672,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")
@@ -1696,4 +1698,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/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -34,7 +34,9 @@ public interface OmsFeign {
                                           @RequestParam("orderType") Integer orderType,
                                           @RequestParam("fuelOrder") Integer fuelOrder,
                                           @RequestParam("carrierSSOId")String carrierSSOId,
-                                          @RequestParam("con")String con);
+                                          @RequestParam("con")String con,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
 
     @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrderReturnListMap")
     public Map<String, Object> getAllTruckOrderReturnListMap(
@@ -107,7 +109,9 @@ public interface OmsFeign {
                                               @RequestParam("orderStatus") Integer orderStatus,
                                               @RequestParam("fuelOrder") Integer fuelOrder,
                                               @RequestParam("carrierSSOId") String carrierSSOId,
-                                              @RequestParam("con")      String con);
+                                              @RequestParam("con")      String con,
+                                                    @RequestParam("startTime") String startTime,
+                                                    @RequestParam("endTime")String endTime);
     /**
      * 展示承运商接收销售公司已接受的销售订单
      * @param carrierId

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

@@ -148,8 +148,8 @@ public interface TmsTruckFeign {
                                                  @RequestParam("con")     String con,
                                                  @RequestParam("userId")  String userId,
                                                  @RequestParam("userIds") String userIds,
-                                                 @RequestParam String startTime,
-                                                 @RequestParam String endTime
+                                                 @RequestParam("startTime")String startTime,
+                                                 @RequestParam("endTime")String endTime
                                                  );
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
@@ -160,7 +160,9 @@ public interface TmsTruckFeign {
                                                 @RequestParam("orderType") Integer orderType,
                                                 @RequestParam("con") String con,
                                                 @RequestParam("userId")String userId,
-                                                @RequestParam("userIds")String userIds);
+                                                @RequestParam("userIds")String userIds,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
     public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue);
@@ -182,8 +184,8 @@ public interface TmsTruckFeign {
                                                @RequestParam("con")      String con,
                                                @RequestParam("userId") String userId,
                                                @RequestParam("userIds") String userIds,
-                                               @RequestParam("startTime") String startTime,
-                                               @RequestParam("endTime") String endTime
+                                               @RequestParam("startTime")String startTime,
+                                               @RequestParam("endTime")String endTime
     );
 
     @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
@@ -197,13 +199,15 @@ public interface TmsTruckFeign {
      */
 
 
-    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiveResult")
+    @PostMapping("api/v1/truckTms/tmstruckreciveresult/getReceiveResult")
     public Map<String, Object> getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con")  String con);
+                                          @RequestParam("con")  String con,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
 
     /*
     TmstruckLeaveFactoryResultController
@@ -245,7 +249,9 @@ public interface TmsTruckFeign {
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con")String con);
+                                          @RequestParam("con")String con,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
 
 
     @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResultById/{resultId}")

src/main/resources/application-dev.yml

@@ -50,7 +50,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+    url: ${RMSFEIGN_HRL:localhost:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   OTMSFeign:

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:

src/main/resources/bootstrap.yml

@@ -12,16 +12,21 @@ spring:
   mvc:
     static-path-pattern:
 
-
 #eureka设置
 eureka:
   client:
     service-url:
+
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
+    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
+    fetch-registry: false #是否从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: