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

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

@@ -5,11 +5,13 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -386,7 +388,28 @@ public class OMSController {
 
    }
 
+    @ApiOperation(value="车牌号下拉")
+    @GetMapping("/getDriverCapacity")
+    public Map<String, Object> getDriverCapacity() {
+        Map<String,Object> map = omsFeign.getDriverCapacity();
+        return map;
+    }
+
+    @ApiOperation(value="派单信息")
+    @PostMapping("/getTruckNoDispatchMap")
+    public Map<String, Object> getTruckNoDispatchMap(Integer dispatchId) {
+        Map<String,Object> map = omsFeign.getTruckNoDispatchMap(dispatchId);
+        return map;
+    }
 
+    @ApiOperation(value="承运商分派运输订单给司机")
+    @PostMapping("/addAppTruckOrder")
+    public Map<String, Object> addAppTruckOrder(Integer dispatchId,
+                                                Integer orderType,
+                                                Integer driverCapacityId) {
+        Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType, driverCapacityId);
+        return map;
+    }
     //展示销售订单信息
     @ApiOperation(value="展示销售订单信息")
     @ApiImplicitParams({

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -221,14 +222,15 @@ public interface OmsFeign {
                                                       @RequestParam("orderStatus") Integer orderStatus,
                                                       @RequestParam("con") String con
     );
+
     @PostMapping("api/v1/oms/omstruckorders/selectSteelSaleForCarrier/{carrierId}")
     public Map<String,Object> selectSteelSaleForCarrier(@RequestBody(required=false) Map<String,Object> mapValue,
                                                    @RequestParam Integer apiId,
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize,
                                                    @PathVariable Integer carrierId
-
     );
+
     @PostMapping("api/v1/oms/omstruckorders/selectInfoBySaleOrderId/{saleOrderId}")
     public Map<String,Object> selectInfoBySaleOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
                                                  @RequestParam Integer apiId,
@@ -257,7 +259,21 @@ public interface OmsFeign {
 
 
     );
-    
 
+
+
+    @ApiOperation(value="车牌号下拉")
+    @GetMapping(value = "api/v1/oms/omstruckorders/getDriverCapacity")
+    Map<String, Object> getDriverCapacity();
+
+    @ApiOperation(value="派单信息")
+    @PostMapping(value = "api/v1/oms/omstruckorders/getTruckNoDispatchMap")
+    Map<String, Object> getTruckNoDispatchMap(@RequestParam Integer dispatchId);
+
+    @ApiOperation(value="承运商分派运输订单给司机")
+    @PostMapping(value = "api/v1/oms/omstruckorders/addAppTruckOrder")
+    Map<String, Object> addAppTruckOrder(@RequestParam Integer dispatchId,
+                                         @RequestParam Integer orderType,
+                                         @RequestParam Integer driverCapacityId);
 }