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

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

@@ -226,11 +226,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             Integer apiId) {
+                                             Integer apiId,
+                                             String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
 
@@ -901,6 +902,15 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.deleteTmstrainLoadingResultByResultId(resultId);
     }
 
+    @ApiOperation(value = "通过主键删除车皮出库作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "主键ID", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/deleteOutBoundWagonById")
+    public Map<String, Object> deleteOutBoundWagonById(@RequestParam BigDecimal resultId){
+        return tmsTrainFeign.deleteOutBoundWagonById(resultId);
+    }
+
     //********************下拉框**********************
 
     @ApiOperation(value = "获取发站地点名称")

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

@@ -53,6 +53,9 @@ public interface TmsTrainFeign {
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/deleteTmstrainLoadingResultByResultId")
     public Map<String, Object> deleteTmstrainLoadingResultByResultId(@RequestParam BigDecimal resultId);
 
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/deleteOutBoundWagonById")
+    public Map<String, Object> deleteOutBoundWagonById(@RequestParam BigDecimal resultId);
+
     //下拉框
 
     @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getSendStationName")

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

@@ -251,7 +251,8 @@ public interface TmsshipFeign {
     Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                 @RequestParam Integer pageNum,
                                 @RequestParam Integer pageSize,
-                                @RequestParam Integer apiId);
+                                @RequestParam Integer apiId,
+                                      @RequestParam String con);
 
     /**
      * 展示船只信息