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

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

@@ -198,11 +198,18 @@ public class TMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/startend")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计时"})
-    @RequestLimit
     public Map<String, Object> start(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.startend(map);
     }
 
+
+    @ApiOperation(value="计时")
+    @PostMapping(value = "/updCountResult")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"计次"})
+    public Map<String, Object> updCountResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.updCountResult(map);
+    }
+
     @ApiOperation(value = "查询计时")
     @PostMapping("/tmstimingresultsList")
     public Map<String, Object> tmstimingresultsList(@RequestBody(required = false) Map<String, Object> map,
@@ -943,4 +950,16 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> delPleaseApprove(@RequestBody Map<String,Object> map) {
         return tmsFeign.delPleaseApprove(map);
     }
+
+    @ApiOperation(value = "火运大宗销售订单 删除销售运输订单")
+    @PostMapping("/changeTransOrderH")
+    public Map<String,Object> changeTransOrderH(@RequestBody Map<String,Object> map) {
+        return tmsFeign.changeTransOrderH(map);
+    }
+
+    @ApiOperation(value = "火运出库后修改车号")
+    @PostMapping("/updateCarNo")
+    public Map<String,Object> updateCarNo(@RequestBody Map<String,Object> map) {
+        return tmsFeign.updateCarNo(map);
+    }
 }

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

@@ -82,6 +82,9 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/tmstimingresults/startend")
     Map<String, Object> startend(Map<String, Object> map);
 
+    @PostMapping("api/v1/tms/tmstimingresults/updCountResult")
+    Map<String, Object> updCountResult(Map<String, Object> map);
+
     @PostMapping("api/v1/tms/tmstimingresults/tmstimingresultsUpdate")
     Map<String, Object> tmstimingresultsUpdate(Map<String, Object> map);
 
@@ -329,6 +332,12 @@ public interface TmsFeign {
 
     @PostMapping(value = "api/v1/tms/tmspleaseapproves/delPleaseApprove")
     Map<String, Object> delPleaseApprove(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/changeTransOrderH")
+    Map<String, Object> changeTransOrderH(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/updateCarNo")
+    Map<String, Object> updateCarNo(Map<String, Object> map);
 }