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

@@ -2,9 +2,12 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -754,4 +757,94 @@ public class AMScontroller extends BaseRESTfulController {
         }
         return amsFeign.getRailOffsetDayplan(mapValue, pageNum, pageSize, apiId);
     }
+
+    ////************************************内转物流***************************************************
+    /**
+     *新增运输计划
+     */
+    @PostMapping("/addTruckPlan")
+    public Map<String,Object> addTruckPlan(@RequestBody  Map<String, Object> mapVal) {
+        return amsFeign.addTruckPlan(mapVal);
+    }
+    //删除
+    @PostMapping("/deleteTruckRequirement/{planId}")
+    public Map<String,Object> deleteTruckPlan(@PathVariable("planId") BigDecimal planId) {
+        return amsFeign.deleteTruckPlan(planId);
+    }
+    /**
+     * 修改运输计划/下发运输计划/承运商接收运输计划
+     */
+    @PostMapping("/updateTruckPlan")
+    public Map<String,Object> updateTruckPlan(@RequestBody  Map<String, Object> mapVal){
+        return amsFeign.updateTruckPlan(mapVal);
+    }
+    /**
+     * 展示运输计划
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示运输计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "还未知", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getTruckPlanList")
+    public RESTfulResult getTruckPlanList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId);
+    }
+    /**
+     *用车单位提出需求
+     *新增用车需求
+     */
+    @PostMapping("/addTruckRequirement")
+    public Map<String,Object> addTruckRequirement(@RequestBody  Map<String, Object> mapVal) {
+        return amsFeign.addTruckRequirement(mapVal);
+    }
+    //删除用车需求
+    @PostMapping("/deleteTruckRequirement/{requirementId}")
+    public Map<String,Object> deleteTruckRequirement(@PathVariable("requirementId") BigDecimal requirementId) {
+        return amsFeign.deleteTruckRequirement(requirementId);
+    }
+    /**
+     * 修改用车需求/下发用车需求
+     */
+    @PostMapping("/updateTruckRequirement")
+    public Map<String,Object> updateTruckRequirement(@RequestBody  Map<String, Object> mapVal){
+        return amsFeign.updateTruckRequirement(mapVal);
+    }
+
+    /**
+     * 展示用车需求
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示用车需求")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "还未知", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getTruckRequirementList")
+    public RESTfulResult getTruckRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId);
+    }
 }

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

@@ -866,5 +866,51 @@ public interface AmsFeign {
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
 
+    /**
+     *新增运输计划
+     */
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/addTruckPlan")
+    Map<String,Object> addTruckPlan(@RequestBody(required = false) Map<String, Object> mapVal);
+    //删除运输计划
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/deleteTruckRequirement/{planId}")
+    Map<String,Object> deleteTruckPlan(@PathVariable("planId") BigDecimal planId);
+    //修改运输计划/下发运输计划/承运商接收运输计划
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/updateTruckPlan")
+    Map<String,Object> updateTruckPlan(@RequestBody(required = false) Map<String, Object> mapVal);
+    /**
+     * 展示运输计划
+     */
+    @ApiOperation(value="展示运输计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(还没有设置表头)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/getTruckPlanList")
+    RESTfulResult getTruckPlanList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam Integer pageNum,
+                                       @RequestParam Integer pageSize,
+                                       @RequestParam Integer apiId);
+    /**
+     *新增用车需求
+     */
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/addTruckRequirement")
+    Map<String,Object> addTruckRequirement(@RequestBody(required = false) Map<String, Object> mapVal);
+    //用车需求
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/deleteTruckRequirement/{requirementId}")
+    Map<String,Object> deleteTruckRequirement(@PathVariable("requirementId") BigDecimal requirementId);
+    //修改用车需求/下发用车需求
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/updateTruckRequirement")
+    Map<String,Object> updateTruckRequirement(@RequestBody(required = false) Map<String, Object> mapVal);
+    /**
+     * 展示用车需求
+     */
+    @ApiOperation(value="展示用车需求")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(还没有设置表头)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/getTruckRequirementList")
+    RESTfulResult getTruckRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize,
+                                   @RequestParam Integer apiId);
 
 }