소스 검색

修改汽运结算

luobang 3 년 전
부모
커밋
111f34bb8b
2개의 변경된 파일11개의 추가작업 그리고 3개의 파일을 삭제
  1. 6 2
      src/main/java/com/steerinfo/dil/controller/BMSController.java
  2. 5 1
      src/main/java/com/steerinfo/dil/feign/BmstruckFeign.java

+ 6 - 2
src/main/java/com/steerinfo/dil/controller/BMSController.java

@@ -587,12 +587,16 @@ public class BMSController extends BaseRESTfulController {
                                                            Integer orderType,
                                                            String userId,
                                                            String startTime,
-                                                           String endTime) {
+                                                           String endTime,
+                                                           String capacityNo,
+                                                           String shipperNames,
+                                                           String transRangeValues,
+                                                           String materialTypeNames) {
         if (mapVal == null) {
             mapVal = new HashMap<>();
         }
         return bmstruckFeign.getInwardWeightDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId, startTime,
-                 endTime);
+                 endTime,capacityNo,shipperNames,transRangeValues,materialTypeNames);
     }
 
     @PostMapping("/getNoInwardDetails")

+ 5 - 1
src/main/java/com/steerinfo/dil/feign/BmstruckFeign.java

@@ -244,7 +244,11 @@ public interface BmstruckFeign {
                                                     @RequestParam("orderType") Integer orderType,
                                                     @RequestParam("userId") String userId,
                                                     @RequestParam("startTime")String startTime,
-                                                    @RequestParam("endTime")String endTime);
+                                                    @RequestParam("endTime")String endTime,
+                                                    @RequestParam("capacityNo")String capacityNo,
+                                                    @RequestParam("shipperNames")String shipperNames,
+                                                    @RequestParam("transRangeValues")String transRangeValues,
+                                                    @RequestParam("materialTypeNames")String materialTypeNames);