Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -2611,6 +2611,27 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
     }
 
+    @ApiOperation(value = "销售钢材统计报表")
+    @PostMapping("/getSaleSteelReportNew")
+    public Map<String,Object> getSaleSteelReportNew(@RequestBody(required = false)Map<String,Object>map,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String carrierSsoId,
+                                                 String receiveName,
+                                                 String materialName,
+                                                 String specification,
+                                                 String remark,
+                                                 String capacityNo,
+                                                 String carrierName,
+                                                 String consigneeName,
+                                                 String saler,
+                                                 String easPrimaryId){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleSteelReportNew(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
+    }
+
     @ApiOperation(value = "销售钢材未装统计报表")
     @PostMapping("/loadingSaleSteelReport")
     public Map<String,Object> loadingSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,

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

@@ -736,6 +736,22 @@ public interface TmsTruckFeign {
                                            @RequestParam("easPrimaryId") String easPrimaryId
                                            );
 
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReportNew")
+    Map<String, Object> getSaleSteelReportNew(@RequestBody(required = false)Map<String, Object> map,
+                                           @RequestParam("startTime")String startTime,
+                                           @RequestParam("endTime")String endTime,
+                                           @RequestParam("carrierSsoId")String carrierSsoId,
+                                           @RequestParam("receiveName")String receiveName,
+                                           @RequestParam("materialName")String materialName,
+                                           @RequestParam("specification")String specification,
+                                           @RequestParam("remark")String remark,
+                                           @RequestParam("capacityNo") String capacityNo,
+                                           @RequestParam("carrierName") String carrierName,
+                                           @RequestParam("consigneeName") String consigneeName,
+                                           @RequestParam("saler") String saler,
+                                           @RequestParam("easPrimaryId") String easPrimaryId
+    );
+
     @PostMapping("/api/v1/truckTms/statisticalReport/loadingSaleSteelReport")
     Map<String, Object> loadingSaleSteelReport(@RequestBody(required = false)Map<String, Object> map,
                                            @RequestParam("startTime")String startTime,