|
@@ -5,11 +5,13 @@ import com.steerinfo.framework.controller.RESTfulResult;
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
+import io.swagger.models.auth.In;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.HashSet;
|
|
|
|
+import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -385,6 +387,27 @@ public class OMSController {
|
|
return omsFeign.getWaterslagDayPlanForGenOrder(map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus,orderType, con);
|
|
return omsFeign.getWaterslagDayPlanForGenOrder(map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus,orderType, con);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @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;
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
}
|