添加销售装车点

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

@@ -1099,6 +1099,43 @@ public class TMSController extends BaseRESTfulController {
 
     //******************************************TmstruckLoadResultController***********************************
 
+    @ApiOperation(value="查询所有正在排队的销售订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(227)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getSaleOrderOnQueue")
+    public Map<String, Object> getSaleOrderOnQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con){
+        return tmsTruckFeign.getSaleOrderOnQueue(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="查询订单下的物资")
+    @GetMapping("getOrderMaterial/{orderId}")
+    public Map<String, Object> getOrderMaterial(@PathVariable("orderId") Integer orderId){
+        return tmsTruckFeign.getOrderMaterial(orderId);
+    }
+
+    @ApiOperation(value="查询仓库下所有月台")
+    @GetMapping("getPlatformIdByWarehouse/{warehouseId}")
+    public Map<String, Object> getPlatformIdByWarehouse(@PathVariable("warehouseId") Integer warehouseId){
+        return tmsTruckFeign.getPlatformIdByWarehouse(warehouseId);
+    }
+
+    @ApiOperation(value="修改装车点和装车顺序：销售钢材专用 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/updateLoadingIdAndLoadSq")
+    public Map<String, Object> updateLoadingIdAndLoadSq(@RequestBody(required=false) Map<String, Object> map){
+        return tmsTruckFeign.updateLoadingIdAndLoadSq(map);
+    }
+
     @ApiOperation(value = "查询所有装车实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),

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

@@ -24,6 +24,26 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addLoadResultForConverted")
     Map<String,Object> addLoadResultForConverted(@RequestBody(required=false) Map<String,Object> map);
 
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/getSaleOrderOnQueue")
+    public Map<String, Object> getSaleOrderOnQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("con") String con);
+
+    @ApiOperation(value="查询订单下的物资")
+    @GetMapping("api/v1/truckTms/dropDown/getOrderMaterial/{orderId}")
+    public Map<String, Object> getOrderMaterial(@PathVariable("orderId") Integer orderId);
+
+    @ApiOperation(value="查询仓库下所有月台")
+    @GetMapping("api/v1/truckTms/dropDown/getPlatformIdByWarehouse/{warehouseId}")
+    public Map<String, Object> getPlatformIdByWarehouse(@PathVariable("warehouseId") Integer warehouseId);
+
+    @ApiOperation(value="修改装车点和装车顺序：销售钢材专用 ")
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadingIdAndLoadSq")
+    public Map<String, Object> updateLoadingIdAndLoadSq(@RequestBody(required=false) Map<String, Object> map);
+
     @PostMapping("api/v1/truckTms/tmstruckloadresults/getAllLoadResult")
     public Map<String, Object> getAllLoadResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,