内转部分代码合并

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

@@ -1340,7 +1340,7 @@ public class TMSController extends BaseRESTfulController {
         Map<String,Object> resTfulResult = tmsTrainFeign.getApproveByResultId(resultId);
         return resTfulResult;
     }
-    @ApiOperation(value="内转查询卸车作业信息")
+    @ApiOperation(value="查询卸车作业信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId(201)", value = "动态表头", required = false, dataType = "Integer"),
@@ -1370,9 +1370,96 @@ public class TMSController extends BaseRESTfulController {
                                                                   Integer pageNum,
                                                                   Integer pageSize
     ){
-        return tmsTrainFeign.selectWagonUnLoadResultForConverted(apiId, pageNum, pageSize);
+        return tmsTrainFeign.selectTrainUnLoadResultForConverted(apiId, pageNum, pageSize);
+    }
+    /**
+     * 新增汽车装货实绩
+     */
+    @ApiOperation(value="新增汽车装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addLoadResultForConverted")
+    public Map<String,Object> addLoadResultForConverted(@RequestBody(required=false) Map<String,Object> map){
+        Map<String,Object> resTfulResult = tmsTruckFeign.addLoadResultForConverted(map);
+        return resTfulResult;
+    }
+    @ApiOperation(value="查询所有装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(91)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectLoadResultForConverted")
+    public Map<String,Object> selectLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                                  Integer apiId,
+                                                                  Integer pageNum,
+                                                                  Integer pageSize
+    ){
+        return tmsTruckFeign.selectLoadResultForConverted(mapValue,apiId, pageNum, pageSize);
+    }
+    //根据实绩id渲染数据
+    @ApiOperation(value="通过ID查询装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getLoadResultByResultId/{resultId}")
+    public Map<String,Object> getLoadResultByResultId(@PathVariable("resultId") Integer resultId){
+        Map<String,Object> resTfulResult = tmsTruckFeign.getLoadResultByResultId(resultId);
+        return resTfulResult;
+    }
+    @ApiOperation(value="内转物流查询质检作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(204)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectQualityResultForConverted")
+    public Map<String,Object> selectQualityResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                           Integer apiId,
+                                                           Integer pageNum,
+                                                           Integer pageSize
+    ){
+        return tmsTruckFeign.selectQualityResultForConverted(mapValue,apiId, pageNum, pageSize);
     }
+    /**
+     * 展示计数实绩列表
+     *
+     */
 
+    @ApiOperation(value="查询计数实绩列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectCountList")
+    public Map<String,Object> selectCountList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                              Integer apiId,
+                                                              Integer pageNum,
+                                                              Integer pageSize
+    ){
+        return tmsTruckFeign.selectCountList(mapValue,apiId, pageNum, pageSize);
+    }
+    /**
+     *  内转物流卸货装车实绩
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="内转物流新增卸货实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/addUnLoadResultForconverted")
+    public Map<String,Object> addUnLoadResultForconverted(@RequestBody(required = false) Map<String,Object> map){
+        Map<String,Object> resTfulResult = tmsTruckFeign.addUnLoadResultForconverted(map);
+        return resTfulResult;
+    }
 
 
 

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

@@ -748,10 +748,10 @@ public interface AmsFeign {
     //*****************************************内转物流**************************************
     //查询汽运单价
     @PostMapping(value = "/api/v1/ams/amscontracttransportprices/getAmsContractTransportPriceForConverted")
-    Map<String,Object> getAmsContractTransportPriceForConverted(@PathVariable("lineId")BigDecimal lineId,
-                                                                       Integer apiId,
-                                                                       Integer pageNum,
-                                                                       Integer pageSize);
+    Map<String,Object> getAmsContractTransportPriceForConverted(@RequestParam("lineId") BigDecimal lineId,
+                                                                @RequestParam("apiId")  Integer apiId,
+                                                                @RequestParam("pageNum")Integer pageNum,
+                                                                @RequestParam("pageSize")Integer pageSize);
     //获得运输线路
     @GetMapping(value = "/api/v1/ams/amscontracttransportprices/getLineRoute")
     Map<String,Object> getLineRoute();

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

@@ -178,10 +178,14 @@ public interface TmsTrainFeign {
     Map<String,Object> getApproveByResultId(@PathVariable("resultId")BigDecimal resultId);
 
     @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/selectWagonUnLoadResultForConverted")
-    Map<String,Object>  selectWagonUnLoadResultForConverted(@RequestBody(required=false)
+    Map<String,Object>  selectWagonUnLoadResultForConverted(
                                                             @RequestParam("apiId") Integer apiId,
                                                             @RequestParam("pageNum") Integer pageNum,
                                                             @RequestParam("pageSize") Integer pageSize);
+    @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/selectTrainUnLoadResultForConverted")
+    Map<String,Object>  selectTrainUnLoadResultForConverted(@RequestParam("apiId") Integer apiId,
+                                                            @RequestParam("pageNum") Integer pageNum,
+                                                            @RequestParam("pageSize") Integer pageSize);
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonApprove")
     Map<String,Object> addWagonApprove(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
 }

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

@@ -20,12 +20,24 @@ public interface TmsTruckFeign {
     /*
     TmstruckLoadResultController
      */
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/addLoadResultForConverted")
+    Map<String,Object> addLoadResultForConverted(@RequestBody(required=false) Map<String,Object> map);
     @PostMapping("api/v1/truckTms/tmstruckloadresults/getAllLoadResult")
     public RESTfulResult getAllLoadResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("status") Integer status );
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadResultForConverted")
+    public Map<String,Object> selectLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize);
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/getLoadResultByResultId/{resultId}")
+    public Map<String,Object> getLoadResultByResultId(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/addUnLoadResultForconverted")
+    public Map<String,Object> addUnLoadResultForconverted(@RequestBody(required = false) Map<String,Object> map);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addLoadResult")
     public RESTfulResult addLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
@@ -162,6 +174,20 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckqualityresults/updateQualityResult")
     public RESTfulResult updateQualityResult(@RequestBody(required=false) Map<String,Object> mapValue);
 
+    @PostMapping("api/v1/truckTms/tmstruckqualityresults/selectQualityResultForConverted")
+    Map<String,Object> selectQualityResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       @RequestParam("apiId")    Integer apiId,
+                                                       @RequestParam("pageNum")  Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize);
+    /**
+     * TmstruckTotalResult
+     */
+    @PostMapping("api/v1/truckTms/tmstrucktotalresults/selectCountList")
+    Map<String,Object> selectCountList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       @RequestParam("apiId")    Integer apiId,
+                                                       @RequestParam("pageNum")  Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize);
+
     /**
      * 下拉框
      */