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

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

@@ -93,9 +93,9 @@ public class OMSController {
 
 
     @ApiOperation(value = "派单")
-    @PostMapping("/dispatchOrder/{orderId}")
-    public Map<String, Object> dispatchOrder(@PathVariable("orderId") Integer orderId) {
-        return omsFeign.dispatchOrder(orderId);
+    @PostMapping("/dispatchOrder")
+    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map) {
+        return omsFeign.dispatchOrder(map);
     }
 
     @ApiOperation(value = "逻辑删除运单")

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

@@ -812,6 +812,12 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getPort();
     }
 
+    @ApiOperation(value="查询卸货点")
+    @GetMapping("/getUnloadPoint/{type}")
+    public Map<String, Object> getUnloadPoint(@PathVariable("type") Integer type){
+        return tmsTruckFeign.getUnloadPoint(type);
+    }
+
     @ApiOperation(value="查询卸车作业信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(60)", value = "表头", required = false, dataType = "Interger")

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

@@ -50,7 +50,7 @@ public interface OmsFeign {
     public Map<String, Object> updateOrder(@RequestBody Map<String, Object> map);
 
     @PostMapping("api/v1/oms/omstruckorders/dispatchOrder/{orderId}")
-    public Map<String, Object> dispatchOrder(@PathVariable("orderId") Integer orderId);
+    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/oms/omstruckorders/deleteOrder")
     public Map<String, Object> deleteOrder(@RequestBody(required = false) Map<String, Object> map,

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

@@ -231,6 +231,9 @@ public interface TmsTruckFeign {
 
     @GetMapping("api/v1/truckTms/dropDown/getFuMaterial/{type}")
     Map<String, Object> getFuMaterial(@PathVariable("type")Integer type);
+
+    @GetMapping("api/v1/truckTms/dropDown/getUnloadPoint/{type}")
+    Map<String, Object> getUnloadPoint(@PathVariable("type") Integer type);
     /**
      * 包月总实绩
      */