tijiao

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

@@ -1148,12 +1148,11 @@ public class AMScontroller{
                                           Integer pageSize,
                                           Integer apiId,
                                           Integer requirementStatus,
-                                          String orgCode,
-                                                       String index) {
+                                          String orgCode, String index,String startTime,String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode,index);
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode,index,startTime,endTime);
     }
 
     @PostMapping("/getPurRequirementList")
@@ -1166,11 +1165,13 @@ public class AMScontroller{
                                                        String userId,
                                                        String carrierSsoId,
                                                        String enableStatus,
-                                                       String planStatus) {
+                                                       String planStatus,
+                                                     String startTime,
+                                                     String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus);
+        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus,startTime,endTime);
     }
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping("/getDispatchSaleOrderList")

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

@@ -629,11 +629,13 @@ public class OMSController {
                                                   Integer pageSize,
                                                   Integer orderStatus,
                                                   String carrierId,
-                                                  String con) {
+                                                  String con,
+                                                  String startTime,
+                                                  String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        Map<String, Object> map = omsFeign.getInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con);
+        Map<String, Object> map = omsFeign.getInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,startTime,endTime);
         return map;
     }
 

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

@@ -1191,8 +1191,8 @@ public interface AmsFeign {
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId,
                                    @RequestParam Integer requirementStatus,
-                                   @RequestParam String orgCode,
-                                                @RequestParam String index);
+                                   @RequestParam String orgCode, @RequestParam String index,@RequestParam String startTime,
+                                                @RequestParam String endTime);
 
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")
@@ -1528,7 +1528,9 @@ public interface AmsFeign {
                                               @RequestParam String userId,
                                               @RequestParam String carrierSsoId,
                                               @RequestParam String enableStatus,
-                                              @RequestParam String planStatus);
+                                              @RequestParam String planStatus,
+                                              @RequestParam String startTime,
+                                              @RequestParam String endTime);
 
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRealAddressByLike")
     Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index);

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

@@ -333,7 +333,9 @@ public interface OmsFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer orderStatus,
                                            @RequestParam String carrierId,
-                                           @RequestParam String con);
+                                           @RequestParam String con,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
 
     // 分派计划
     @PostMapping("api/v1/oms/omstruckorders/apportionInwardOrder")

src/main/resources/application-prod.yml

@@ -23,7 +23,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign: