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

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

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

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

@@ -744,6 +744,9 @@ public interface TmsTruckFeign {
                                            @RequestParam("easPrimaryId") String easPrimaryId
                                            );
 
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelSpellingReport")
+    Map<String, Object> getSaleSteelSpellingReport(@RequestBody(required = false)Map<String, Object> map);
+
     @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReportNew")
     Map<String, Object> getSaleSteelReportNew(@RequestBody(required = false)Map<String, Object> map,
                                            @RequestParam("startTime")String startTime,