2
0

2 Ревизии 4a704c33ec ... 3090147f86

Автор SHA1 Съобщение Дата
  wing 3090147f86 Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API преди 3 години
  wing 42423af9eb '销售' преди 3 години
променени са 2 файла, в които са добавени 5 реда и са изтрити 3 реда
  1. 3 2
      src/main/java/com/steerinfo/dil/controller/TMSController.java
  2. 2 1
      src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

+ 3 - 2
src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -1955,9 +1955,10 @@ public class TMSController extends BaseRESTfulController {
                                           String endTime,
                                           String carrierSsoId,
                                                 Integer orderType,
-                                                Integer shipperId
+                                                Integer shipperId,
+                                                String receiveName
     ){
-        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId);
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId,receiveName);
     }
 
     @ApiOperation(value="查询销售统计报表筛选过后的总净重")

+ 2 - 1
src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -392,7 +392,8 @@ public interface TmsTruckFeign {
                                          @RequestParam("endTime")   String endTime,
                                       @RequestParam("carrierSsoId")   String carrierSsoId,
                                          @RequestParam("orderType") Integer orderType,
-                                         @RequestParam("shipperId") Integer shipperId
+                                         @RequestParam("shipperId") Integer shipperId,
+                                         @RequestParam("receiveName") String receivName
     );
 
     @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")