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

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

@@ -302,14 +302,22 @@ public class OMSController {
                                             Integer apiId,
                                             Integer pageNum,
                                             Integer pageSize,
-                                            Integer orderType,
                                             Integer orderStatus,
                                             String con,
-                                            @RequestParam String carrierSsoId,
-                                                   Integer shipperId
+                                            @RequestParam Integer saleOrderId
     )
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierSsoId,shipperId);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,orderStatus, con,saleOrderId);
+    }
+    @PostMapping("/getDriverInfoForSale1")
+    public Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   Integer orderStatus,
+                                                   String con,
+                                                   String numberPlate,
+                                                   @RequestParam Integer saleOrderId
+    )
+    {
+        return omsFeign.getDriverInfoForSale1(mapValue==null?new HashMap<>():mapValue,orderStatus, con,numberPlate,saleOrderId);
     }
 
 

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

@@ -2123,6 +2123,19 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value="拼装车内转统计报表")
+    @PostMapping("/getInwardReportForAssemble")
+    public Map<String, Object> getInwardReportForAssemble(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 String startTime,
+                                                 String endTime
+    ){
+        return tmsTruckFeign.getInwardReportForAssemble(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+
     @ApiOperation("保卫部随机抽查车牌号")
     @PostMapping("/getCapacityByDefend")
     public Map<String,Object> getCapacityByDefend(@RequestBody(required = false) Map<String,Object> mapValue,

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

@@ -134,11 +134,18 @@ public interface OmsFeign {
                                             @RequestParam("apiId")      Integer apiId,
                                             @RequestParam("pageNum")    Integer pageNum,
                                             @RequestParam("pageSize")   Integer pageSize,
-                                            @RequestParam("orderType")  Integer orderType,
                                             @RequestParam("orderStatus")Integer orderStatus,
                                             @RequestParam("con")        String con,
-                                            @RequestParam("carrierSsoId")  String carrierSsoId,
-                                            @RequestParam("shipperId") Integer shipperId
+                                            @RequestParam("saleOrderId") Integer saleOrderId
+    );
+
+
+    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale1")
+    Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestParam("orderStatus")Integer orderStatus,
+                                            @RequestParam("con")        String con,
+                                            @RequestParam("numberPlate")  String numberPlate,
+                                            @RequestParam("saleOrderId") Integer saleOrderId
     );
 
     /**

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

@@ -515,6 +515,15 @@ public interface TmsTruckFeign {
                                      @RequestParam String endTime);
 
 
+    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReportForAssemble")
+    Map<String, Object> getInwardReportForAssemble(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam String startTime,
+                                          @RequestParam String endTime);
+
+
     @PostMapping("api/v1/truckTms/statisticalReport/getCapacityByDefend")
     Map<String, Object> getCapacityByDefend(@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam Integer apiId,