Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -1050,4 +1050,28 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> banTransOrder(@RequestBody Map<String,Object> map) {
         return tmsFeign.banTransOrder(map);
     }
+
+    @ApiOperation(value = "查询销售火运装货报表")
+    @PostMapping("/loadingOperation")
+    public Map<String, Object> loadingOperation(@RequestBody(required = false) Map<String, Object> map,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
+        return tmsFeign.loadingOperation(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "修改火运装车列序号")
+    @PostMapping("/updateTrainOrderSeq")
+    public Map<String,Object> updateTrainOrderSeq(@RequestBody Map<String,Object> map) {
+        return tmsFeign.updateTrainOrderSeq(map);
+    }
+
+    @ApiOperation(value = "查询销售火运装货报表明细")
+    @PostMapping("/purchaseTrainsOrderList")
+    public Map<String, Object> purchaseTrainsOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize) {
+        return tmsFeign.purchaseTrainsOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
 }

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

@@ -369,6 +369,21 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/omstransorders/banTransOrder")
     Map<String, Object> banTransOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/loadingOperation")
+    Map<String, Object> loadingOperation(@RequestBody(required = false) Map<String, Object> map,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/omstransorders/updateTrainOrderSeq")
+    Map<String, Object> updateTrainOrderSeq(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/purchaseTrainsOrderList")
+    Map<String, Object> purchaseTrainsOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
 }