Merge branch 'master' into dev

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

@@ -1945,7 +1945,7 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
     }
-    @ApiOperation(value="查询辅料燃料统计报表")
+    @ApiOperation(value="查询销售统计报表")
     @PostMapping("/getAllSaleReport")
     public Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
@@ -1956,17 +1956,27 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
     }
-    @ApiOperation(value="查询内转统计报表")
-    @PostMapping("/getAllInwardResult")
-    public Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize,
+
+    @ApiOperation(value="查询销售统计报表筛选过后的总净重")
+    @PostMapping("/getAllSaleReportTotal")
+    public Map<String, Object> getAllSaleReportTotal(@RequestBody(required=false) Map<String,Object> mapValue,
                                                 String startTime, String endTime,
                                                 String carrierSsoId
     ){
-        return tmsTruckFeign.getAllInwardResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
-    }
+        return tmsTruckFeign.getAllSaleReportTotal(mapValue==null?new HashMap<>():mapValue, startTime, endTime, carrierSsoId);
+    }
+
+//    @ApiOperation(value="查询内转统计报表")
+//    @PostMapping("/getAllInwardResult")
+//    public Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                Integer apiId,
+//                                                Integer pageNum,
+//                                                Integer pageSize,
+//                                                String startTime, String endTime,
+//                                                String carrierSsoId
+//    ){
+//        return tmsTruckFeign.getAllInwardResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
+//    }
 
 
 

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

@@ -380,6 +380,14 @@ public interface TmsTruckFeign {
                                          @RequestParam("endTime")   String endTime,
                                       @RequestParam("carrierSsoId")   String carrierSsoId
     );
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")
+    Map<String, Object> getAllSaleReportTotal(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime")   String endTime,
+                                         @RequestParam("carrierSsoId")   String carrierSsoId
+    );
+
     @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport1")
     Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
                                                    @RequestParam("apiId") Integer apiId,