修改

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

@@ -1597,6 +1597,16 @@ public class AMScontroller{
         return amsFeign.addTruckNo(mapList);
     }
 
+    @ApiOperation(value = "新增车序号优化")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "车序号信息", required = false, dataType = ""),
+    })
+    @PostMapping("/addTruckNoGreat")
+    public Map<String, Object> addTruckNoGreat(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.addTruckNoGreat(mapList);
+    }
+
+
     @ApiOperation(value = "下发车序号")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapList", value = "车序号信息", required = false, dataType = ""),

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

@@ -85,7 +85,7 @@ public class OTMSController {
         //添加到files数组
         List<MultipartFile> files = new ArrayList<>();
         int index=-1;
-        for(int i=0;i<21;i++){
+        for(int i = 0;i < 21; i++){
             MultipartFile file = request.getFile("file"+i);
             if(file!=null){
                 files.add(file);

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

@@ -2201,6 +2201,24 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId,receiveName,materialName,wareHouse);
     }
 
+    @ApiOperation(value="查询销售统计报表")
+    @PostMapping("/getAllSaleReportByLb")
+    public Map<String, Object> getAllSaleReportByLb(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String startTime,
+                                          String endTime,
+                                          String carrierSsoId,
+                                                Integer orderType,
+                                                Integer shipperId,
+                                                String receiveName,
+                                                String materialName,
+                                                String wareHouse
+    ){
+        return tmsTruckFeign.getAllSaleReportByLb(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId,receiveName,materialName,wareHouse);
+    }
+
     @ApiOperation(value="查询销售统计报表筛选过后的总净重")
     @PostMapping("/getAllSaleReportTotal")
     public Map<String, Object> getAllSaleReportTotal(@RequestBody(required=false) Map<String,Object> mapValue,

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

@@ -1467,6 +1467,11 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amssaleordermaterials/addTruckNo")
     Map<String, Object> addTruckNo(@RequestBody List<Map<String, Object>> mapList);
 
+    @ApiOperation(value="新增车序号优化")
+    @PostMapping("/api/v1/ams/amssaleordermaterials/addTruckNoGreat")
+    Map<String, Object> addTruckNoGreat(@RequestBody List<Map<String, Object>> mapList);
+
+
     @ApiOperation(value="下发车序号")
     @PostMapping("/api/v1/ams/amssaleordermaterials/issueTruckNo")
     Map<String, Object> issueTruckNo(@RequestBody List<Map<String, Object>> mapList);

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

@@ -440,6 +440,21 @@ public interface TmsTruckFeign {
                                          @RequestParam String wareHouse
     );
 
+    @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportByLb")
+    Map<String, Object> getAllSaleReportByLb(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime")   String endTime,
+                                      @RequestParam("carrierSsoId")   String carrierSsoId,
+                                         @RequestParam("orderType") Integer orderType,
+                                         @RequestParam("shipperId") Integer shipperId,
+                                         @RequestParam("receiveName") String receiveName,
+                                         @RequestParam String materialName,
+                                         @RequestParam String wareHouse
+    );
+
     @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")
     Map<String, Object> getAllSaleReportTotal(@RequestBody(required=false) Map<String,Object> mapValue,
                                          @RequestParam("startTime") String startTime,

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout