修改

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

@@ -21,2270 +21,8 @@ import java.util.Map;
 @RestController
 @RequestMapping("${api.version}/ams")
 public class AMScontroller{
-
     @Autowired
     AmsFeign amsFeign;
 
 
-    @ApiOperation(value="查询运输预约")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(79)", 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("/getAllPurPlan")
-    public Map<String, Object> getAllPurPlan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       Integer apiId,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer status,String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getAllPurPlan(mapValue, apiId, pageNum, pageSize, status, con);
-    }
-
-    @ApiOperation(value = "通过Id查询请车作业")
-    @PostMapping("/getPurPlanById/{planId}")
-    public Map<String, Object> getPurPlanById(@PathVariable("planId") Integer planId) {
-        return amsFeign.getPurPlanById(planId);
-    }
-
-    @ApiOperation(value = "新增运输计划 状态：0")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "amstruckPurplan", value = "运输计划实绩对象", required = false, dataType = "AmstruckPurplan"),
-    })
-    @PostMapping("/addPurPlan")
-    public Map<String, Object> addPurPlan(@RequestBody Map<String, Object> map) {
-        return amsFeign.addPurPlan(map);
-    }
-
-    @ApiOperation(value="修改运输计划")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "amstruckPurplan", value = "请车作业实绩对象", required = false, dataType = "AmstruckPurplan"),
-    })
-    @PostMapping("/updatePurPlan")
-    public Map<String, Object> updatePurPlan(@RequestBody Map<String, Object> amstruckPurplan){
-        return amsFeign.updatePurPlan(amstruckPurplan);
-    }
-
-    @ApiOperation(value = "下发运输计划 状态：1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/sendPurPlan/{planId}")
-    public Map<String, Object> sendPurPlan(@PathVariable("planId") Integer planId) {
-        return amsFeign.sendPurPlan(planId);
-    }
-
-    @ApiOperation(value = "接收运输计划 状态：2")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/receptionPurPlan/{planId}")
-    public Map<String, Object> receptionPurPlan(@PathVariable("planId") Integer planId) {
-        return amsFeign.receptionPurPlan(planId);
-    }
-
-    //停用运输计划
-    @PostMapping("/changePlanStatus/{planId}")
-    public Map<String,Object>changePlanStatus(@PathVariable("planId") BigDecimal planId){
-        return amsFeign.changePlanStatus(planId);
-    }
-
-
-
-    @ApiOperation(value = "逻辑删除运输计划 状态：3")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/deletePurPlan/{planId}")
-    public Map<String, Object> deletePurPlan(@PathVariable("planId") Integer planId) {
-        return amsFeign.deletePurPlan(planId);
-    }
-
-    //**************************************************************************************
-    @ApiOperation(value = "查询要分派的计划")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(82)", 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("/getDecomposedPlan")
-    public Map<String, Object> getDecomposedPlan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           Integer planId,
-                                           Integer status,
-                                                 Integer planStatus,
-                                                 String con) {
-        return amsFeign.getDecomposedPlan(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, planId, status, planStatus, con);
-    }
-
-
-    /**
-     * 违约规则
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getBreachList")
-    @ApiOperation(value = "展示违约列表")
-    public Map<String, Object> getBreachList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getBreachList(mapValue, pageNum, pageSize, apiId);
-    }
-
-    @PostMapping("addContractBreach")
-    @ApiOperation(value = "新增违约规则")
-    Map<String, Object> addContractBreach(@RequestBody Map<String, Object> amsContractBreach) {
-        return amsFeign.addContractBreach(amsContractBreach);
-    }
-
-    @PostMapping("deleteContractBreach/{breachId}")
-    @ApiOperation(value = "逻辑删除违约规则")
-    Map<String, Object> deleteContractBreach(@PathVariable("breachId") BigDecimal breachId) {
-        return amsFeign.deleteContractBreach(breachId);
-    }
-
-    @PostMapping("updateContractBreach")
-    @ApiOperation(value = "修改违约规则")
-    Map<String, Object> updateContractBreach(@RequestBody Map<String, Object> amsContractBreach) {
-        return amsFeign.updateContractBreach(amsContractBreach);
-    }
-
-    @PostMapping("selectBreachToUpdate/{breachId}")
-    @ApiOperation(value = "查询违约规则")
-    Map<String, Object> selectBreachToUpdate(@PathVariable("breachId") BigDecimal breachId) {
-        return amsFeign.selectBreachToUpdate(breachId);
-    }
-
-
-    /**
-     * 港口装卸单价
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getLoadUnloadPriceList")
-    @ApiOperation(value = "展示港口装卸单价列表")
-    public Map<String, Object> getLoadUnloadPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getLoadUnloadPriceList(mapValue, pageNum, pageSize, apiId);
-    }
-
-    @PostMapping("addLoadUnloadPrice")
-    @ApiOperation(value = "新增港口装卸单价")
-    Map<String, Object> addLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice) {
-        return amsFeign.addLoadUnloadPrice(amsContractOtherPrice);
-    }
-
-    @PostMapping("deleteLoadUnloadPrice/{priceId}")
-    @ApiOperation(value = "逻辑删除港口装卸单价")
-    Map<String, Object> deleteLoadUnloadPrice(@PathVariable("priceId") BigDecimal priceId) {
-        return amsFeign.deleteLoadUnloadPrice(priceId);
-    }
-
-    @PostMapping("updateLoadUnloadPrice")
-    @ApiOperation(value = "修改港口装卸单价")
-    Map<String, Object> updateLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice) {
-        return amsFeign.updateLoadUnloadPrice(amsContractOtherPrice);
-    }
-
-    @PostMapping("selectLoadUnloadPriceToUpdate/{priceId}")
-    @ApiOperation(value = "查询港口装卸单价")
-    Map<String, Object> selectLoadUnloadPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
-        return amsFeign.selectLoadUnloadPriceToUpdate(priceId);
-    }
-
-
-    /**
-     * 火运单价
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getTrainPriceList")
-    @ApiOperation(value = "展示火运单价列表")
-    public Map<String, Object> getTrainPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getTrainPriceList(mapValue, pageNum, pageSize, apiId);
-    }
-
-    @PostMapping("addTrainPrice")
-    @ApiOperation(value = "新增火运单价")
-    Map<String, Object> addTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice) {
-        return amsFeign.addTrainPrice(amsContractTrainPrice);
-    }
-
-    @PostMapping("deleteTrainPrice/{priceId}")
-    @ApiOperation(value = "逻辑删除火运单价")
-    Map<String, Object> deleteTrainPrice(@PathVariable("priceId") BigDecimal priceId) {
-        return amsFeign.deleteTrainPrice(priceId);
-    }
-
-    @PostMapping("updateTrainPrice")
-    @ApiOperation(value = "修改火运单价")
-    Map<String, Object> updateTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice) {
-        return amsFeign.updateTrainPrice(amsContractTrainPrice);
-    }
-
-    @PostMapping("selectTrainPriceToUpdate/{priceId}")
-    @ApiOperation(value = "通过id查询火运单价")
-    Map<String, Object> selectTrainPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
-        return amsFeign.selectTrainPriceToUpdate(priceId);
-    }
-
-    /**
-     * 运费单价
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getShipPriceList")
-    @ApiOperation(value = "展示水运单价列表")
-    public Map<String, Object> getShipPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getShipPriceList(mapValue, pageNum, pageSize, apiId);
-    }
-
-    @PostMapping("addShipPrice")
-    @ApiOperation(value = "新增水运单价")
-    Map<String, Object> addShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
-        return amsFeign.addShipPrice(amsContractTransportPrice);
-    }
-
-    @PostMapping("deleteShipPrice/{priceId}")
-    @ApiOperation(value = "逻辑删除运费单价")
-    Map<String, Object> deleteShipPrice(@PathVariable("priceId") BigDecimal priceId) {
-        return amsFeign.deleteShipPrice(priceId);
-    }
-
-    @PostMapping("updateShipPrice")
-    @ApiOperation(value = "修改水运单价")
-    Map<String, Object> updateShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
-        return amsFeign.updateShipPrice(amsContractTransportPrice);
-    }
-
-    @PostMapping("selectPriceToUpdate/{priceId}")
-    @ApiOperation(value = "通过id查询运费单价")
-    Map<String, Object> selectPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
-        return amsFeign.selectPriceToUpdate(priceId);
-    }
-
-    @PostMapping("getTruckPriceList")
-    @ApiOperation(value = "展示汽运单价列表")
-    public Map<String, Object> getTruckPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getTruckPriceList(mapValue, pageNum, pageSize, apiId);
-    }
-
-    @PostMapping("addAmsContractTransportPrice")
-    @ApiOperation(value = "新增汽运单价")
-    Map<String, Object> addAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
-        return amsFeign.addAmsContractTransportPrice(amsContractTransportPrice);
-    }
-
-    @PostMapping("updateAmsContractTransportPrice")
-    @ApiOperation(value = "修改汽运单价")
-    Map<String, Object> updateAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
-        return amsFeign.updateAmsContractTransportPrice(amsContractTransportPrice);
-    }
-
-
-    @PostMapping("getPurchaseOrderList")
-    @ApiOperation(value = "展示采购订单列表")
-    public Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              Integer apiId,
-                                              String con,
-                                                    String sendCompId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId, con, sendCompId);
-    }
-
-    /**
-     * 获取收货地址
-     * @return
-     */
-    @PostMapping("getAddressDeliveryAddress")
-    @ApiOperation(value = "得到地址下拉")
-    @ApiImplicitParam(name = "apiId",value = "255")
-    public Map<String, Object> getAddressDeliveryAddress(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                         Integer apiId,
-                                                         Integer pageNum,
-                                                         Integer pageSize,
-                                                         String con){
-        return amsFeign.getAddressDeliveryAddress(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @GetMapping("getShipperId")
-    @ApiOperation(value = "得到托运人下拉")
-    public Map<String, Object> getShipperId(){
-        return amsFeign.getShipperId();
-    }
-
-    @GetMapping("getCarrierId")
-    @ApiOperation(value = "得到承运商下拉")
-    public Map<String, Object> getCarrierId(){
-        return amsFeign.getCarrierId();
-    }
-
-    @GetMapping("getCapacityId")
-    @ApiOperation(value = "获取船id下拉列表")
-    public Map<String, Object> getCapacityId(){
-        return amsFeign.getCapacityId();
-    }
-
-    @GetMapping("getMaterialId")
-    @ApiOperation(value = "得到物资下拉")
-    public Map<String, Object> getMaterialId(){
-        return amsFeign.getMaterialId();
-    }
-
-    @GetMapping("getTruckCapacityId")
-    @ApiOperation(value = "得到车牌号下拉")
-    public Map<String, Object> getTruckCapacityId(){
-        return amsFeign.getTruckCapacityId();
-    }
-
-    @GetMapping("getLineId")
-    @ApiOperation(value = "获取运输线路下拉列表")
-    public Map<String, Object> getLineId(){
-        return amsFeign.getLineId();
-    }
-// ----------------------------------销售合同-------------------------------------------
-    /**
-     * 查询汽运单价信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("/getAmsContractTransportPrice1")
-    @ApiOperation(value = "查询汽运单价信息")
-    public Map<String, Object> getAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                             Integer pageNum,
-                                                             Integer pageSize,
-                                                             Integer apiId,
-                                                             String con,
-                                                             Integer deleted) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, con,deleted);
-    }
-
-    @PostMapping("/importDataForAmsContractTransportPrice")
-    @ApiOperation(value = "查询汽运单价信息")
-    public Map<String, Object> importDataForAmsContractTransportPrice(@RequestBody(required = false) List<Map<String,Object>> mapList,
-                                                                      BigDecimal importPriceValue, String importPriceDate) {
-        return amsFeign.importDataForAmsContractTransportPrice(mapList,importPriceValue,importPriceDate);
-    }
-
-    @PostMapping("/deleteSalelPrice")
-    @ApiOperation(value = "删除单价")
-    public Map<String,Object> deleteSalelPrice(@RequestBody(required=false) Map<String,Object> mapValue){
-        return amsFeign.deleteSalelPrice(mapValue);
-    }
-
-    @PostMapping("/getCarrierListByPrice")
-    @ApiOperation(value = "获取所有承运商")
-    public Map<String,Object> getCarrierListByPrice(@RequestBody(required=false) Map<String,Object> mapValue){
-        return amsFeign.getCarrierListByPrice(mapValue);
-    }
-
-    @PostMapping("/updatePriceValue")
-    @ApiOperation(value = "更新单价")
-    public Map<String,Object> updatePriceValue(@RequestBody(required=false) Map<String,Object> mapValue){
-        return amsFeign.updatePriceValue(mapValue);
-    }
-
-    @PostMapping("/updateaddressDeliveryAddress")
-    @ApiOperation(value = "更新卸货地址")
-    public Map<String,Object> updateaddressDeliveryAddress(@RequestBody(required=false) Map<String,Object> mapValue){
-        return amsFeign.updateaddressDeliveryAddress(mapValue);
-    }
-
-    @PostMapping("/getCarrierListByAddress")
-    @ApiOperation(value = "获取数据")
-    public Map<String,Object> getCarrierListByAddress(@RequestBody(required=false) Map<String,Object> mapValue){
-        return amsFeign.getCarrierListByAddress(mapValue);
-    }
-
-    @PostMapping("/updateCarrierName")
-    @ApiOperation(value = "批量更新或者新增承运商")
-    public Map<String,Object> updateCarrierName(@RequestBody(required=false) Map<String,Object> mapValue){
-        return amsFeign.updateCarrierName(mapValue);
-    }
-
-    @PostMapping("/getAmsContractTransportPriceForDetail")
-    @ApiOperation(value = "查询汽运单价信息(计费详单专用)")
-    public Map<String, Object> getAmsContractTransportPriceForDetail(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                             Integer pageNum,
-                                                             Integer pageSize,
-                                                             Integer apiId,
-                                                             String con, String userId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getAmsContractTransportPriceForDetail(mapValue, pageNum, pageSize, apiId, con,userId);
-    }
-
-    @PostMapping("/getInwardContractPrice")
-    @ApiOperation(value = "查询内转汽运单价信息")
-    public Map<String, Object> getInwardContractPrice(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                             Integer pageNum,
-                                                             Integer pageSize,
-                                                             Integer apiId,
-                                                             Integer deleted,
-                                                             String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getInwardContractPrice(mapValue, pageNum, pageSize, apiId, deleted,con);
-    }
-
-
-    /**
-     * 新增汽运单价
-     * @param mapVal
-     * @return
-     */
-    @PostMapping("addAmsContractTransportUnitPrice1")
-    @ApiOperation(value = "新增汽运单价")
-    Map<String, Object> addAmsContractTransportUnitPrice1(@RequestBody Map<String, Object> mapVal) {
-        return amsFeign.addAmsContractTransportUnitPrice1(mapVal);
-    }
-
-
-    @PostMapping("insertInwardPrice")
-    @ApiOperation(value = "新增内转运输单价")
-    Map<String, Object> insertInwardPrice(@RequestBody Map<String, Object> mapVal) {
-        return amsFeign.insertInwardPrice(mapVal);
-    }
-
-    @PostMapping("deleteAmsContractTransportPrice1")
-    @ApiOperation(value = "通过主键id删除汽运单价")
-    Map<String, Object> deleteAmsContractTransportPrice1(@RequestParam BigDecimal priceId) {
-        return amsFeign.deleteAmsContractTransportPrice1(priceId);
-    }
-
-    /**
-     * 通过主键修改汽运单价
-     */
-    @PostMapping("updateAmsContractTransportPrice1")
-    @ApiOperation(value = "通过主键id修改汽运单价")
-    Map<String, Object> updateAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapVal) {
-        return amsFeign.updateAmsContractTransportPrice1(mapVal);
-    }
-    /**
-     *通过主键渲染信息
-     */
-    @PostMapping(value = "/getAmsContractTransportPriceByPriceId1")
-    Map<String, Object> getAmsContractTransportPriceByPriceId1(@RequestParam BigDecimal priceId){
-        return amsFeign.getAmsContractTransportPriceByPriceId1(priceId);
-    }
-    /**
-     * 通过主键修改汽运单价
-     */
-    @PostMapping("batchUpdateTransportPriceByOilPrice1")
-    @ApiOperation(value = "油价联动导致运价变动，批量修改运价")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice1(@RequestBody Map<String,Object> map) {
-        return amsFeign.batchUpdateTransportPriceByOilPrice1(map);
-    }
-    @GetMapping("getLineNo")
-    @ApiOperation(value = "得到线路编号下拉")
-    public Map<String, Object> getLineNo(){
-        return amsFeign.getLineNo();
-    }
-    @GetMapping("getCapacityNumber")
-    @ApiOperation(value = "得到运力编号下拉")
-    public Map<String, Object> getCapacityNumber(){
-        return amsFeign.getCapacityNumber();
-    }
-    @GetMapping("getDeliveryAddress")
-    @ApiOperation(value = "得到收货地址下拉")
-    public Map<String, Object> getDeliveryAddress(){
-        return amsFeign.getDeliveryAddress();
-    }
-
-    @GetMapping("getCargoName")
-    @ApiOperation(value = "获取货物类型")
-    public Map<String, Object> getCargoName(){
-        return amsFeign.getCargoName();
-    }
-
-    @GetMapping("getOilTypeName")
-    @ApiOperation(value = "获取油品名称")
-    public Map<String, Object> getOilTypeName(){
-        return amsFeign.getOilTypeName();
-    }
-
-    @PostMapping("/addAmsDispatchSaleOrder")
-    Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
-        return amsFeign.addAmsDispatchSaleOrder(mapVal);
-    }
-    @GetMapping("getCarrierName")
-    @ApiOperation(value = "得到承运商名称")
-    public Map<String, Object> getCarrierName(){
-        return amsFeign.getCarrierName();
-    }
-    @PostMapping("getSaleOrderInfo")
-    @ApiOperation(value = "查询汽运单价信息")
-    public Map<String, Object> getSaleOrderInfo(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                    Integer pageNum,
-                                                    Integer pageSize,
-                                                    Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getSaleOrderInfo(mapValue, pageNum, pageSize, apiId);
-    }
-
-    @ApiOperation(value="查询已上报销售订单信息")
-    @PostMapping("/getSaleOrderReported")
-    Map<String, Object> getSaleOrderReported(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize,
-                                             @RequestParam Integer apiId){
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getSaleOrderReported(mapValue,pageNum,pageSize,apiId);
-    }
-    @PostMapping("getAmsSaleOrderApproved")
-    @ApiOperation(value = "查询财务已审批销售订单信息")
-    public Map<String, Object> getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getAmsSaleOrderApproved(mapValue, pageNum, pageSize, apiId);
-    }
-    @PostMapping("getSaleOrderDetail")
-    @ApiOperation(value = "查询汽运单价信息")
-    public Map<String, Object> getSaleOrderDetail(@RequestParam BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getSaleOrderDetail(saleOrderId,mapValue, pageNum, pageSize, apiId);
-    }
-    @PostMapping("uploadSaleOrder")
-    Map<String, Object> uploadSaleOrder(@RequestParam BigDecimal saleOrderId) {
-        return amsFeign.uploadSaleOrder(saleOrderId);
-    }
-    @PostMapping("/addAmsSaleOrder")
-    Map<String, Object> addAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
-        return amsFeign.addAmsSaleOrder(mapVal==null?new HashMap<>():mapVal);
-    }
-    @PostMapping("getAmsSaleOrderBySaleOrderId")
-    Map<String, Object> getAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId) {
-        return amsFeign.getAmsSaleOrderBySaleOrderId(saleOrderId);
-    }
-    @PostMapping("/updateAmsSaleOrder")
-    Map<String, Object> updateAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
-        return amsFeign.updateAmsSaleOrder(mapVal);
-    }
-    @PostMapping("deleteAmsSaleOrderBySaleOrderId")
-    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@RequestBody(required = false) List<Map<String,Object>> mapValue) {
-        return amsFeign.deleteAmsSaleOrderBySaleOrderId(mapValue);
-    }
-    @PostMapping("getSaleOrderUpdateLog")
-    @ApiOperation(value = "查询汽运单价信息")
-    public Map<String, Object> getSaleOrderUpdateLog(BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getSaleOrderUpdateLog(saleOrderId,mapValue, pageNum, pageSize, apiId);
-    }
-    @GetMapping(value = "getSalePlanName")
-    @ApiOperation(value="获取销售计划名称")
-    public Map<String, Object> getSalePlanName(){return amsFeign.getSalePlanName();}
-    @GetMapping("getShipperName")
-    @ApiOperation(value = "得到发货单位下拉")
-    public Map<String, Object> getShipperName(){
-        return amsFeign.getShipperName();
-    }
-    @GetMapping("getConsigneeCompanyName")
-    @ApiOperation(value = "得到收货单位下拉")
-    public Map<String, Object> getConsigneeCompanyName(){
-        return amsFeign.getConsigneeCompanyName();
-    }
-    @PostMapping("addAmsSaleOrderMaterial")
-    Map<String, Object> addAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map) {
-        return amsFeign.addAmsSaleOrderMaterial(map);
-    }
-    @PostMapping("getAmsSaleOrderMaterialBySaleOrderMaterialId")
-    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@RequestParam BigDecimal saleOrderMaterialId) {
-        return amsFeign.getAmsSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
-    }
-    @ApiOperation(value="通过主键修改销售订单物资信息")
-    @PostMapping(value = "/updateAmsSaleOrderMaterial")
-    Map<String, Object> updateAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map){
-        return amsFeign.updateAmsSaleOrderMaterial(map);
-    }
-    @PostMapping("deleteAmsSaleOrderMaterialBySaleOrderMaterialId")
-    Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(BigDecimal saleOrderMaterialId) {
-        return amsFeign.deleteAmsSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
-    }
-    @PostMapping("getAddress")
-    Map<String, Object> getAddress(BigDecimal saleOrderMaterialId) {
-        return amsFeign.getAddress(saleOrderMaterialId);
-    }
-    @PostMapping("updateAddress")
-    Map<String, Object> updateAddress(@RequestBody(required = false)Map<String,Object> map) {
-        return amsFeign.updateAddress(map);
-    }
-    @PostMapping("getSalePlanInfo")
-    @ApiOperation(value = "查询汽运单价信息")
-    public Map<String, Object> getSalePlanInfo(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getSalePlanInfo(mapValue, pageNum, pageSize, apiId);
-    }
-    @PostMapping("addAmsSalePlan")
-    Map<String, Object> addAmsSalePlan(@RequestBody(required = false)Map<String,Object> map) {
-        return amsFeign.addAmsSalePlan(map);
-    }
-    @PostMapping("getAmsSalePlanByPlanId")
-    Map<String, Object> getAmsSalePlanByPlanId(@RequestParam BigDecimal planId) {
-        return amsFeign.getAmsSalePlanByPlanId(planId);
-    }
-    @PostMapping("upadteAmsSalePlanByPlanId")
-    Map<String, Object> upadteAmsSalePlanByPlanId(@RequestBody(required = false)Map<String,Object> map) {
-        return amsFeign.upadteAmsSalePlanByPlanId(map);
-    }
-    @PostMapping("deleteAmsSalePlanByPlanId")
-    Map<String, Object> deleteAmsSalePlanByPlanId(@RequestParam BigDecimal planId) {
-        return amsFeign.deleteAmsSalePlanByPlanId(planId);
-    }
-    @GetMapping("getMaterialName")
-    @ApiOperation(value = "得到收货单位下拉")
-    public Map<String, Object> getMaterialName(){
-        return amsFeign.getMaterialName();
-    }
-    @GetMapping("getAreaName")
-    @ApiOperation(value = "得到收货单位下拉")
-    public Map<String, Object> getAreaName(){
-        return amsFeign.getAreaName();
-    }
-
-
-    @PostMapping("getSalePlanMaterialInfo")
-    @ApiOperation(value="查询销售计划物资信息")
-    public Map<String, Object> getSalePlanMaterialInfo(@RequestParam BigDecimal planId,@RequestBody(required=false) Map<String,Object> mapValue,
-                                                @RequestParam Integer apiId,
-                                                @RequestParam Integer pageNum,
-                                                @RequestParam Integer pageSize){
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getSalePlanMaterialInfo(planId,mapValue,apiId,pageNum,pageSize);
-    }
-
-    @PostMapping(value = "addAmsSalePlanMaterial")
-    @ApiOperation(value="新增销售计划物资信息")
-    public Map<String, Object> addAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map){
-        return amsFeign.addAmsSalePlanMaterial(map);
-    }
-
-    @PostMapping(value = "deleteAmsSalePlanMaterial")
-    @ApiOperation(value="通过主键删除销售计划物资信息")
-    Map<String, Object> deleteAmsSalePlanMaterial(@RequestParam BigDecimal planMaterialId){
-        return amsFeign.deleteAmsSalePlanMaterial(planMaterialId);
-    }
-
-    @PostMapping(value = "/getAmsSalePlanMaterialByPlanMaterialId")
-    @ApiOperation(value="通过主键查询销售计划物资信息")
-    Map<String, Object> getAmsSalePlanMaterialByPlanMaterialId(@RequestParam BigDecimal planMaterialId){
-        return amsFeign.getAmsSalePlanMaterialByPlanMaterialId(planMaterialId);
-    }
-
-    @PostMapping(value = "/upadteAmsSalePlanMaterial")
-    @ApiOperation(value="通过主键修改销售计划物资信息")
-    Map<String, Object> upadteAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map){
-        return amsFeign.upadteAmsSalePlanMaterial(map);
-    }
-
-    @PostMapping("/getTruckNoDetail")
-    @ApiOperation(value="查询销售订单车序号详细信息")
-    Map<String, Object> getTruckNoDetail(@RequestParam BigDecimal saleOrderMaterialId,@RequestBody(required=false) Map<String,Object> mapValue,
-                                         @RequestParam Integer apiId,
-                                         @RequestParam Integer pageNum,
-                                         @RequestParam Integer pageSize){
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getTruckNoDetail(saleOrderMaterialId,mapValue,apiId,pageNum,pageSize);
-    }
-
-    @ApiOperation(value="新增车序号物资信息")
-    @PostMapping(value = "/addAmsSaleTrucknoMaterial")
-    Map<String, Object> addAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map){
-        return amsFeign.addAmsSaleTrucknoMaterial(map);
-    }
-
-    @ApiOperation(value="通过主键删除车序号物资信息")
-    @PostMapping(value = "/deleteAmsSaleTrucknoMaterial")
-    Map<String, Object> deleteAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId){
-        return amsFeign.deleteAmsSaleTrucknoMaterial(trucknoMaterialId);
-    }
-
-    @ApiOperation(value="通过主键渲染车序号物资信息")
-    @PostMapping(value = "/getAmsSaleTrucknoMaterial")
-    Map<String, Object> getAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId){
-        return amsFeign.getAmsSaleTrucknoMaterial(trucknoMaterialId);
-    }
-
-    @ApiOperation(value="通过主键修改车序号物资信息")
-    @PostMapping(value = "/updateAmsSaleTrucknoMaterial")
-    Map<String, Object> updateAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map){
-        return amsFeign.updateAmsSaleTrucknoMaterial(map);
-    }
-    //************************************内转物流***************************************************
-    @PostMapping("getAmsContractTransportPriceForConverted")
-    @ApiOperation(value = "内转物流查询汽运单价信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId(205)", value = "表头", required = false, dataType = "Interger")
-    })
-   public Map<String,Object> getAmsContractTransportPriceForConverted(@PathVariable("lineId")BigDecimal lineId,
-                                         Integer apiId,
-                                         Integer pageNum,
-                                         Integer pageSize) {
-        return amsFeign.getAmsContractTransportPriceForConverted(lineId, pageNum, pageSize, apiId);
-    }
-    /**
-     * 下拉框显示线路
-     */
-    @ApiOperation(value="获取线路")
-    @ApiImplicitParams({
-    })
-    @GetMapping(value = "/getLineRoute")
-    public Map<String,Object> getLineRoute(){
-        return amsFeign.getLineRoute();
-    }
-
-    //销售订单-固定派单-公开派单-日计划
-
-    @ApiModelProperty(value = "展示销售公司已审核的订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "105", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping("/getSaleOrderListBySaleCompany")
-    public Map<String,Object> getSaleOrderListBySaleCompany(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-                                                       Integer apiId,
-                                                       String con){
-      return   amsFeign.getSaleOrderListBySaleCompany(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
-    }
-
-
-
-
-    //展示销售公司已审核销售订单的车序号列表
-    @PostMapping("/getSaleOrderList")
-    @ApiOperation(value = "查询汽运单价信息")
-    public Map<String,Object> amsSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer apiId,
-                                           Integer status    ) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.amsSaleOrderList(mapValue, pageNum, pageSize, apiId,status);
-    }
-
-    //固定派单：通过车序号查询收货地址，截取收货地址的区域，去资源管理中查询对应的承运商,将车序号与承运商绑定
-    @PostMapping("/addFixedAmsDispatchSaleOrder")
-    Map<String,Object> addFixedAmsDispatchSaleOrder(@RequestBody(required = false) List<Map<String,Object>> mapValue) {
-        return amsFeign.addFixedAmsDispatchSaleOrder(mapValue);
-    }
-
-    //公开派单
-    //查询未分派车辆的销售订单的车序号
-    @PostMapping("/getAmsSaleOrderMaterial")
-    @ApiOperation(value = "展示车序号列表")
-    public Map<String,Object> getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer apiId,
-                                                      Integer status) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getAmsSaleOrderMaterial(mapValue, pageNum, pageSize, apiId,status);
-    }
-
-    //新增公开派单
-    @PostMapping("/addOpenAmsDispatchSaleOrder/{orderMaterialId}")
-    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("orderMaterialId") BigDecimal orderMaterialId) {
-        return amsFeign.addOpenAmsDispatchSaleOrder(orderMaterialId);
-    }
-
-    //删除公开派单
-    @PostMapping("/deleteAmsDispatchSaleOrder/{dispatchId}")
-    Map<String,Object> deleteAmsDispatchSaleOrder(@PathVariable("dispatchId") BigDecimal saleOrderId) {
-        return amsFeign.deleteAmsDispatchSaleOrder(saleOrderId);
-    }
-
-    //展示公开派单
-    @PostMapping("/getOpenDispatchSaleOrder")
-    @ApiOperation(value = "公开派单")
-    public Map<String,Object> getOpenDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getOpenDispatchSaleOrder(mapValue, pageNum, pageSize, apiId);
-    }
-
-    //修改公开派单
-    @PostMapping("/updateOpenDispatchSaleOrder")
-    Map<String,Object> updateOpenDispatchSaleOrder(@RequestBody  Map<String, Object> mapVal) {
-        return amsFeign.updateOpenDispatchSaleOrder(mapVal);
-    }
-
-
-    //焦炭、水渣日计划
-    //新增
-    @PostMapping("/addTruckRailDayPlan")
-    public Map<String,Object> addTruckRailDayPlan(@RequestBody  Map<String, Object> mapVal) {
-        return amsFeign.addTruckRailDayPlan(mapVal);
-    }
-    //删除
-    @PostMapping("/deleteTruckRailDayPlan/{dayPlanId}")
-    public Map<String,Object> deleteTruckRailDayPlan(@PathVariable("dayPlanId") BigDecimal dayPlanId) {
-        return amsFeign.deleteTruckRailDayPlan(dayPlanId);
-    }
-    //修改
-    @PostMapping("/updateTruckRailDayPlan")
-    public Map<String,Object> updateTruckRailDayPlan(@RequestBody  Map<String, Object> mapVal) {
-        return amsFeign.updateTruckRailDayPlan(mapVal);
-    }
-    @PostMapping("getDayPlanByDayPlanId/{dayplanId}")
-    Map<String,Object> getDayPlanByDayPlanId(@PathVariable("dayplanId") Integer dayplanId){
-        return amsFeign.getDayPlanByDayPlanId(dayplanId);
-    }
-
-    /**
-     * 修改日期计划 2021年11月20日03:18:05
-     * @param map
-     * @return
-     */
-    @PostMapping("/updateDayPlan")
-    public Map<String,Object> updateDayPlan(@RequestBody(required = false) Map<String, Object> map){
-        return amsFeign.updateDayPlan(map);
-    }
-
-    /**
-     * 查询所有的承运商
-     * @return
-     */
-    @GetMapping("/getCarrierMes")
-    public  Map<String,Object> getCarrierMes() {
-        return amsFeign.getCarrierMes();
-    }
-
-    //展示日计划
-    @PostMapping("/getTruckRailDayPlanList")
-    @ApiOperation(value = "焦炭日计划")
-    public Map<String, Object> getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             Integer apiId,
-                                                   Integer status) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getTruckRailDayPlan(mapValue, pageNum, pageSize, apiId, status);
-    }
-    //展示日计划
-    @PostMapping("/getSzTruckRailDayPlanList")
-    @ApiOperation(value = "水渣日计划")
-    public Map<String, Object> getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer apiId,
-                                               Integer status) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getSzTruckRailDayPlan(mapValue, pageNum, pageSize, apiId, status);
-    }
-
-    //新增钢材发往异地库计划
-    @PostMapping("/addRailOffsetDayplan")
-    public Map<String,Object> addRailOffsetDayplan(@RequestBody  Map<String, Object> mapVal){
-        return amsFeign.addRailOffsetDayplan(mapVal);
-    }
-    //删除钢材发往异地库计划
-    @PostMapping("/deleteRailOffsetDayplan/{dayplanId}")
-    public Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayplanId") Integer dayplanId) {
-        return amsFeign.deleteRailOffsetDayplan(dayplanId);
-    }
-    //修改钢材发往异地库计划
-    @PostMapping("/updateRailOffsetDayplan")
-    public Map<String,Object> updateRailOffsetDayplan(@RequestBody  Map<String, Object> mapVal){
-        return amsFeign.updateRailOffsetDayplan(mapVal);
-    }
-
-    //钢材发运到异地库查询物资
-    @PostMapping("/getMaterialMesByDayPlanId")
-    public Map<String,Object> getMaterialMesByDayPlanId(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                        Integer pageNum,
-                                                        Integer pageSize,
-                                                        Integer apiId,
-                                                        Integer dayplanId){
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getMaterialMesByDayPlanId(mapValue,pageNum,pageSize,apiId,dayplanId);
-    }
-
-    //展示钢材发往异地库计划
-    @PostMapping("/getRailOffsetDayplan")
-    @ApiOperation(value = "展示钢材发往异地库计划")
-    public Map<String, Object> getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              Integer apiId,
-                                              Integer dayplanReceiveStatus,
-                                              Integer carrierId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getRailOffsetDayplan(mapValue, pageNum, pageSize, apiId,dayplanReceiveStatus,carrierId);
-    }
-
-    @PostMapping("/getRailOffsetDayplanId")
-    @ApiOperation(value = "根据ID展示钢材发往异地库计划")
-    public Map<String, Object> getRailOffsetDayplanId(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                    Integer pageNum,
-                                                    Integer pageSize,
-                                                    Integer apiId,
-                                                    Integer dayPlanId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getRailOffsetDayplanId(mapValue, pageNum, pageSize, apiId,dayPlanId);
-    }
-
-    @ApiModelProperty(value = "下发钢材发往异地库计划")
-    @PostMapping("/issueRailOffsetDayplan")
-    public Map<String,Object> issueRailOffsetDayplan(@RequestBody List<Map<String,Object>> mapList) {
-        return amsFeign.issueRailOffsetDayplan(mapList);
-    }
-
-    ////************************************内转物流***************************************************
-    /**
-     *新增运输计划
-     */
-    @PostMapping("/addTruckPlan")
-    public Map<String,Object> addTruckPlan(@RequestBody  Map<String, Object> mapVal) {
-        return amsFeign.addTruckPlan(mapVal);
-    }
-    //新增采购内转需求
-    @PostMapping("/addPurInwardRequirement")
-    public Map<String,Object>addPurInwardRequirement(@RequestBody Map<String,Object>mapval){
-        return amsFeign.addPurInwardRequirement(mapval);
-    }
-    //删除
-    @PostMapping("/deleteTruckPlan/{planId}")
-    public Map<String,Object> deleteTruckPlan(@PathVariable("planId") Integer planId) {
-        return amsFeign.deleteTruckPlan(new BigDecimal(planId));
-    }
-
-    //接收
-    @PostMapping("/receiveInwardPlan/{planId}")
-    public Map<String,Object> receiveInwardPlan(@PathVariable("planId") Integer planId) {
-        return amsFeign.receiveInwardPlan(new BigDecimal(planId));
-    }
-
-    /**
-     * 修改渲染
-     * @param planId
-     * @return
-     */
-    @PostMapping("/selectInwardPlanToUpdate/{planId}")
-    public Map<String,Object> selectInwardPlanToUpdate(@PathVariable("planId") Integer planId) {
-        return amsFeign.selectInwardPlanToUpdate(new BigDecimal(planId));
-    }
-
-    /**
-     * 下发
-     * @param mapList
-     * @return
-     */
-    @PostMapping("/downTruckPlan")
-    public Map<String,Object> downTruckPlan(@RequestBody List<Map<String,Object>> mapList) {
-        return amsFeign.downTruckPlan(mapList);
-    }
-    /**
-     * 修改运输计划/下发运输计划/承运商接收运输计划
-     */
-    @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 = "0:257/1,2:258", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping("/getTruckPlanList")
-    public Map<String, Object> getTruckPlanList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer apiId,
-                                                Integer planStatus,
-                                                String carrierId,
-                                                Integer planId,
-                                                String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId,con);
-    }
-
-    @ApiModelProperty(value = "展示运输计划")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "0:257/1,2:258", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping("/getPlanOrder")
-    public Map<String, Object> getPlanOrder(@RequestBody(required = false) Map<String,Object> mapValue,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer apiId,
-                                            Integer planId,
-                                            Integer requirementId,
-                                            Integer orderStatus) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getPlanOrder(mapValue, pageNum, pageSize, apiId,planId,requirementId,orderStatus);
-    }
-    /**
-     *用车单位提出需求
-     *新增用车需求
-     */
-    @PostMapping("/addTruckRequirement")
-    public Map<String,Object> addTruckRequirement(@RequestBody  Map<String, Object> mapVal) {
-        return amsFeign.addTruckRequirement(mapVal);
-    }
-    //删除用车需求
-    @PostMapping("/deleteTruckRequirement/{requirementId}")
-    public Map<String,Object> deleteTruckReqgetTruckRequirementListuirement(@PathVariable("requirementId") BigDecimal requirementId) {
-        return amsFeign.deleteTruckRequirement(requirementId);
-    }
-    //下发用车需求
-    @PostMapping("/downRequirement")
-    public Map<String,Object> downRequirement(@RequestBody List<Map<String,Object>> requirementIds) {
-        return amsFeign.downRequirement(requirementIds);
-    }
-
-    //接收用车需求
-    @PostMapping("/receiveRequirement/{requirementId}")
-    public Map<String,Object> receiveRequirement(@PathVariable("requirementId") Integer requirementId) {
-        return amsFeign.receiveRequirement(requirementId);
-    }
-    /**
-     * 修改用车需求
-     */
-    @PostMapping("/updateTruckRequirement")
-    public Map<String,Object> updateTruckRequirement(@RequestBody  Map<String, Object> mapVal){
-        return amsFeign.updateTruckRequirement(mapVal);
-    }
-    /**
-     * 查询修改渲染
-     */
-    @PostMapping("/selectRequirement/{requirementId}")
-    public Map<String,Object> selectRequirement(@PathVariable("requirementId") Integer requirementId) {
-        return amsFeign.selectRequirement(requirementId);
-    }
-
-    /*
-    查询需求物资详情
-     */
-    @PostMapping("/getRequirementMaterial/{requirementId}")
-    public Map<String,Object> getRequirementMaterial(@PathVariable("requirementId") Integer requirementId) {
-        return amsFeign.getRequirementMaterial(requirementId);
-    }
-    /**
-     * 展示用车需求
-     * @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 = "207", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping("/getTruckRequirementList")
-    public Map<String, Object> getTruckRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer apiId,
-                                          Integer requirementStatus,
-                                          String orgCode, String index,String startTime,String endTime) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode,index,startTime,endTime);
-    }
-
-    @ApiModelProperty(value = "展示钢坯用车需求")
-    @PostMapping("/getBilletRequirementList")
-    public Map<String, Object> getBilletRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-                                                       Integer apiId,
-                                                       String orgCode, String index,String startTime,String endTime) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getBilletRequirementList(mapValue, pageNum, pageSize, apiId,orgCode,index,startTime,endTime);
-    }
-
-
-    @PostMapping("/getPurRequirementList")
-    public Map<String, Object> getPurRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-                                                       Integer apiId,
-                                                       Integer requirementStatus,
-                                                       String con,
-                                                       String userId,
-                                                       String carrierSsoId,
-                                                       String enableStatus,
-                                                       String planStatus,
-                                                     String startTime,
-                                                     String endTime,
-                                                     BigDecimal planId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus,startTime,endTime,planId);
-    }
-    @ApiOperation(value="查询app端公开抢单")
-    @PostMapping("/getDispatchSaleOrderList")
-    public Map<String, Object> getDispatchSaleOrderList() {
-        return amsFeign.getDispatchSaleOrderList();
-    }
-
-    @ApiOperation(value="抢单/接收订单锁定")
-    @PostMapping("/lockDispatchSaleOrder")
-    public Map<String, Object> lockDispatchSaleOrder(Integer dispatchId,String carrierSsoId) {
-        return amsFeign.lockDispatchSaleOrder(dispatchId, carrierSsoId);
-    }
-
-    @ApiOperation(value="查询app端承运商已抢到的单")
-    @PostMapping("/getLockDispatchSaleOrderList")
-    public Map<String, Object> getLockDispatchSaleOrderList(Integer carrierId) {
-        return amsFeign.getLockDispatchSaleOrderList(carrierId);
-    }
-
-    @ApiOperation(value="查询PC端承运商已抢到的单")
-    @PostMapping("/selectDispatchSaleOrderList")
-    public Map<String, Object> selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                           Integer apiId,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           String carrierSsoId){
-        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierSsoId);
-    }
-
-    //获取到站名称
-    @GetMapping("/getArriveName")
-    public Map<String,Object> getArriveName() {
-        return amsFeign.getArriveName();
-    }
-
-//    @ApiModelProperty(value = "查询所有的钢材物资")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-//            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-//            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
-//    })
-//    @PostMapping("/getAllSteelMaterialMes")
-//    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
-//                                                Integer pageNum,
-//                                                Integer pageSize,
-//                                                Integer apiId,
-//                                                String con) {
-//        return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
-//    }
-
-    @ApiModelProperty(value = "查询PC端公开抢单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "242", required = false, dataType = "Integer")
-    })
-    @PostMapping("/getPCDispatchSaleOrderList")
-    public Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer apiId,
-                                                      Integer dispatchType,
-                                                      @RequestParam String carrierSsoId) {
-        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType,carrierSsoId);
-    }
-
-    @ApiModelProperty(value = "展示批次信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "252", required = false, dataType = "Integer")
-    })
-    @PostMapping("/getPurchaseIdByBatch")
-    public Map<String, Object> getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                          Integer pageNum,
-                                                          Integer pageSize,
-                                                          Integer apiId) {
-        return amsFeign.getPurchaseIdByBatch(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
-    }
-
-    @ApiModelProperty(value = "仓库模代框")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "251", required = false, dataType = "Integer")
-    })
-    @PostMapping("/getWareHouse")
-    public Map<String, Object> getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                    Integer pageNum,
-                                                    Integer pageSize,
-                                                    Integer apiId,
-                                                    String con) {
-        return amsFeign.getWareHouse(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @ApiModelProperty(value = "车型下拉")
-    @GetMapping("/getCapacityType")
-    public Map<String,Object> getCapacityType() {
-         return amsFeign.getCapacityType();
-    }
-
-    @ApiModelProperty(value = "用车单位下拉")
-    @GetMapping("/getShipperUser")
-    public Map<String,Object> getShipperUser() {
-        return amsFeign.getShipperUser();
-    }
-
-    @ApiModelProperty(value = "承运商下拉")
-    @GetMapping("/getCarrierList")
-    public Map<String,Object> getCarrierList() {
-        return amsFeign.getCarrierList();
-    }
-
-    @ApiModelProperty(value = "到站下拉")
-    @GetMapping("/getdayPlanToTheStationId")
-    public Map<String,Object> getdayPlanToTheStationId() {
-        return amsFeign.getdayPlanToTheStationId();
-    }
-
-    @ApiModelProperty(value = "异地库下拉")
-    @GetMapping("/getOffsetWarehouse")
-    public Map<String,Object> getOffsetWarehouse() {
-        return amsFeign.getOffsetWarehouse();
-    }
-
-    @PostMapping("/finishTruckPlan/{planId}")
-    public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId){
-        return amsFeign.finishTruckPlan(planId);
-    }
-
-
-    //零星订单=======================================================================================================================================================
-
-    @ApiModelProperty(value = "查询零星物资订单列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "384", required = false, dataType = "Integer")
-    })
-    @PostMapping("/getSporadicOrdersList")
-    public RESTfulResult getSporadicOrdersList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer orderType,
-                                               Integer issueStatus,
-                                               String con,
-                                               Integer dispatchStatus,
-                                               Integer sporadicStatus,
-                                               String carrierSsoId,
-                                               String userId,
-                                               String userIds,
-                                               String startTime,
-                                               String endTime) {
-        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId,userId,userIds,startTime,endTime);
-    }
-
-    @ApiModelProperty(value = "查看物资详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "385", required = false, dataType = "Integer")
-    })
-    @PostMapping("/seeAllMaterials")
-    public RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     Integer sporadicOrderId,
-                                                     String con){
-        return amsFeign.seeAllMaterials(mapValue,apiId,pageNum,pageSize,sporadicOrderId,con);
-    }
-
-    @ApiOperation(value="逻辑删除零星物资订单")
-    @PostMapping("/deleteSporadicOrders")
-    public Map<String, Object> deleteSporadicOrders(@RequestParam Integer sporadicOrderId) {
-        return amsFeign.deleteSporadicOrders(sporadicOrderId);
-    }
-
-
-
-
-    @ApiOperation(value="下发零星物资订单")
-    @PostMapping("/issueSporadicOrders")
-    public Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList) {
-        return amsFeign.issueSporadicOrders(mapList);
-    }
-
-    @ApiOperation(value="停止零星订单一车多趟")
-    @PostMapping("/closeSporadicOrder")
-    public Map<String, Object> closeSporadicOrder(@RequestBody Map<String, Object> map) {
-        return amsFeign.closeSporadicOrder(map);
-    }
-
-
-    @ApiOperation(value="内转零星物流添加运输计划")
-    @PostMapping("/addInwardSporadicOrder")
-    public Map<String, Object> addInwardSporadicOrder(@RequestBody Map<String, Object> map) {
-        return amsFeign.addInwardSporadicOrder(map);
-    }
-
-    @ApiOperation(value="新增零星物资进出厂（以及销售钢材退货）")
-    @PostMapping("/addSporadicOrders")
-    public Map<String, Object> addSporadicOrders(@RequestBody Map<String,Object> mapValue) {
-        return amsFeign.addSporadicOrders(mapValue);
-    }
-
-
-    @ApiOperation(value="零星一车多趟新增订单")
-    @PostMapping("/addSporadicOrderTimes")
-    public Map<String, Object> addSporadicOrderTimes(@RequestBody Map<String,Object> mapValue) {
-        return amsFeign.addSporadicOrderTimes(mapValue);
-    }
-
-    @ApiOperation(value="查询修改渲染")
-    @PostMapping("/selectSporadicOrder")
-    public RESTfulResult selectSporadicOrder(@RequestParam Integer sporadicOrderId) {
-        return amsFeign.selectSporadicOrder(sporadicOrderId);
-    }
-
-    @ApiOperation(value="修改零星物资订单")
-    @PostMapping("/updateSporadicOrder")
-    public Map<String,Object> updateSporadicOrder(@RequestBody Map<String,Object> mapValue) {
-        return amsFeign.updateSporadicOrder(mapValue);
-    }
-
-
-    @ApiModelProperty(value = "查询车序号信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "411", required = false, dataType = "Integer")
-    })
-    @PostMapping("/getTruckNoList")
-    public RESTfulResult getTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                         Integer apiId,
-                                         Integer pageNum,
-                                         Integer pageSize,
-                                         Integer issueStatus){
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getTruckNoList(mapValue,apiId,pageNum,pageSize,issueStatus);
-    }
-
-    @PostMapping("getSaleOrderInfoes")
-    @ApiOperation(value = "查询销售订单未上报信息")
-    public Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer apiId,
-                                                  String consigneeSsoId,
-                                                  @RequestParam(required = false) String con,
-                                                  String startTime,
-                                                  String endTime,
-                                                  String saler) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con,startTime,endTime,saler);
-    }
-
-    @ApiOperation(value="查询已上报销售订单信息")
-    @PostMapping("/getSaleOrderReportedes")
-    Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               @RequestParam Integer pageNum,
-                                               @RequestParam Integer pageSize,
-                                               @RequestParam Integer apiId,
-                                               @RequestParam(required = false) String consigneeSsoId,
-                                               @RequestParam(required = false) String con,
-                                               String startTime,
-                                               String endTime,
-                                               String saler){
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con,startTime,endTime,saler);
-    }
-
-    @ApiModelProperty(value = "展示销售公司已审核的订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "409", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping("/getSaleOrderListBySaleCompanyes")
-    public Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                              Integer pageNum,
-                                                              Integer pageSize,
-                                                              Integer apiId,
-                                                              String con,
-                                                              Integer shipperId,
-                                                              Integer saleType,
-                                                              String consigneeSsoId,
-                                                              String startTime,
-                                                              String endTime,
-                                                              String saler
-    ){
-        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId,startTime,endTime,saler);
-    }
-
-    @PostMapping("getAmsSaleOrderApprovedes")
-    @ApiOperation(value = "查询财务已审批销售订单信息")
-    public Map<String, Object> getAmsSaleOrderApprovedes(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                         Integer pageNum,
-                                                         Integer pageSize,
-                                                         Integer apiId,
-                                                         String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getAmsSaleOrderApprovedes(mapValue, pageNum, pageSize, apiId,con);
-    }
-
-    /*
-     *  根据销售订单主键展示销售基本信息、物资信息
-     * apiId=410
-     * */
-    @PostMapping(value="/getSaleOrderAndMaterialById")
-    public RESTfulResult  getSaleOrderAndMaterialById(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                      Integer apiId,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer saleOrderId){
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getSaleOrderAndMaterialById(mapValue,apiId,pageNum,pageSize,new BigDecimal(saleOrderId));
-    }
-
-    @ApiOperation(value = "新增车序号")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapList", value = "车序号信息", required = false, dataType = ""),
-    })
-    @PostMapping("/addTruckNo")
-    public Map<String, Object> addTruckNo(@RequestBody List<Map<String,Object>> mapList) {
-        return amsFeign.addTruckNo(mapList);
-    }
-
-    @ApiOperation(value = "下发车序号")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapList", value = "车序号信息", required = false, dataType = ""),
-    })
-    @PostMapping("/issueTruckNo")
-    public Map<String, Object> issueTruckNo(@RequestBody List<Map<String,Object>> mapList) {
-        return amsFeign.issueTruckNo(mapList);
-    }
-
-    @ApiOperation(value = "展示车序号下的物资详情")
-    @PostMapping("/getTruckNoMaterialList")
-    public RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId) {
-        return amsFeign.getTruckNoMaterialList(saleOrderMaterialId);
-    }
-
-    @ApiOperation(value = "展示销售订单下的物资详情")
-    @PostMapping("/getSaleMaterialList")
-    public RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId) {
-        return amsFeign.getSaleMaterialList(saleOrderId);
-    }
-
-    @ApiOperation(value = "展示销售派单物资信息")
-    @PostMapping("/getDispatchMaterialList")
-    public RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId) {
-        return amsFeign.getDispatchMaterialList(dispatchId);
-    }
-
-    @ApiOperation(value="销售新增定向派单且直接下发")
-    @PostMapping("/addDispatchSaleOrder")
-    public Map<String,Object> addDispatchSaleOrder(@RequestBody Map<String,Object> mapValue) {
-        return amsFeign.addDispatchSaleOrder(mapValue);
-    }
-
-   //发布通知================================================================================================================================
-    //公告展示
-
-
-    @ApiOperation(value = "销售公司获取公告信息", notes = "分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(414)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping(value = "/getMarketingNoticeList")
-    public Map<String, Object> getMarketingNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                      Integer apiId,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      String con
-    ) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getMarketingNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
-    }
-
-
-
-    @ApiOperation(value = "承运商获取公告信息", notes = "分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(414)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping(value = "/getCarrierNoticeList")
-    public Map<String, Object> getCarrierNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                    Integer apiId,
-                                                    Integer pageNum,
-                                                    Integer pageSize,
-                                                    String con
-    ) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getCarrierNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
-    }
-
-
-
-
-    @ApiOperation(value = "收货用户获取公告信息", notes = "分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(414)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping(value = "/getClientNoticeList")
-    public Map<String, Object> getClientNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize,
-                                                   String con
-    ) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getClientNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
-    }
-
-    @ApiOperation(value="销售公司直接选择车牌号派发运输订单")
-    @PostMapping("/dispatchTruckOrderBySale")
-    public Map<String,Object> dispatchTruckOrderBySale(@RequestBody Map<String,Object> mapValue){
-        return amsFeign.dispatchTruckOrderBySale(mapValue);
-    }
-
-    @ApiOperation(value="销售公司直接选择车牌号派发内转钢材运输订单")
-    @PostMapping("/dispatchInwardTruckOrderBySale")
-    public Map<String,Object> dispatchInwardTruckOrderBySale(@RequestBody Map<String,Object> mapValue){
-        return amsFeign.dispatchInwardTruckOrderBySale(mapValue);
-    }
-
-
-    @ApiOperation(value="展示销售焦炭订单")
-    @PostMapping("/getCokeSaleOrderList")
-    public RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                         Integer pageNum,
-                                                         Integer pageSize,
-                                                         Integer apiId,
-                                                         String con) {
-        return amsFeign.getCokeSaleOrderList(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @ApiOperation(value="承运商直接选择车牌号派发运输订单")
-    @PostMapping("/dispatchTruckOrderByCarrier")
-    public Map<String,Object> dispatchTruckOrderByCarrier(@RequestBody Map<String,Object> mapValue){
-        return amsFeign.dispatchTruckOrderByCarrier(mapValue);
-    }
-
-    @ApiOperation(value="关闭销售订单")
-    @PostMapping("closeSaleOrder")
-    public Map<String,Object> closeSaleOrder(@RequestParam Integer saleOrderId){
-        return amsFeign.closeSaleOrder(saleOrderId);
-    }
-
-
-    @ApiOperation(value="新增公告信息", notes="根据DilNotice对象创建")
-    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
-    @PostMapping(value = "/insertNotice")
-    public Map<String, Object> insertNotice(@RequestBody(required = false) Map<String, Object> map) {
-        return amsFeign.insertNotice(map);
-    }
-
-    @ApiOperation(value="发布公告信息", notes="根据DilNotice对象创建")
-    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
-    @PostMapping(value = "/releaseNotice")
-    public Map<String, Object> releaseNotice(@RequestBody(required = false) Map<String, Object> map) {
-        return amsFeign.releaseNotice(map);
-    }
-
-    @ApiOperation(value = "更新油价信息", notes = "根据dilNotice对象创建")
-    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
-    @PostMapping(value = "/updateNotice", produces  = "application/json;charset=UTF-8")
-    public Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map) {
-        return amsFeign.updateNotice(map);
-    }
-
-
-    @PostMapping(value = "/updateNoticeStatus", produces  = "application/json;charset=UTF-8")
-    public Map<String, Object> updateNoticeStatus(@RequestBody(required = false) Map<String, Object> map) {
-        return amsFeign.updateNoticeStatus(map);
-    }
-
-    @PostMapping(value = "/getNoticeUser", produces  = "application/json;charset=UTF-8")
-    public Map<String, Object> getNoticeUser(@RequestBody(required = false) Map<String, Object> map,
-                                             @RequestParam("pageNum") Integer pageNum,
-                                             @RequestParam("pageSize") Integer pageSize,
-                                             @RequestParam("apiId") Integer apiId) {
-        return amsFeign.getNoticeUser(map,pageNum,pageSize,apiId);
-    }
-
-    @PostMapping(value = "/getNoticeAll", produces  = "application/json;charset=UTF-8")
-    public Map<String, Object> getNoticeAll(@RequestBody(required = false) Map<String, Object> map) {
-        return amsFeign.getNoticeAll(map);
-    }
-
-    @PostMapping(value = "/readAll", produces  = "application/json;charset=UTF-8")
-    public Map<String, Object> readAll(@RequestBody(required = false) Map<String, Object> map) {
-        return amsFeign.readAll(map);
-    }
-
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
-    @PostMapping(value = "/deleteNotice/{id}")//BigDecimal
-    public Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id) {
-        return amsFeign.deleteNotice(id);
-    }
-
-    @ApiOperation(value="获取名字", notes="根据url的id来获取对象名字")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    @PostMapping(value = "/queryName/{userId}")//BigDecimal
-    public Map<String, Object> queryName(@PathVariable("userId") String userId) {
-        return amsFeign.queryName(userId);
-    }
-
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
-    @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
-    @PostMapping(value = "/getNoticeById/{id}")
-    public Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id){
-        return amsFeign.getNoticeById(id);
-    }
-
-    @ApiOperation(value="获取最新公告详细信息", notes="根据url的permissions来获取详细信息")
-    @ApiImplicitParam(paramType = "name", name = "权限permission", value = "permission", required = true, dataType = "String")
-    @PostMapping(value = "/getNewNoticeByPermission/{permissions}")
-    public Map<String, Object> getNewNoticeByPermission(@PathVariable("permissions") String permissions){
-        return amsFeign.getNewNoticeByPermission(permissions);
-    }
-
-
-
-    //*******************************下拉框************************
-
-
-    @GetMapping("getNoticeTypeId")
-    @ApiOperation(value = "得到公告类型Id")
-    public Map<String,Object> getNoticeTypeId(){
-        return amsFeign.getNoticeTypeId();
-    }
-
-    @ApiOperation(value="抢单/接收订单锁定")
-    @PostMapping("/lockDispatchSaleOrderList")
-    public Map<String, Object> lockDispatchSaleOrderList(@RequestBody Map<String,Object> mapValue) {
-        return amsFeign.lockDispatchSaleOrderList(mapValue);
-    }
-
-    @ApiModelProperty(value = "销售订单批量授权给承运商")
-    @PostMapping("/saleOrderEmpowerCarrier")
-    public RESTfulResult saleOrderEmpowerCarrier(@RequestBody(required = false) Map<String,Object> mapValue){
-        return amsFeign.saleOrderEmpowerCarrier(mapValue);
-    }
-
-    @ApiModelProperty(value = "展示销售公司下发给承运商的销售订单列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "409", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping("/getSaleOrderListByCarrierSsoId")
-    public RESTfulResult getSaleOrderListByCarrierSsoId(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                        String carrierSsoId,
-                                                        Integer pageNum,
-                                                        Integer pageSize,
-
-                                                        Integer apiId,
-                                                        String con) {
-        return amsFeign.getSaleOrderListByCarrierSsoId(mapValue != null ? mapValue : new HashMap<>(), carrierSsoId, pageNum, pageSize, apiId, con);
-    }
-    @ApiOperation(value="边输边查具体地址")
-    @PostMapping("/getRealAddressByLike")
-    public Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index){
-        return amsFeign.getRealAddressByLike(addressId,index);
-    }
-
-    @ApiOperation(value="得到单价和单价id")
-    @PostMapping("/getPriceMap")
-    public Map<String, Object> getPriceMap(@RequestBody Map<String,Object> map){
-        return amsFeign.getPriceMap(map);
-    }
-
-    @ApiOperation(value="得到单价和单价id")
-    @PostMapping("/getBenPrice")
-    public Map<String, Object> getBenPrice(@RequestBody Map<String,Object> map){
-        return amsFeign.getBenPrice(map);
-    }
-
-    @ApiOperation(value="批量拒绝定向派单")
-    @PostMapping(value = "/refuseDispatchSaleOrderList")
-    public Map<String, Object> refuseDispatchSaleOrderList(@RequestBody List<Map<String, Object>> mapList) {
-        return amsFeign.refuseDispatchSaleOrderList(mapList);
-    }
-
-    @ApiModelProperty(value = "新增钢材销售订单")
-    @PostMapping("/addSteelSaleOrder")
-    public Map<String, Object> addSteelSaleOrder(@RequestBody Map<String,Object> mapValue) {
-        return amsFeign.addSteelSaleOrder(mapValue);
-    }
-
-    @ApiModelProperty(value = "查询销售订单下的物资")
-    @PostMapping("/getTruckNoAndMaterialList")
-    public RESTfulResult getTruckNoAndMaterialList(@RequestParam Integer saleOrderId) {
-        return amsFeign.getTruckNoAndMaterialList(saleOrderId);
-    }
-
-    @ApiModelProperty(value = "销售钢材派车")
-    @PostMapping("/dispatchSteelOrder")
-    public Map<String, Object> dispatchSteelOrder(@RequestBody List<Map<String,Object>> mapList) {
-        return amsFeign.dispatchSteelOrder(mapList);
-    }
-
-    @ApiModelProperty(value = "根据详细地址匹配承运商")
-    @GetMapping("/getCarrierByPlace")
-    public RESTfulResult getCarrierByPlace(@RequestParam Integer placeId) {
-        return amsFeign.getCarrierByPlace(placeId);
-    }
-
-    @ApiModelProperty(value = "将车序号下发给承运商")
-    @PostMapping("/dispatchToCarrier")
-    public RESTfulResult dispatchToCarrier(@RequestBody(required = false) List<Map<String,Object>> mapList) {
-        return amsFeign.dispatchToCarrier(mapList);
-    }
-
-    @ApiModelProperty(value = "将车序号下发给承运商")
-    @PostMapping("/getSaleOrderListToCarrier")
-    public RESTfulResult getSaleOrderListToCarrier(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                   @RequestParam Integer pageNum,
-                                                   @RequestParam Integer pageSize,
-                                                   @RequestParam Integer apiId,
-                                                   @RequestParam String carrierSsoId,
-                                                   @RequestParam(required = false) String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getSaleOrderListToCarrier(mapValue,pageNum,pageSize,apiId,carrierSsoId,con);
-    }
-
-    @ApiModelProperty(value = "展示未匹配承运商的车序号")
-    @PostMapping("/getSteelTruckNoList")
-    public RESTfulResult getSteelTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize,
-                                             @RequestParam(required = false) String con,
-                                             @RequestParam(required = false) String startTime,
-                                             @RequestParam(required = false)String endTime) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getSteelTruckNoList(mapValue,apiId,pageNum,pageSize,con,startTime,endTime);
-    }
-
-    @ApiModelProperty(value = "展示未匹配承运商的车序号详情")
-    @PostMapping("/getTruckNoMaterial")
-    public RESTfulResult getTruckNoMaterial(@RequestParam Integer saleOrderMaterialId) {
-        return amsFeign.getTruckNoMaterial(saleOrderMaterialId);
-    }
-
-    @ApiModelProperty(value = "展示已分配承运商但未派车的车序号")
-    @PostMapping("/getNoCarTruckNoList")
-    public RESTfulResult getNoCarTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize,
-                                             @RequestParam(required = false) String con,
-                                             @RequestParam(required = false) String startTime,
-                                             @RequestParam(required = false)String endTime) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getNoCarTruckNoList(mapValue,apiId,pageNum,pageSize,con,startTime,endTime);
-    }
-
-    @ApiModelProperty(value = "展示已派车的车序号")
-    @PostMapping("/getHaveCarTruckNoList")
-    public RESTfulResult getHaveCarTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize,
-                                             @RequestParam(required = false) String con,
-                                             @RequestParam(required = false) String startTime,
-                                             @RequestParam(required = false) String endTime  ) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getHaveCarTruckNoList(mapValue, apiId, pageNum, pageSize, con,startTime,endTime);
-    }
-
-    @ApiOperation(value="获取零星订单的物资详情")
-    @PostMapping(value = "/getSporadic")
-    public Map<String, Object> getSporadic(Integer sporadicId) {
-        return amsFeign.getSporadic(sporadicId);
-    }
-
-    @ApiOperation(value = "查零星订单物资详情")
-    @PostMapping("/getSporadicOfOrder")
-    public Map<String, Object> getSporadicOfOrder(@RequestBody(required = false) Map<String,Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer sporadicId
-    ) {
-        return amsFeign.getSporadicOfOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,sporadicId);
-    }
-
-
-    @ApiOperation(value = "批量关闭分录")
-    @PostMapping("/closingEntries")
-    public Map<String, Object> closingEntries(@RequestBody List<Map<String, Object>> mapList){
-        return amsFeign.closingEntries(mapList);
-    }
-
-    @ApiOperation(value = "查询内转物流运输单价")
-    @PostMapping("/getInwardPriceBy")
-    public Map<String,Object>getInwardPriceBy(@RequestBody(required = false)Map<String,Object>mapvalue){
-        return amsFeign.getInwardPriceBy(mapvalue);
-    }
-
-    @ApiOperation(value = "删除销售订单")
-    @PostMapping("/deleteSaleOrderById")
-    public Map<String,Object> deleteSaleOrderById(@RequestParam Integer saleOrderId){
-        return amsFeign.deleteSaleOrderById(saleOrderId);
-    }
-
-    @ApiModelProperty(value = "查询出销售订单下的所有数据")
-    @PostMapping("/getAllSaleMessages")
-    public RESTfulResult getAllSaleMessages(@RequestParam Integer saleOrderId) {
-        return amsFeign.getAllSaleMessages(saleOrderId);
-    }
-
-    @ApiModelProperty(value = "修改承运商授权")
-    @PostMapping("/updateTruckNoCarrier")
-    public Map<String,Object> updateTruckNoCarrier(@RequestBody Map<String,Object> mapValue) {
-        return amsFeign.updateTruckNoCarrier(mapValue);
-    }
-
-    @ApiModelProperty(value = "批量上传销售订单")
-    @PostMapping("/uploadSaleOrderList")
-    public Map<String,Object> uploadSaleOrderList(@RequestBody List<Map<String,Object>> saleOrderIdList) {
-        return amsFeign.uploadSaleOrderList(saleOrderIdList);
-    }
-
-    @ApiModelProperty(value = "自动匹配出最近的一个地址")
-    @PostMapping("/matchingAddressRecently")
-    public RESTfulResult matchingAddressRecently(@RequestParam Integer receiveId) {
-        return amsFeign.matchingAddressRecently(new BigDecimal(receiveId));
-    }
-
-    @ApiModelProperty(value = "自动匹配上一条运单的司机电话")
-    @PostMapping("/matchingDriverTelRecently")
-    public RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber) {
-        return amsFeign.matchingDriverTelRecently(capacityNumber);
-    }
-
-    @ApiOperation(value = "展示副产品销售订单列表(apiId=481)")
-    @PostMapping("/getFuSaleOrderList")
-    public Map<String, Object> getFuSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer apiId,
-                                                  String con,
-                                                  Integer deleted,
-                                                  @RequestParam(required = false) String startTime,
-                                                  @RequestParam(required = false)String endTime
-    ) {
-        return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,new BigDecimal(deleted),startTime,endTime);
-    }
-
-    @ApiOperation(value = "修改销售订单中的物资")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "map", value = "修改销售订单中的物资", required = false, dataType = "java.util.Map")
-    })
-    @PostMapping(value = "/updateAllMaterialInSale")
-    public Map<String,Object> updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue) {
-        return amsFeign.updateAllMaterialInSale(mapValue);
-    }
-
-    @ApiOperation(value = "同步关闭金蝶订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "map", value = "同步关闭金蝶订单", required = false, dataType = "java.util.Map")
-    })
-    @PostMapping(value = "/deleteSaleOrderSame")
-    public Map<String,Object> deleteSaleOrderSame(@RequestBody Map<String, Object> mapValue) {
-        return amsFeign.deleteSaleOrderSame(mapValue);
-    }
-
-    @ApiOperation(value = "修改收货地址")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "map", value = "修改收货地址", required = false, dataType = "java.util.Map")
-    })
-    @PostMapping(value = "/updateCarAddress")
-    public Map<String,Object> updateCarAddress(@RequestBody Map<String, Object> mapValue) {
-        return amsFeign.updateCarAddress(mapValue);
-    }
-
-    @ApiOperation(value = "展示反审批的钢材订单")
-    @PostMapping("/getSteelOrderDeletedList")
-    public Map<String, Object> getSteelOrderDeletedList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer apiId,
-                                                  String con,
-                                                        String consigneeSsoId,
-                                                        String startTime,
-                                                        String endTime,String saler
-    ) {
-        return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,startTime,endTime,saler);
-    }
-
-    @ApiOperation(value = "修改厂内未装货车辆的运单车牌号")
-    @PostMapping(value = "/updateCapacityNumberInFactory")
-    public Map<String,Object> updateCapacityNumberInFactory(@RequestBody Map<String, Object> mapValue) {
-        return amsFeign.updateCapacityNumberInFactory(mapValue);
-    }
-
-    @ApiModelProperty(value = "修改收货客户的电话(销售)")
-    @PostMapping("/updateConsigneeTel")
-    public Map<String,Object> updateConsigneeTel(@RequestBody Map<String,Object> mapValue) {
-        return amsFeign.updateConsigneeTel(mapValue);
-    }
-
-    @ApiModelProperty(value = "展示下发给承运商的车序号和物资")
-    @PostMapping("/getCarrierTruckNoAndMaterialList")
-    public Map<String,Object> getCarrierTruckNoAndMaterialList(@RequestBody Map<String,Object> map) {
-        return amsFeign.getCarrierTruckNoAndMaterialList(map);
-    }
-
-    @ApiModelProperty(value = "关闭单个钢材物资分录")
-    @PostMapping("/closeSteelMaterialId")
-    public Map<String, Object> closeSteelMaterialId(@RequestBody Map<String, Object> mapValue) {
-        return amsFeign.closeSteelMaterialId(mapValue);
-    }
-
-    @ApiOperation(value = "展示已审核化产焦炭销售订单列表")
-    @PostMapping("/getSaleCokeOrder")
-    public Map<String, Object> getSaleCokeOrder(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                   Integer pageNum,
-                                                   Integer pageSize,
-                                                   Integer apiId,
-                                                   String con,
-                                                   String consigneeSsoId,
-                                                   Integer shipperId,
-                                                   String startTime,
-                                                   String endTime
-    ) {
-        return amsFeign.getSaleCokeOrder(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,shipperId,startTime,endTime);
-    }
-
-    @ApiModelProperty(value = "反关闭金蝶单个分录")
-    @PostMapping("/adverseCloseSaleMaterial")
-    public Map<String, Object> adverseCloseSaleMaterial(@RequestParam Integer saleMaterialId) {
-        return amsFeign.adverseCloseSaleMaterial(saleMaterialId);
-    }
-
-    @ApiModelProperty(value = "反关闭金蝶整个销售订单")
-    @PostMapping("/adverseCloseSaleOrder")
-    public Map<String, Object> adverseCloseSaleOrder(@RequestParam Integer saleOrderId) {
-        return amsFeign.adverseCloseSaleOrder(saleOrderId);
-    }
-
-    @ApiOperation(value = "承运起止范围与装货点")
-    @PostMapping("/getRangePoint")
-    public Map<String, Object> getRangePoint(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer apiId,
-                                                String con
-    ) {
-        return amsFeign.getRangePoint(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
-    }
-
-    @ApiOperation(value = "更新内转钢材收货客户")
-    @PostMapping("/updateInwardConsignee")
-    public Map<String,Object> updateInwardConsignee(@RequestBody(required = false)Map<String,Object>map){
-        return amsFeign.updateInwardConsignee(map);
-    }
-
-    @ApiOperation(value = "查询库存调拨单")
-    @PostMapping("getKucunList")
-    public Map<String,Object> getKucunList(@RequestBody(required = false) Map<String,Object> map,
-                                           String startTime,
-                                           String endTime,
-                                           String remark,
-                                           String transferIndep,
-                                           String consigneeName,
-                                           String totheStation){
-        return amsFeign.getKucunList(map==null?new HashMap<>():map,startTime,endTime,remark,transferIndep,consigneeName,totheStation);
-    }
-
-    @ApiOperation("批量保存库存调拨单")
-    @PostMapping("batchUpdateInwardConsignee")
-    public Map<String,Object> batchUpdateInwardConsignee(@RequestBody List<Map<String,Object>> mapList){
-        return amsFeign.batchUpdateInwardConsignee(mapList);
-    }
-
-    @ApiOperation(value = "查询通知信息", notes = "根据传过来的orgcode查询")
-    @PostMapping("/getNotice")
-    public RESTfulResult getNotice(@RequestBody(required = false) Map<String, Object> mapValue){
-        return amsFeign.getNotice(mapValue);
-    }
-
-    @ApiOperation(value = "查询日志信息", notes = "条件查询")
-    @PostMapping("/selectAllLog")
-    public RESTfulResult selectAllLog(@RequestBody(required = false) Map<String, Object> mapValue,
-                                      Integer pageNum,
-                                      Integer pageSize,
-                                      Integer apiId){
-        if(mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        return amsFeign.selectAllLog(mapValue,pageNum,pageSize,apiId);
-    }
-
-    @ApiOperation(value = "查询规格型号是否正确")
-    @PostMapping("/queryFormat")
-    RESTfulResult queryFormat(@RequestBody List<Map<String,Object>> mapList){
-        return amsFeign.queryFormat(mapList);
-    }
-
-    @ApiOperation(value = "查询物资ID并赋值")
-    @PostMapping("/queryMaterial")
-    RESTfulResult queryMaterial(@RequestBody List<Map<String,Object>> mapList){
-        return amsFeign.queryMaterial(mapList);
-    }
-
-    @ApiOperation("excel导入批量新增销售订单")
-    @PostMapping("addSteelSaleOrderList")
-    public Map<String,Object> addSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
-        return  amsFeign.addSteelSaleOrderList(mapList);
-    }
-
-    @ApiOperation("excel导入批量新增销售订单")
-    @PostMapping("addUnloadSteelSaleOrderList")
-    public Map<String,Object> addUnloadSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
-        return amsFeign.addUnloadSteelSaleOrderList(mapList);
-    }
-
-    @PostMapping("/updateTransPrice")
-    @ApiOperation(value = "修改内转汽运单价")
-    public Map<String, Object> updateTransPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.updateTransPrice(mapValue);
-    }
-    @PostMapping("/getwz")
-    @ApiOperation(value = "查询物资")
-    public Map<String, Object> getwz(@RequestBody(required = false) Map<String, Object> mapValue) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getwz(mapValue);
-    }
-    @PostMapping("/getcargonameId")
-    @ApiOperation(value = "查询联动公式数据")
-    public Map<String, Object> getcargonameId(@RequestBody(required = false) Map<String, Object> mapValue) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getcargonameId(mapValue);
-    }
-
-    @PostMapping("/reverseCloseOrder")
-    @ApiOperation("反关闭运单")
-    public Map<String,Object> reverseCloseOrder(@RequestBody(required = false) Map<String,Object> map){
-        return amsFeign.reverseCloseOrder(map);
-    }
-
-    @PostMapping("getSaleOrderStatus")
-    @ApiOperation("查询销售订单状态")
-    public Map<String,Object> getSaleOrderStatus(@RequestParam String saleNumber ) {
-        return amsFeign.getSaleOrderStatus(saleNumber);
-    }
-
-    @ApiOperation("关闭截止日期,停止推送订单")
-    @PostMapping("/closeDueDate")
-    public Map<String,Object> closeDueDate(@RequestParam BigDecimal requirementId) {
-        return amsFeign.closeDueDate(requirementId);
-    }
-
-    @ApiOperation("钢坯需求计划派单")
-    @PostMapping("/addBilletRequirement")
-    public Map<String,Object> addBilletRequirement(@RequestBody Map<String,Object> map) {
-        return amsFeign.addBilletRequirement(map);
-    }
-
-    @ApiOperation("钢坯炉号抽取")
-    @PostMapping("/checkBillet")
-    public Map<String,Object> checkBillet(@RequestBody Map<String,Object> map) {
-        return amsFeign.checkBillet(map);
-    }
-
-    @ApiOperation("获取制单日期并更新")
-    @PostMapping("/getMakeOrderDate")
-    public Map<String,Object> getMakeOrderDate(@RequestBody Map<String,Object> map) {
-        return amsFeign.getMakeOrderDate(map);
-    }
-
-    @ApiOperation("合并运单")
-    @PostMapping("/mergeOrder")
-    public Map<String,Object> mergeOrder(@RequestBody Map<String,Object> map) {
-        return amsFeign.mergeOrder(map);
-    }
-
-    @ApiOperation("拆分运单")
-    @PostMapping("/splitOrder")
-    public Map<String,Object> splitOrder(@RequestBody Map<String,Object> map) {
-        return amsFeign.splitOrder(map);
-    }
-
-    @ApiOperation(value="修改零星物资订单")
-    @PostMapping("/batchUpdateCapacity")
-    public Map<String,Object> batchUpdateCapacity(@RequestBody Map<String,Object> mapValue) {
-        return amsFeign.batchUpdateCapacity(mapValue);
-    }
-
-    @ApiOperation(value="继续装重置销售订单备注")
-    @PostMapping("/updateSaleOrderRemark")
-    public Map<String,Object> updateSaleOrderRemark(@RequestBody Map<String,Object> mapValue) {
-        return amsFeign.updateSaleOrderRemark(mapValue);
-    }
-
 }

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

@@ -1,9 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.config.ImageFileUtils;
-import com.steerinfo.dil.feign.BmsshipFeign;
-import com.steerinfo.dil.feign.BmstrainFeign;
-import com.steerinfo.dil.feign.BmstruckFeign;
+import com.steerinfo.dil.feign.BmsFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
@@ -26,915 +24,5 @@ import java.util.*;
 @RequestMapping("${api.version}/bms")
 public class BMSController extends BaseRESTfulController {
 
-    @Autowired
-    BmsshipFeign bmsshipFeign;
-    @Autowired
-    BmstrainFeign bmstrainFeign;
-    @Autowired
-    BmstruckFeign bmstruckFeign;
-    @Autowired
-    private ImageFileUtils imageFileUtils;
-    /**
-     * 水运结算
-     *
-     * @param mapValue
-     * @param apiId
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @PostMapping("getDetailsOrderList")
-    @ApiOperation(value = "展示详单列表")
-    public RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             Integer apiId,
-                                             String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmsshipFeign.getDetailsOrderList(mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @PostMapping("getBatch")
-    @ApiOperation(value = "展示批次信息")
-    public RESTfulResult getBatch(@RequestBody(required = false) Map<String, Object> mapValue,
-                                  Integer pageNum,
-                                  Integer pageSize,
-                                  Integer apiId,
-                                  String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmsshipFeign.getBatch(mapValue, pageNum, pageSize, apiId,con);
-    }
-
-    @PostMapping("getPortHandlingFeeList")
-    @ApiOperation(value = "展示批次信息")
-    public RESTfulResult getPortHandlingFeeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer apiId,
-                                                String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmsshipFeign.getPortHandlingFeeList(mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @PostMapping("addPortHandlingFee")
-    @ApiOperation(value = "生成港口装卸费")
-    RESTfulResult addPortHandlingFee(@RequestBody Map<String, Object> portHandlingFee) throws Exception {
-        return bmsshipFeign.addPortHandlingFee(portHandlingFee);
-    }
-
-    @PostMapping("updatePortHandlingFee")
-    @ApiOperation(value = "修改港口装卸费信息")
-    RESTfulResult updatePortHandlingFee(@RequestBody Map<String, Object> portHandlingFee) {
-        return bmsshipFeign.updatePortHandlingFee(portHandlingFee);
-    }
-
-    @PostMapping("getFeeToUpdate/{feeId}")
-    @ApiOperation(value = "查询修改港口装卸费数据渲染表单")
-    RESTfulResult getFeeToUpdate(@PathVariable("feeId") BigDecimal feeId) {
-        return bmsshipFeign.getFeeToUpdate(feeId);
-    }
-
-    @PostMapping("deletePortHandlingFee/{feeId}")
-    @ApiOperation(value = "逻辑删除港口装卸费")
-    RESTfulResult deletePortHandlingFee(@PathVariable("feeId") String feeId) {
-        return bmsshipFeign.deletePortHandlingFee(feeId);
-    }
-
-
-    @PostMapping("deletePortHandlingFeeSecond/{feeId}")
-    @ApiOperation(value = "逻辑删除二程港口装卸费")
-    Map<String,Object> deletePortHandlingFeeSecond(@PathVariable("feeId") BigDecimal feeId) {
-        return bmsshipFeign.deletePortHandlingFeeSecond(feeId);
-    }
-
-
-    @PostMapping("addwaterStatement")
-    @ApiOperation(value = "修改港口装卸费信息")
-    Map<String,Object> addwaterStatement(@RequestBody Map<String, Object> map) {
-        return bmsshipFeign.addwaterStatement(map);
-    }
-
-
-    @PostMapping("getUncomplateDetailsOrderList")
-    @ApiOperation(value = "展示未生成账单的详单信息")
-    public RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-                                                       Integer apiId,
-                                                       String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmsshipFeign.getUncomplateDetailsOrderList(mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @PostMapping("addDetailsOrder/{resultId}")
-    @ApiOperation(value = "生成水运计费详单")
-    RESTfulResult addDetailsOrder(@PathVariable("resultId") BigDecimal resultId) throws Exception {
-        return bmsshipFeign.addDetailsOrder(resultId);
-    }
-
-    @PostMapping("getStatementList")
-    @ApiOperation(value = "展示水运费和水分质检费账单信息")
-    public RESTfulResult getStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer apiId,
-                                          String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmsshipFeign.getStatementList(mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @PostMapping("getLossStatementList")
-    @ApiOperation(value = "展示途损费账单信息")
-    public RESTfulResult getLossStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              Integer apiId,
-                                              String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmsshipFeign.getLossStatementList(mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @PostMapping("getWaterResult")
-    @ApiOperation(value = "展示水分质检实绩")
-    public RESTfulResult getWaterResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        Integer pageNum,
-                                        Integer pageSize,
-                                        Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmsshipFeign.getWaterResult(mapValue, pageNum, pageSize, apiId);
-    }
-
-    @PostMapping("addStatement")
-    @ApiOperation(value = "生成水运费账单")
-    RESTfulResult addStatement(@RequestBody List<Map<String, Object>> mapList) throws Exception {
-        return bmsshipFeign.addStatement(mapList);
-    }
-
-    @PostMapping("addWaterStatement")
-    @ApiOperation(value = "生成水分质检账单")
-    RESTfulResult addWaterStatement(@RequestBody List<Map<String, Object>> mapList) throws Exception {
-        return bmsshipFeign.addWaterStatement(mapList);
-    }
-
-    @PostMapping("addLossStatement")
-    @ApiOperation(value = "生成途损账单")
-    RESTfulResult addLossStatement(@RequestBody Map<String, Object> map) throws Exception {
-        return bmsshipFeign.addLossStatement(map);
-    }
-
-    @PostMapping("getStatementDetailsOrderList")
-    @ApiOperation(value = "展示账单下的详单")
-    public RESTfulResult getStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                      Integer batchId,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer apiId,
-                                                      Integer statementId,
-                                                      String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmsshipFeign.getStatementDetailsOrderList(new BigDecimal(batchId), mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId), con);
-    }
-
-    @PostMapping("getShipResult")
-    @ApiOperation(value = "展示详单下的船运实绩")
-    public RESTfulResult getShipResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       BigDecimal batchId,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmsshipFeign.getShipResult(batchId, mapValue, pageNum, pageSize, apiId);
-    }
-
-    @PostMapping("getShipFeesFormula")
-    @ApiOperation(value = "查询水运费计算公式")
-    public RESTfulResult getShipFeesFormula() {
-        return bmsshipFeign.getShipFeesFormula();
-    }
-
-    @PostMapping("getLossFeesFormula")
-    @ApiOperation(value = "查询途损费计算公式")
-    public RESTfulResult getLossFeesFormula() {
-        return bmsshipFeign.getLossFeesFormula();
-    }
-
-    @PostMapping("getWaterFeesFormula")
-    @ApiOperation(value = "查询水分质检计算公式")
-    public RESTfulResult getWaterFeesFormula() {
-        return bmsshipFeign.getWaterFeesFormula();
-    }
-
-    @PostMapping("getTrainDetailsOrderList")
-    @ApiOperation(value = "展示火运详单")
-    public RESTfulResult getTrainDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer apiId,
-                                                  String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstrainFeign.getTrainDetailsOrderList(mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @PostMapping("getUncomplateTrainDetailsList")
-    @ApiOperation(value = "展示未转账单的火运详单")
-    public RESTfulResult getUncomplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-                                                       Integer apiId,
-                                                       String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstrainFeign.getUncomplateTrainDetailsList(mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @PostMapping("getTrainResultList")
-    @ApiOperation(value = "展示火运实绩")
-    public RESTfulResult getTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstrainFeign.getTrainResultList(mapValue, pageNum, pageSize, apiId);
-    }
-
-    @PostMapping("addTrainDetails")
-    @ApiOperation(value = "生成火运详单")
-    RESTfulResult addTrainDetails(@RequestBody Map<String, Object> map) {
-        return bmstrainFeign.addTrainDetails(map);
-    }
-
-    @PostMapping("getTrainStatementList")
-    @ApiOperation(value = "展示火运账单列表")
-    public RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer apiId,
-                                               String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstrainFeign.getTrainStatementList(mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @PostMapping("getStatementTrainResultList")
-    @ApiOperation(value = "展示未转账单的火运详单")
-    public RESTfulResult getStatementTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     Integer apiId,
-                                                     Integer detailsId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstrainFeign.getStatementTrainResultList(mapValue, pageNum, pageSize, apiId, detailsId);
-    }
-
-    @PostMapping("getComplateTrainDetailsList")
-    @ApiOperation(value = "展示账单下的详单")
-    public RESTfulResult getComplateTrainDetailsList(Integer batchId,
-                                                     @RequestBody(required = false) Map<String, Object> mapValue,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     Integer apiId,
-                                                     Integer statementId,
-                                                     String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstrainFeign.getComplateTrainDetailsList(new BigDecimal(batchId), mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId), con);
-    }
-
-    @PostMapping("addTrainStatement")
-    @ApiOperation(value = "生成火运费账单")
-    RESTfulResult addTrainStatement(@RequestBody List<Map<String, Object>> mapList) {
-        return bmstrainFeign.addTrainStatement(mapList);
-    }
-
-    @ApiModelProperty(value = "展示销售火运结算列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "180", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping("/getSettlementList")
-    public RESTfulResult getSettlementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           Integer apiId,
-                                           String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstrainFeign.getSettlementList(mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @ApiModelProperty(value = "新增销售火运结算")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "bmstrainSettlement", value = "销售火运结算实体", required = false, dataType = "BmstrainSettlement"),
-    })
-    @PostMapping("/addTrainSettlement")
-    public Map<String, Object> addTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
-        return bmstrainFeign.addTrainSettlement(bmstrainSettlement);
-    }
-
-    @ApiModelProperty(value = "修改销售火运结算")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "bmstrainSettlement", value = "销售火运结算实体", required = false, dataType = "BmstrainSettlement"),
-    })
-    @PostMapping("/updateTrainSettlement")
-    public Map<String, Object> updateTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement) {
-        return bmstrainFeign.updateTrainSettlement(bmstrainSettlement);
-    }
-
-    @ApiModelProperty(value = "逻辑删除销售火运结算")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "settlementId", value = "结算id", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping("/deleteTrainSettlement/{settlementId}")
-    public Map<String, Object> deleteTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId) {
-        return bmstrainFeign.deleteTrainSettlement(settlementId);
-    }
-
-    @ApiModelProperty(value = "得到修改渲染")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "settlementId", value = "结算id", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping("/selectTrainSettlement/{settlementId}")
-    public Map<String, Object> selectTrainSettlement(@PathVariable("settlementId") Integer settlementId) {
-        return bmstrainFeign.selectTrainSettlement(new BigDecimal(settlementId));
-    }
-
-    @PostMapping("getTruckDetailsOrderList")
-    @ApiOperation(value = "展示汽运详单信息")
-    public RESTfulResult getTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer apiId,
-                                                  Integer orderType,
-                                                  String carrierSsoId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType,carrierSsoId);
-    }
-
-    @PostMapping("getTruckResultList")
-    @ApiOperation(value = "展示汽运详单信息")
-    public RESTfulResult getTruckResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer apiId,
-                                            Integer orderId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstruckFeign.getTruckResultList(mapValue, pageNum, pageSize, apiId, new BigDecimal(orderId));
-    }
-
-    @PostMapping("getTruckStatementList")
-    @ApiOperation(value = "展示汽运账单信息")
-    public RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer apiId,
-                                               String userId,
-                                               String startTime,
-                                               String endTime,
-                                               String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId,userId,startTime,endTime,con);
-    }
-
-    @PostMapping("getInvoiceList")
-    @ApiOperation(value = "展示发票")
-    public RESTfulResult getInvoiceList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        Integer pageNum,
-                                        Integer pageSize,
-                                        Integer apiId,
-                                        String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstruckFeign.getInvoiceList(mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @PostMapping("getSaleTruckStatementDetailsOrderList")
-    @ApiOperation(value = "展示账单下的详单")
-    public RESTfulResult getSaleTruckStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                               Integer pageNum,
-                                                               Integer pageSize,
-                                                               Integer apiId,
-                                                               Integer statementId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstruckFeign.getSaleTruckStatementDetailsOrderList(mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId));
-    }
-
-    @PostMapping("getUnFinishedTruckDetailsOrderList")
-    @ApiOperation(value = "展示汽运未生成账单的详单信息")
-    public RESTfulResult getUnFinishedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                            Integer pageNum,
-                                                            Integer pageSize,
-                                                            Integer apiId,
-                                                            Integer orderType,
-                                                            String carrierSsoId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return bmstruckFeign.getUnFinishedTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType,carrierSsoId);
-    }
-
-    @PostMapping("addBmstruckInvoice")
-    @ApiOperation(value = "新增发票")
-    RESTfulResult addBmstruckInvoice(@RequestBody Map<String, Object> mapVal) {
-        return bmstruckFeign.addBmstruckInvoice(mapVal);
-    }
-
-    @PostMapping("updateBmstruckCheck")
-    @ApiOperation(value = "修改审核状态")
-    RESTfulResult updateBmstruckCheck(@RequestParam Integer statementId,
-                                      @RequestParam Integer status,
-                                      @RequestParam Integer person) {
-        return bmstruckFeign.updateBmstruckCheck(new BigDecimal(statementId), status, person);
-    }
-
-    @PostMapping("getSmallTruckFormula")
-    @ApiOperation(value = "查询销售汽运离100KM差距10KM内计费公式")
-    RESTfulResult getSmallTruckFormula() {
-        return bmstruckFeign.getSmallTruckFormula();
-    }
-
-    @PostMapping("getBigTruckFormula")
-    @ApiOperation(value = "查询销售汽运离100KM差距10KM外计费公式")
-    RESTfulResult getBigTruckFormula() {
-        return bmstruckFeign.getBigTruckFormula();
-    }
-
-    @PostMapping("addTruckStatement")
-    @ApiOperation(value = "新增汽运账单")
-    RESTfulResult addTruckStatement(@RequestParam("excludeTax") BigDecimal excludeTax,
-                                    @RequestParam("userId") String userId,
-                                    @RequestParam("statementTime") String statementTime,
-                                    @RequestParam("statementEndTime") String statementEndTime,
-                                    @RequestParam("orderList")BigDecimal[] orderList,
-                                    @RequestParam("selecteddetailsOrderAmount") BigDecimal selecteddetailsOrderAmount,
-                                    @RequestParam("detailsIdList")BigDecimal[] detailsIdList,
-                                    MultipartRequest request) {
-        String url="";
-        List<MultipartFile> files = new ArrayList<>();
-        //获取图片
-        for(int i=0;i<=10;i++){
-            MultipartFile temp = request.getFile("file"+i);
-            if(temp!=null){
-                files.add(temp);
-            }
-        }
-        if(files.size() < 1){
-            return failed("没有上传图片！");
-        }
-        //上传图片
-        try{
-            for(int i=0;i<files.size();i++){
-                url+=imageFileUtils.updateFile(files.get(i),i)+';';
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            return failed("上传图片失败！");
-        }
-        Map<String,Object> map=new HashMap<>();
-        map.put("excludeTax",excludeTax);
-        map.put("orderList",orderList);
-        map.put("detailsIdList",detailsIdList);
-        map.put("selecteddetailsOrderAmount",selecteddetailsOrderAmount);
-        map.put("url",url);
-        map.put("userId",userId);
-        map.put("statementTime",statementTime);
-        map.put("statementEndTime",statementEndTime);
-        return bmstruckFeign.addTruckStatement(map);
-    }
-
-    @PostMapping("addTruckDetailsOrder/{orderId}")
-    @ApiOperation(value = "新增汽运详单")
-    RESTfulResult addTruckDetailsOrder(@PathVariable("orderId") BigDecimal orderId) {
-        return bmstruckFeign.addTruckDetailsOrder(orderId);
-    }
-
-    /**
-     * 展示汽运未生成账单的详单信息
-     *
-     * @param mapVal
-     * @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"),
-            @ApiImplicitParam(name = "orderType", value = "1:计时,2:计数，3：计重，4：包月", required = false, dataType = "Integer")
-    })
-    @PostMapping("/getUnFinishedConvertedTruckDetailsOrderList")
-    public RESTfulResult getUnFinishedConvertedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                                     Integer pageNum,
-                                                                     Integer pageSize,
-                                                                     Integer apiId,
-                                                                     Integer orderType) {
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return bmstruckFeign.getUnFinishedConvertedTruckDetailsOrderList(mapVal, pageNum, pageSize, apiId, new BigDecimal(orderType));
-    }
-
-    @PostMapping("/addConvertedDetailsOrder/{orderId}")
-    RESTfulResult addConvertedDetailsOrder(@PathVariable("orderId") BigDecimal orderId) {
-        return bmstruckFeign.addConvertedDetailsOrder(orderId);
-    }
-
-    /**
-     * 生成内转汽运账单
-     *
-     * @param mapList
-     * @return
-     */
-    @ApiModelProperty(value = "生成内转汽运账单")
-    @PostMapping("/addConvertedTruckStatement")
-    public RESTfulResult addConvertedTruckStatement(@RequestBody List<Map<String, Object>> mapList) {
-        return bmstruckFeign.addConvertedTruckStatement(mapList);
-    }
-
-    /**
-     * 删除汽运账单
-     */
-    @PostMapping("/deleteConvertedTruckStatement/{statementId}")
-    public RESTfulResult deleteConvertedTruckStatement(@PathVariable("statementId") BigDecimal statementId) {
-        return bmstruckFeign.delete(statementId);
-    }
-
-    /**
-     * 审批计费账单
-     */
-    @PostMapping("/updateConvertedTruckStatement/{statementId}")
-    public RESTfulResult updateConvertedTruckStatement(@PathVariable("statementId") BigDecimal statementId) {
-        return bmstruckFeign.update(statementId);
-    }
-
-
-    /**
-     * 审批计费账单
-     */
-    @PostMapping("/getBmsshipFee/{id}")
-    public Map<String,Object> updateConvertedTruckStatement(@PathVariable("id") Integer id) {
-        return bmsshipFeign.getBmsshipFee(id);
-    }
-
-
-
-
-
-    @PostMapping("/updateDetailsOrder")
-    @ApiOperation(value = "修改详单")
-    public RESTfulResult updateDetailsOrder(@RequestBody Map<String, Object> mapValue) {
-        return bmstruckFeign.updateDetailsOrder(mapValue);
-    }
-
-    @PostMapping("/addLossFeeOfCoke")
-    @ApiOperation(value = "增加焦炭途损费")
-    public RESTfulResult addLossFeeOfCoke(@RequestBody Map<String, Object> map) {
-        return bmstruckFeign.addLossFeeOfCoke(map);
-    }
-
-
-
-
-
-    @PostMapping("/addPortHandlingFeeSecond")
-    @ApiOperation(value = "新增二程船装卸费用")
-    public Map<String,Object> addPortHandlingFeeSecond(@RequestBody(required = false) Map<String, Object> map) {
-        return bmsshipFeign.addPortHandlingFeeSecond(map);
-    }
-
-
-    @PostMapping("/uploadBmsshipOrder")
-    @ApiOperation(value = "上传水运单图片")
-    public Map<String,Object> uploadBmsshipOrder(@RequestParam("file") MultipartFile multipartFile) throws Exception {
-        return bmsshipFeign.uploadBmsshipOrder(multipartFile);
-    }
-
-
-    //获取水运单图片
-    @ApiOperation(value = "获取水运单图片")
-    @ApiImplicitParams({
-    })
-    @PostMapping(value = "/downloadBmsshipOrder")
-    public Map<String, Object> downloadBmsshipOrder(@RequestParam Integer resultId) {
-        return bmsshipFeign.downloadBmsshipOrder(resultId);
-    }
-
-
-
-    /**
-     * 展示详单信息
-     *
-     * @param mapVal
-     * @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"),
-            @ApiImplicitParam(name = "orderType", value = "1:计时,2:计数，3：计重，4：包月", required = false, dataType = "Integer")
-    })
-    @PostMapping("/getInwardWeightDetailsOrder")
-    public Map<String, Object> getInwardWeightDetailsOrder(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           Integer apiId,
-                                                           String carrierSsoId,
-                                                           Integer detailStatus,
-                                                           Integer orderType,
-                                                           String userId,
-                                                           String startTime,
-                                                           String endTime,
-                                                           String capacityNo,
-                                                           String shipperNames,
-                                                           String transRangeValues,
-                                                           String materialTypeNames,
-                                                           String isPage) {
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return bmstruckFeign.getInwardWeightDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId, startTime,
-                 endTime,capacityNo,shipperNames,transRangeValues,materialTypeNames,isPage);
-    }
-
-    @PostMapping("/getNoInwardDetails")
-    public Map<String,Object> getNoInwardDetails(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 Integer apiId,
-                                                 String carrierSsoId,
-                                                 String userId,
-                                                 String startTime,
-                                                 String endTime,
-                                                 String orgCode,
-                                                 String capacityNo,
-                                                 String transRangeValues,
-                                                 String materialTypeNames,
-                                                 String shipperNames,
-                                                 String isPage){
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return bmstruckFeign.getNoInwardDetails(mapVal, pageNum, pageSize, apiId, carrierSsoId,userId, startTime,
-                endTime,orgCode,capacityNo,transRangeValues,materialTypeNames,shipperNames,isPage);
-    }
-
-    @PostMapping("/getInwardWeightTimeDetailsOrder")
-    public Map<String, Object> getInwardWeightTimeDetailsOrder(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           Integer apiId,
-                                                           String carrierSsoId,
-                                                           Integer detailStatus,
-                                                           Integer orderType,
-                                                           String userId,
-                                                           String startTime,
-                                                           String endTime) {
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return bmstruckFeign.getInwardWeightTimeDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId, startTime,
-                endTime);
-    }
-
-    @PostMapping("/selectPortFeeSecondList")
-    public Map<String,Object> selectPortFeeSecondList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 Integer apiId,
-                                                 String startTime,
-                                                 String endTime,
-                                                      Integer feeType,
-                                                      String con){
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return bmsshipFeign.selectPortFeeSecondList(mapVal, pageNum, pageSize, apiId, startTime, feeType,endTime,con);
-    }
-
-    /**
-     * 根据批次查火运湿吨详情
-     * @param batchId
-     * @return
-     */
-    @PostMapping("/getTrainDetailsByBatch/{batchId}")
-    public Map<String,Object> getTrainDetailsByBatch(@PathVariable("batchId")BigDecimal batchId){
-        return bmsshipFeign.getTrainDetailsByBatch(batchId);
-    }
-
-    /**
-     * 根据批次查汽运湿吨详情
-     * @param batchId
-     * @return
-     */
-    @PostMapping("/getTruckDetailsByBatch/{batchId}")
-    public Map<String,Object> getTruckDetailsByBatch(@PathVariable("batchId")BigDecimal batchId){
-        return bmsshipFeign.getTruckDetailsByBatch(batchId);
-    }
-
-
-    /**
-     * 根据批次查询装船作业
-     * @param
-     * @return
-     */
-    @PostMapping("/findLoadByBatch")
-    public Map<String,Object> findLoadByBatch(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer apiId,
-                                                      BigDecimal batchId){
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return bmsshipFeign.findLoadByBatch(mapVal, pageNum, pageSize, apiId,batchId);
-    }
-
-    @PostMapping("getSteelTruckDetailsOrder")
-    public Map<String,Object> getSteelTruckDetailsOrder(@RequestBody(required = false) Map<String,Object>map,
-                                                        Integer pageNum,
-                                                        Integer pageSize,
-                                                        Integer apiId,
-                                                        Integer orderType,
-                                                        String carrierSsoId,
-                                                        String startTime,
-                                                        String endTime,
-                                                        String con){
-        if(map == null){
-            map = new HashMap<>();
-        }
-        return bmstruckFeign.getSteelTruckDetailsOrder(map,pageNum,pageSize,apiId,orderType,carrierSsoId,startTime,endTime,con);
-    }
-
-    @PostMapping("/getShipFeeStatement")
-    public Map<String,Object> getShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
-        if(map == null){
-            map = new HashMap<>();
-        }
-        return bmsshipFeign.getShipFeeStatement(map);
-    }
-
-    @PostMapping("/getShipFeeStatemented")
-    public Map<String,Object> getShipFeeStatemented(@RequestBody(required = false) Map<String,Object> map){
-        if(map == null){
-            map = new HashMap<>();
-        }
-        return bmsshipFeign.getShipFeeStatemented(map);
-    }
-
-    @PostMapping("/addShipFeeStatement")
-    public Map<String,Object> addShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
-        if(map == null){
-            map = new HashMap<>();
-        }
-        return bmsshipFeign.addShipFeeStatement(map);
-    }
-
-    @PostMapping("/editShipFeeStatement")
-    public Map<String,Object> editShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
-        if(map == null){
-            map = new HashMap<>();
-        }
-        return bmsshipFeign.editShipFeeStatement(map);
-    }
-
-    //手动生成详单
-    @PostMapping("/newInwardSettle")
-    public Map<String,Object> newInwardSettle(@RequestBody  Map<String,Object> map){
-        return bmstruckFeign.newInwardSettle(map);
-    }
-
-    @PostMapping("/getWetDryDetails")
-    public Map<String,Object> getWetDryDetails(@RequestBody  Map<String,Object> map){
-        return bmsshipFeign.getWetDryDetails(map);
-    }
-
-    @PostMapping("updateDetailsStatus")
-    public Map<String,Object> updateDetailsStatus(@RequestBody Map<String,Object> map) {
-        return bmstruckFeign.updateDetailsStatus(map);
-    }
-
-
-    @PostMapping("updateBatchDetailsOrder")
-    public Map<String,Object> updateBatchDetailsOrder(@RequestBody Map<String,Object> map) {
-        return bmstruckFeign.updateBatchDetailsOrder(map);
-    }
-
-    @PostMapping("findDetailsForStatement")
-    public Map<String,Object> findDetailsForStatement(@RequestBody Map<String,Object> map) {
-        return bmstruckFeign.findDetailsForStatement(map);
-    }
-
-    @PostMapping("updateTruckDetail")
-    @ApiOperation(value = "直接修改汽运详单")
-    RESTfulResult updateTruckDetail(@RequestParam("orderList")BigDecimal[] orderList,@RequestParam("detailRemark") String detailRemark,@RequestParam("detailAmount") BigDecimal detailAmount,@RequestParam("userId") BigDecimal userId, MultipartRequest request) {
-        String url="";
-        List<MultipartFile> files = new ArrayList<>();
-        //获取图片
-        for(int i=0;i<=10;i++){
-            MultipartFile temp = request.getFile("file"+i);
-            if(temp!=null){
-                files.add(temp);
-            }
-        }
-        //上传图片
-        try{
-            for(int i=0;i<files.size();i++){
-                url+=imageFileUtils.updateFile(files.get(i),i)+';';
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            return failed("上传图片失败！");
-        }
-        Map<String,Object> map=new HashMap<>();
-        map.put("orderList",orderList);
-        map.put("detailAmount",detailAmount);
-        map.put("detailRemark",detailRemark);
-        map.put("url",url);
-        map.put("userId",userId);
-        return bmstruckFeign.updateTruckDetail(map);
-    }
-
-    @PostMapping("addTruckDetail")
-    @ApiOperation(value = "直接修改汽运详单")
-    RESTfulResult addTruckDetail(@RequestBody Map<String,Object> map) {
-        if(map==null){
-            return failed("参数为空!");
-        }
-        return bmstruckFeign.addTruckDetail(map);
-    }
-
-    @PostMapping("updateConsignee")
-    @ApiOperation(value = "修改详单收货客户")
-    RESTfulResult updateConsignee(@RequestBody Map<String,Object> map) {
-        if(map==null){
-            return failed("参数为空!");
-        }
-        return bmstruckFeign.updateConsignee(map);
-    }
-
-    @ApiOperation("查询发票图片")
-    @PostMapping("/getStatementPhoto")
-    public List<String> getStatementPhoto(@RequestParam BigDecimal statementId) throws Exception{
-        try{
-            String statementPhoto=bmstruckFeign.getStatementPhoto(statementId);
-            return getPhotoByUrl(statementPhoto);
-        }catch (Exception e){
-            return null;
-        }
-    }
-
-    //切割字符串，下载图片并返回
-    private List<String> getPhotoByUrl(String urls) throws Exception {
-        List<String> results=new ArrayList<>();
-        String files[]=urls.split(";");
-        for(int i=0;i<files.length && files[i].length()>5;i++){
-            results.add((String)imageFileUtils.downloadFile(files[i]));
-        }
-        return results;
-    }
-
 
 }

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

@@ -40,134 +40,4 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     @Autowired
     private UniversalMapper universalMapper;
 
-
-    @ApiOperation(value = "关闭一车多趟方法")
-    @PostMapping("/closePurOrderMoreTrips")
-    public RESTfulResult closePurOrderMoreTrips(String purchaseOrderNo, String deleteNoReceiveOrder) {
-        int i = backgroundProcessingMapper.closePurOrderMoreTrips(purchaseOrderNo);
-        if("yes".equals(deleteNoReceiveOrder)){
-            //查询该采购订单下所有未接收的运输订单（5,6,7,8,17,18)
-            ArrayList<Integer> orderIdList = backgroundProcessingMapper.getAllPurOrder(purchaseOrderNo);
-            if(orderIdList != null && orderIdList.size() != 0){
-                backgroundProcessingMapper.deleteOrders(orderIdList); //物理删除
-                backgroundProcessingMapper.deleteOrderMaterials(orderIdList);//物理删除物资子表
-                backgroundProcessingMapper.batchByOrderIdForTotalDelete(orderIdList);//总实绩表
-            }
-        }
-        if(i != 1){
-            return failed("关闭失败！没有此采购订单");
-        }
-        return success("关闭成功");
-    }
-
-    @ApiOperation(value = "更改所属厂区方法")
-    @PostMapping("/updatePurOrgId")
-    public RESTfulResult updatePurOrgId(@RequestBody(required = false) Map<String, Object> map){
-        return success(backgroundProcessingService.updatePurOrgId(map));
-    }
-
-    @ApiOperation(value = "删除没用的表实绩 ")
-    @PostMapping("/deleteErrorResult")
-    public RESTfulResult deleteErrorResult(String orderNumber){
-        return success(backgroundProcessingService.deleteErrorResult(orderNumber));
-    }
-
-    @ApiOperation(value = "手动允许放行-OK字段")
-    @PostMapping("/allowEnfactory")
-    public RESTfulResult allowEnfactory(String orderNumber){
-        return success(backgroundProcessingMapper.allowEnfactory(orderNumber));
-    }
-
-    @ApiOperation(value = "获取cid和车牌号的关系")
-    @PostMapping("/bindCidCapacityNo")
-    public RESTfulResult bindCidCapacityNo(String cid,
-                                           String capacityNo){
-        if(cid == null || capacityNo == null || "null".equals(cid) || "null".equals(capacityNo)){
-            return success(0);
-        }
-        int i = backgroundProcessingService.bindCidCapacityNo(cid,capacityNo);
-        return success(i);
-    }
-
-    @ApiOperation(value = "更新运输订单canwork状态")
-    @PostMapping("updateOrderCanWork")
-    public RESTfulResult updateOrderCanWork(String orderNumber){
-        if(orderNumber != null){
-            int i = backgroundProcessingMapper.updateOrderCanWork(orderNumber);
-            return success(i);
-        }
-        return success(0);
-    }
-
-    @ApiOperation(value = "更新运输订单状态接口")
-    @PostMapping("updateOrderStatus")
-    @Transactional(rollbackFor = Exception.class)
-    public RESTfulResult updateOrderStatus(@RequestBody(required = false) Map<String,Object> map) throws Exception{
-        if (map.get("orderNumber") != null) {
-            if (DataChange.dataToBigDecimal(map.get("orderStatus")).intValue() != 2) {
-                int i = backgroundProcessingMapper.updateOrderStatus(map);
-                if(i > 1){
-                    throw new Exception("该订单号有多个运单，不允许修改，请去数据库手动修改订单状态！");
-                }
-                return success(i);
-            }
-        }
-        return failed(0);
-    }
-
-    @ApiOperation(value = "内转/采购新增上传金蝶表")
-    @PostMapping("insertToUploadEas")
-    public RESTfulResult insertToUploadEas(@RequestBody(required = false) Map<String,Object> map){
-        try {
-            Map<String,Object> purchaseOrder = (Map<String, Object>) map.get("purchaseOrder");
-            List<Map<String,Object>> list= (List<Map<String, Object>>) map.get("list");
-            for(Map<String,Object> item:list){
-                item.put("purchaseOrderNo",purchaseOrder.get("purchaseOrderNo"));
-                backgroundProcessingMapper.insertNotUpload(item);
-            }
-        }catch (NullPointerException e){
-            e.printStackTrace();
-            return failed("缺乏参数！");
-        }catch (Exception e){
-            e.printStackTrace();
-            return failed("未知异常！");
-        }
-        return success("修改成功，稍后会自动上传金蝶！");
-    }
-
-    @ApiOperation(value = "重置钢材打印数量")
-    @PostMapping("resetPrintNumber")
-    public RESTfulResult resetPrintNumber(@RequestBody(required = false) Map<String,Object> map){
-        return success(backgroundProcessingMapper.resetPrintNumber(map));
-    }
-
-    @ApiOperation(value = "删除进厂和排队")
-    @PostMapping("clearEnAndQue")
-    public RESTfulResult clearEnAndQue(@RequestBody(required = false) Map<String,Object> map){
-        try {
-            Map<String,Object> mesMap = backgroundProcessingMapper.getDetailsForEnAndQue(map);
-            if(mesMap == null){
-                return failed("没有符合条件的运单，请确认该运单是否已有净重！");
-            }
-            //清空进厂信息
-            backgroundProcessingMapper.clearEnDetails(mesMap);
-            //删除排队
-            int materialMesCount = omstruckOrderMapper.getMaterialNumByOrderId(mesMap);
-            if (materialMesCount == 1) {
-                //如果是单拼,则删除排队实绩
-                omstruckOrderMapper.deleteQueueList(DataChange.dataToBigDecimal(mesMap.get("capacityId")));
-                omstruckOrderMapper.deleteQueueResult(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
-            }else{
-                omstruckOrderMapper.deleteQueueSpellList(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
-                omstruckOrderMapper.deleteQueueResult(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
-            }
-            //将总实绩里面的部分信息去掉,并改路段顺序号为null
-            omstruckOrderMapper.updateTotalResultNull(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
-            universalMapper.updateLineSqe(mesMap);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return failed("未知异常!",e.getMessage());
-        }
-        return success("修改成功！");
-    }
 }

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

@@ -1,34 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.feign.JoinFeign;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2022/2/24 18:09
- */
-
-@RestController
-@RequestMapping("${api.version}/join")
-public class JoinController {
-
-    @Autowired
-    JoinFeign joinFeign;
-
-    @PostMapping("/receiveTmsTruckWeightResult")
-    public Map<String, Object> receiveTmsTruckWeightResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
-        return joinFeign.receiveTmsTruckWeightResult(mapList);
-    }
-
-    @PostMapping("linkageDeleteTransportOrder")
-    public String linkageDeleteTransportOrder(@RequestBody(required = false) List<Map<String,Object>> mapList) {
-        return joinFeign.linkageDeleteTransportOrder(mapList);
-    }
-}

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

@@ -17,930 +17,6 @@ import java.util.Map;
 @RestController
 @RequestMapping("${api.version}/oms")
 public class OMSController {
+ 
 
-
-    @Autowired
-    OmsFeign omsFeign;
-    
-    //********************************************omsTruckOrderController*****************************
-
-    @ApiOperation(value = "查询所有运输订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(86)", 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("/getAllTruckOrder")
-    public Map<String, Object> getAllTruckOrder(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer orderStatus,
-                                                Integer planId,
-                                                Integer orderType,
-                                                Integer fuelOrder,
-                                                String carrierSSOId,
-                                                String con,
-                                                String startTime,
-                                                String endTime) {
-        return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderStatus, planId, orderType, fuelOrder,carrierSSOId, con,startTime,endTime);
-    }
-
-    @ApiOperation(value = "不适用表头返回数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("/getAllTruckOrderReturnListMap")
-    public Map<String, Object> getAllTruckOrderReturnListMap(Integer orderStatus, Integer planId, Integer orderType) {
-        return omsFeign.getAllTruckOrderReturnListMap(orderStatus, planId, orderType);
-    }
-
-    @ApiOperation(value = "查询所有空闲的运力信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(85)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllCapacity")
-    public Map<String, Object> getAllCapacity(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        Integer apiId,
-                                        Integer pageNum,
-                                        Integer pageSize,
-                                        Integer carrierId
-    ) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return omsFeign.getAllCapacity(mapValue, apiId, pageNum, pageSize, carrierId);
-    }
-
-    @ApiOperation(value = "新增采购进口矿订单 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("/addInputOrder")
-    public Map<String,Object> addInputOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
-        return omsFeign.addInputOrder(mapValue);
-    }
-
-    @ApiOperation(value = "分解运输计划后 新增订单  或者直接新增订单 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("/addPurOrder")
-    public Map<String, Object> addPurOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
-        return omsFeign.addPurOrder(mapValue);
-    }
-
-    //采购内转派单
-    @ApiOperation(value = "采购内转派单")
-    @PostMapping("/addPurInwardOrder")
-    public Map<String,Object> addPurInwardOrder(@RequestBody(required = false) Map<String,Object>mapValue) {
-        return omsFeign.addPurInwardOrder(mapValue);
-    }
-
-    @ApiOperation(value = "修改分派计划")
-    @PostMapping("/updateOrder")
-    public Map<String, Object> updateOrder(@RequestBody Map<String, Object> map) {
-        return omsFeign.updateOrder(map);
-    }
-
-    @ApiOperation(value = "派单")
-    @PostMapping("/dispatchOrder")
-    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
-        return omsFeign.dispatchOrder(mapValue);
-    }
-
-    @ApiOperation(value = "销售派单")
-    @PostMapping("/dispatchOrderForSale")
-    public Map<String, Object> dispatchorderForSale(@RequestBody(required = false) Map<String, Object> map) {
-        return omsFeign.dispatchOrderForSale(map);
-    }
-
-
-    @ApiOperation(value = "逻辑删除运单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/deleteOrder")
-    public Map<String, Object> deleteOrder(@RequestBody(required = false) Map<String, Object> map,
-                                     Integer planId) {
-        return omsFeign.deleteOrder(map, planId);
-    }
-
-    @ApiOperation(value = "司机接收、拒绝接单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/driverReceiveOrRefuse")
-    public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map) {
-        return omsFeign.driverReceiveOrRefuse(map);
-    }
-    @ApiOperation(value="撤销订单")
-    @PostMapping("/undoOrder")
-    public Map<String, Object> undoOrder(@RequestBody Map<String,Object> map) {
-        return omsFeign.undoOrder(map);
-    }
-
-    @ApiOperation(value = "撤销已拒绝")
-    @PostMapping("/refuseCtrlZ")
-    public Map<String,Object> refuseCtrlZ(@RequestBody Map<String,Object> map){
-        return omsFeign.refuseCtrlZ(map);
-    }
-
-
-
-    @ApiOperation(value="司机接单信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getReceiveRefuseOrder/{orderReceiveStatus}")
-    public Map<String, Object> getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               @PathVariable Integer orderReceiveStatus,
-                                               Integer orderType,
-                                               Integer orderStatus, String con
-    ){
-        return omsFeign.getReceiveRefuseOrder(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum,
-                pageSize, orderReceiveStatus, orderType, orderStatus, con);
-    }
-
-
-    @ApiOperation(value="司机APP端调用接口查询数据 4 已下发 5 已接收")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "capacityNumber", value = "车牌号", required = false, dataType = "String"),
-    })
-    @PostMapping("/sendMesToDriver")
-    public Map<String, Object> sendMesToDriver(String capacityNumber, Integer orderStatus){
-        return omsFeign.sendMesToDriver(capacityNumber, orderStatus);
-    }
-
-    @ApiOperation(value="通过车牌获取所有已拒绝的订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "capacityNumber", value = "车牌号", required = false, dataType = "String"),
-    })
-    @PostMapping("/getRefuseOrderByCapacityNum")
-    public Map<String, Object> sendMesToDriver(String capacityNumber){
-        return omsFeign.sendMesToDriver(capacityNumber);
-    }
-
-    @ApiOperation(value="通过运输订单ID查询运单信息 包含各个作业路径")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderId", value = "订单Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getOrderMesByOrderNum/{orderId}")
-    public Map<String, Object> getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId){
-        return omsFeign.getOrderMesByOrderNum(orderId);
-    }
-
-    @ApiOperation(value="通过运输订单ID查询实绩地点和时间")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/selectPlaceAndTime/{orderId}")
-    public Map<String, Object> selectPlaceAndTime(@PathVariable("orderId") Integer orderId){
-        return omsFeign.selectPlaceAndTime(orderId);
-    }
-
-    @ApiOperation(value="通过运输订单ID查询运单信息")
-    @PostMapping("/selectOrderByOrderId/{orderId}")
-    public Map<String, Object> selectOrderByOrderId(@PathVariable("orderId") Integer orderId){
-        return omsFeign.selectOrderByOrderId(orderId);
-    }
-
-    @ApiOperation(value="查看运输派单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getTransportDispatch")
-    public Map<String, Object> getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              Integer orderType,
-                                              Integer orderStatus, Integer fuelOrder,String carrierSSOId,String con,
-                                                    String startTime,
-                                                    String endTime){
-        return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                 orderType, orderStatus, fuelOrder,carrierSSOId,con,startTime,endTime);
-    }
-
-    /**
-     * 展示承运商接收销售公司已接受的销售订单
-     *
-     * @param
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("/getSaleOrderForCarrierList/{carrierId}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> getSaleOrderForCarrierList(@RequestBody(required = false)Map<String,Object> map,
-                                                          @PathVariable("carrierId") Integer carrierId,
-                                                          Integer apiId,
-                                                          Integer pageNum,
-                                                          Integer pageSize,
-                                                          String con
-                                                          ) {
-        return omsFeign.getSaleOrderForCarrierList(map==null ? new HashMap<>():map,carrierId, apiId, pageNum, pageSize,con);
-
-    }
-
-    /**
-     * 展示承运商接收销售公司已接受的销售订单
-     *
-     * @param
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("/selectAllOrderForSale/{carrierId}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> selectAllOrderForSale( @RequestBody(required = false) Map<String,Object> mapValue,
-                                                      @PathVariable Integer carrierId,
-                                                      Integer apiId,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer orderType,
-                                                      Integer orderStatus,
-                                                      Integer saleOrderMaterialId,
-                                                      String  con
-                                                    ) {
-        return omsFeign.selectAllOrderForSale(mapValue==null?new HashMap<>():mapValue, carrierId, apiId, pageNum, pageSize, orderType, orderStatus, saleOrderMaterialId, con);
-    }
-    /**
-     * 展示承运商接收销售公司已接受的销售订单
-     *
-     * @param
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("/getTransportOrder")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> getTransportOrder( @RequestBody(required = false) Map<String, Object> mapValue,
-                                                  Integer apiId,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                   Integer orderId,
-                                                  Integer orderStatus
-    ) {
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        return omsFeign.getTransportOrder(mapValue,apiId,pageNum,pageSize,orderId,orderStatus);
-    }
-
-
-
-
-
-
-
-
-    /**
-     * 销售物流：司机接单pc端
-     */
-
-    @ApiOperation(value="pc端展示司机信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(226)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getDriverInfoForSale")
-    public Map<String,Object> getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize,
-                                                   Integer orderType,
-                                                   Integer orderStatus,
-                                                   String con,
-                                                   String carrierSsoId,
-                                                   Integer shipperId
-    )
-    {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,orderType,orderStatus, con,carrierSsoId,shipperId);
-    }
-    @PostMapping("/getDriverInfoForSale1")
-    public Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   Integer orderStatus,
-                                                   String con,
-                                                   String numberPlate,
-                                                   @RequestParam Integer saleOrderId
-    )
-    {
-        return omsFeign.getDriverInfoForSale1(mapValue==null?new HashMap<>():mapValue,orderStatus, con,numberPlate,saleOrderId);
-    }
-
-
-
-    /**
-     * 查询所有已经接收的焦炭发运日计划
-     *
-     * @param carrierId
-     * @param apiId
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @PostMapping("/getCokeDayPlanAndRecivedList/{carrierId}")
-
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "169", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> getCokeDayPlanAndRecivedList(
-                                                            @RequestBody(required = false)Map<String,Object> map,
-                                                            @PathVariable("carrierId") Integer carrierId,
-                                                            @RequestParam Integer apiId,
-                                                            @RequestParam Integer pageNum,
-                                                            @RequestParam Integer pageSize) {
-        return omsFeign.getCokeDayPlanAndRecivedList(map==null?new HashMap<>():map,carrierId, apiId, pageNum, pageSize);
-    }
-
-    /**
-     * 查询所有已经接收的水渣发运日计划
-     *
-     * @param
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("/getWaterSlagDayPlanAndRecivedList/{carrierId}")
-
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "170", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> getWaterSlagDayPlanAndRecivedList(
-                                                                 @RequestBody(required = false)Map<String,Object> map,
-                                                                 @PathVariable("carrierId") Integer carrierId,
-                                                                 @RequestParam Integer apiId,
-                                                                 @RequestParam Integer pageNum,
-                                                                 @RequestParam Integer pageSize) {
-        return omsFeign.getWaterSlagDayPlanAndRecivedList(map==null?new HashMap<>():map, carrierId, apiId, pageNum, pageSize);
-    }
-    @ApiOperation(value="通过物资ID和发货单位ID查找采购订单号")
-    @PostMapping("/selectNewOrderId")
-    public Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map){
-        return omsFeign.selectNewOrderId(map);
-    }
-    @ApiOperation(value="查询所有空闲的司机排班信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(186)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getCapacityForLeisure/{carrierId}")
-    public Map<String, Object> getCapacityForLeisure(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     @PathVariable Integer carrierId) {
-        return omsFeign.getCapacityForLeisure(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize,carrierId);
-    }
-     //获取已经形成订单的焦炭计划
-    @PostMapping(value = "/getCokeRailDayPlanForGenOrder/{carrierId}")
-    public Map<String,Object>  getCokeRailDayPlanForGenOrder(@RequestBody(required = false)Map<String,Object> map,
-                                                           @PathVariable("carrierId") Integer carrierId,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           Integer apiId,
-                                                           Integer dayPlanId,
-                                                           Integer orderStatus,
-                                                           Integer orderType,
-                                                           String con
-    ){
-        return  omsFeign.getCokeRailDayPlanForGenOrder(map==null?new HashMap<>():map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus, orderType, con);
-    }
-
-
-   //获取已经形成订单的水渣计划
-   @PostMapping(value = "/getWaterslagDayPlanForGenOrder/{carrierId}")
-   public Map<String, Object>     getWaterslagDayPlanForGenOrder(@RequestBody(required = false)Map<String,Object> map,
-                                                                 @PathVariable("carrierId") Integer carrierId,
-                                                                 Integer pageNum,
-                                                                 Integer pageSize,
-                                                                 Integer apiId,
-                                                                 Integer dayPlanId,
-                                                                 Integer orderStatus,
-                                                                 Integer orderType,
-                                                                 String con
-
-
-   ){
-        return omsFeign.getWaterslagDayPlanForGenOrder(map==null?new HashMap<>():map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus,orderType, con);
-
-   }
-
-    @ApiOperation(value="车牌号下拉")
-    @GetMapping("/getDriverCapacity")
-    public Map<String, Object> getDriverCapacity() {
-        Map<String,Object> map = omsFeign.getDriverCapacity();
-        return map;
-    }
-
-    @ApiOperation(value="派单信息")
-    @PostMapping("/getTruckNoDispatchMap")
-    public Map<String, Object> getTruckNoDispatchMap(Integer dispatchId) {
-        Map<String,Object> map = omsFeign.getTruckNoDispatchMap(dispatchId);
-        return map;
-    }
-
-    @ApiOperation(value="承运商分派运输订单给司机")
-    @PostMapping("/addAppTruckOrder")
-    public Map<String, Object> addAppTruckOrder(@RequestParam Integer dispatchId,
-                                                @RequestParam Integer orderType,
-                                                @RequestParam String capacityNumber,
-                                                @RequestParam Integer carrierId) {
-        Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType,capacityNumber, carrierId);
-        return map;
-    }
-    //展示销售订单信息
-    @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"),
-    })
-    @PostMapping("/selectSteelSaleForCarrier/{carrierId}")
-    public Map<String, Object> selectSteelSaleForCarrier(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                         Integer apiId,
-                                                         Integer pageNum,
-                                                         Integer pageSize,
-                                                         @PathVariable Integer carrierId
-
-    )
-
-    {
-        return omsFeign.selectSteelSaleForCarrier(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierId);
-    }
-
-
-
-    @ApiOperation(value=" 通过销售订单id查找信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(235)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/selectInfoBySaleOrderId/{saleOrderId}")
-    public Map<String, Object> selectInfoBySaleOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-                                                       @PathVariable Integer saleOrderId
-
-
-    ){
-        return  omsFeign.selectInfoBySaleOrderId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,saleOrderId);
-    }
-
-    //展示发运计划信息
-    @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"),
-    })
-    @PostMapping("/selectCokeRailPlan/{carrierId}")
-    public Map<String, Object> selectCokeRailPlan(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                  Integer apiId,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  @PathVariable Integer carrierId,
-                                                  Integer orderType
-
-    ){
-        return  omsFeign.selectCokeRailPlan(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierId, orderType);
-    }
-
-    @ApiOperation(value=" 通过发运id查找信息")
-    @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"),
-    })
-    @PostMapping("/selectInfoByDayPlanId/{dayPlanId}")
-    public Map<String, Object> selectInfoByDayPlanId(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     @PathVariable  Integer dayPlanId,
-                                                     Integer orderType
-
-
-    ){
-        return omsFeign.selectInfoByDayPlanId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, dayPlanId, orderType);
-    }
-
-    @ApiOperation(value="根据运单id关闭订单")
-    @PostMapping("/closeOmstruckOrder")
-    public Map<String, Object> closeOmstruckOrder(@RequestBody Map<String,Object> mapVal) {
-        Map<String, Object> map = omsFeign.closeOmstruckOrder(mapVal);
-        return map;
-    }
-
-    @ApiOperation(value="根据运单id修改运力")
-    @PostMapping("/updateCapacityId")
-    public Map<String, Object> updateCapacityId(@RequestBody Map<String,Object> map) {
-       return omsFeign.updateCapacityId(map);
-
-    }
-
-    @ApiOperation(value="siji")
-    @PostMapping("/getCapacityAndDriverList")
-    public Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                        Integer apiId,
-                                                        Integer pageNum,
-                                                        Integer pageSize,
-                                                        String con,
-                                                        String carrierId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con,carrierId);
-        return map;
-    }
-
-    //查询所有的收货单位
-    @GetMapping("/getReceivingUnit")
-    public Map<String, Object> getReceivingUnit(){
-        return omsFeign.getReceivingUnit();
-    }
-
-
-    //查询所有的发货单位（供应商）
-    @GetMapping("/getSupplier")
-    public Map<String, Object> getSupplier(){
-        return omsFeign.getSupplier();
-    }
-
-    @ApiOperation(value = "关闭订单")
-    @PostMapping("/CloseOrder")
-    public  Map<String,Object> CloseOrder(@RequestBody(required = false)Map<String,Object> map){
-        return  omsFeign.CloseOrder(map);
-    }
-
-    @ApiOperation(value = "分解内转计划（新增运输订单）")
-    @PostMapping("/addInwardOrder")
-    public Map<String,Object> addInwardOrder(@RequestBody Map<String,Object> mapValue) {
-        return omsFeign.addInwardOrder(mapValue);
-    }
-
-    @ApiOperation(value = "分派计划")
-    @PostMapping("/apportionInwardOrder")
-    public Map<String,Object> apportionInwardOrder(@RequestBody List<Map<String,Object>> mapList) {
-        return omsFeign.apportionInwardOrder(mapList);
-    }
-
-    @ApiOperation(value="分解计划查询")
-    @PostMapping("/getInwardOrderList")
-    public Map<String, Object> getInwardOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                  Integer apiId,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer orderStatus,
-                                                  String carrierId,
-                                                  String con,
-                                                  String startTime,
-                                                  String endTime) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        Map<String, Object> map = omsFeign.getInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,startTime,endTime);
-        return map;
-    }
-
-    @ApiOperation(value="采购内转运单")
-    @PostMapping("/getPurInwardOrderList")
-    public Map<String, Object> getPurInwardOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                  Integer apiId,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer orderStatus,
-                                                  String carrierId,
-                                                  String con,
-                                                     Integer planEnableStatus,
-                                                     String userId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        Map<String, Object> map = omsFeign.getPurInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,planEnableStatus,userId);
-        return map;
-    }
-
-    @ApiOperation(value = "司机APP端查询下发给自己运输订单")
-    @PostMapping("/sendOrderToApp")
-    public List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber) {
-        return omsFeign.sendOrderToApp(capacityNumber);
-    }
-
-    @ApiOperation(value = "根据运输订单号查询订单物资")
-    @PostMapping("/getUnloadOrderMaterial")
-    public Map<String,Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String,Object>map){
-        return omsFeign.getUnloadOrderMaterial(map);
-    }
-    @ApiOperation(value = "根据运输订单号查询卸货点")
-    @PostMapping("/getUnloadOrderWarehouseName")
-    public Map<String,Object> getUnloadOrderWarehouseName(@RequestBody(required = false)Map<String,Object>map){
-        return omsFeign.getUnloadOrderWarehouseName(map);
-    }
-
-    @ApiOperation(value = "分解异地库计划")
-    @PostMapping("/apportionInwardOffsetOrder")
-    public Map<String,Object> apportionInwardOffsetOrder(@RequestBody Map<String,Object> mapvalue) {
-        return omsFeign.apportionInwardOffsetOrder(mapvalue);
-    }
-
-    @ApiOperation(value = "查询司机的所有运输订单信息")
-    @PostMapping("/getAllOrderMessage")
-    public List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber) {
-        return omsFeign.getAllOrderMessage(capacityNumber);
-    }
-
-    @ApiOperation(value = "司机确认订单")
-    @PostMapping("/driverConfirmation")
-    public Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue) {
-        return omsFeign.driverConfirmation(mapvalue);
-    }
-    @ApiOperation(value = "通过运输订单号查询订单信息给司机")
-    @PostMapping("/getMessageToApp")
-    public Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) {
-        return omsFeign.getMessageToApp(mapvalue);
-    }
-
-    @ApiOperation(value = "通过车牌号查询所有已下发未接收的订单信息")
-    @PostMapping("/getAllOrderMessagesByCapacityNum")
-    public List<Map<String, Object>> getAllOrderMessagesByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue){
-        return  omsFeign.getAllOrderMessagesByCapacityNum(mapvalue);
-    }
-
-    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
-    @PostMapping("/getReceiveOrderIdListByCapacityNum")
-    public List<Integer> getReceiveOrderIdListByCapacityNum(@RequestBody(required = false) Map<String, Object> mapvalue) {
-        return omsFeign.getReceiveOrderIdListByCapacityNum(mapvalue);
-    }
-
-    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
-    @PostMapping("/getAllRefuseOrderNumberByCapacity")
-    public List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue){
-        return omsFeign.getAllRefuseOrderNumberByCapacity(mapvalue);
-    }
-
-    @ApiOperation(value = "添加退货实绩关闭当前订单")
-    @PostMapping("/returnOrderCloseOrder")
-    public Map<String,Object> returnOrderCloseOrder(@RequestBody(required = false) Map<String, Object> map){
-        return omsFeign.returnOrderCloseOrder(map);
-    }
-
-    @ApiOperation(value = "根据运单id查询实绩位置")
-    @PostMapping("/getOrderResult")
-    public List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map){
-        return omsFeign.getOrderResult(map);
-    }
-
-    @ApiOperation(value = "装机查询所以已装车的订单信息")
-    @PostMapping("/getLoadForLoadCarResult")
-    public  Map<String, Object> getLoadForLoadCarResult(@RequestBody(required = false) Map<String, Object> map){
-        return omsFeign.getLoadForLoadCarResult(map);
-    }
-
-
-    @ApiOperation(value = "查询未下发的零星物资订单")
-    @PostMapping("/getOthersOrderMesToSend")
-    public Map<String, Object> getOthersOrderMesToSend(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 Integer type,
-                                                 Integer orderStatus,
-                                                 String carrierId,
-                                                 String  con,
-                                                 String userId,
-                                                 String usersId,
-                                                       Integer type1,
-                                                       String startTime,
-                                                       String endTime) {
-        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con,userId,usersId,type1,startTime,endTime);
-    }
-
-    @ApiOperation(value = "修改运输订单方法：根据运输订单id修改运力id")
-    @PostMapping("/updateOmstruckOrder")
-    public Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map){
-        Integer orderId = Integer.parseInt(map.get("orderId").toString()) ;
-        map.remove("orderId");
-        map.put("orderId",orderId);
-        return omsFeign.updateOmstruckOrder(map);
-    }
-
-    @ApiOperation(value="承运商销售分派运输订单给司机")
-    @PostMapping("/addSaleTruckOrder")
-    public Map<String, Object> addSaleTruckOrder(@RequestBody Map<String,Object> mapValue) {
-        Map<String, Object> map = omsFeign.addSaleTruckOrder(mapValue);
-        return map;
-    }
-
-    @ApiOperation(value = "通过运单下的物资信息")
-    @PostMapping("/getOrderMaterialList")
-    public Map<String, Object> getOrderMaterialList(@RequestParam Integer orderId) {
-        return omsFeign.getOrderMaterialList(orderId);
-    }
-
-    @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
-    @PostMapping("/getCapacityAllOrder")
-    public Map<String, Object> getCapacityAllOrder(String capacityNumber, String date){
-        return omsFeign.getCapacityAllOrder(capacityNumber,date);
-    }
-
-    @ApiOperation(value = "该车牌号下的所有物资的综合")
-    @PostMapping("/getMatrialWeight")
-    public Map<String, Object> getMatrialWeight(String capacityNumber, String date){
-        return omsFeign.getMatrialWeight(capacityNumber,date);
-    }
-
-    @ApiOperation(value = "根据运单id关闭运输订单")
-    @PostMapping("/closeOrder")
-    public Map<String, Object> closeOrder(@RequestParam Integer orderId) {
-        return omsFeign.closeOrder(orderId);
-    }
-
-    @ApiOperation(value = "查询订单是否确认")
-    @PostMapping("/getDriverConfirmation")
-    public Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map) {
-        return omsFeign.getDriverConfirmation(map);
-    }
-
-    @ApiOperation(value = "一键删除多个订单")
-    @PostMapping("/deleteOrders")
-    public Map<String, Object>  deleteOrders(@RequestBody(required = false) Map<String, Object> map){
-        return omsFeign.deleteOrders(map);
-    }
-
-    @ApiOperation(value = "装卸工查询自己所有装了货的订单信息")
-    @PostMapping("/getAllLoadUnloadResult")
-    public Map<String, Object> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> mapValue){
-        return omsFeign.getAllLoadUnloadResult(mapValue);
-    }
-
-    @ApiOperation(value = "计时作业查看订单详情")
-    @PostMapping("/getTimeTaskEnd")
-    public Map<String, Object> getTimeTaskEnd(@RequestBody(required = false) Map<String, Object> mapValue){
-        return omsFeign.getTimeTaskEnd(mapValue);
-    }
-
-    @ApiOperation(value = "计时作业查看订单详情")
-    @PostMapping("/getTimeTaskEndDetail")
-    public Map<String, Object> getTimeTaskEndDetail(@RequestBody(required = false) Map<String, Object> mapValue){
-        return omsFeign.getTimeTaskEndDetail(mapValue);
-    }
-
-
-    @ApiOperation(value = "计时作业查看订单详情")
-    @PostMapping("/getPauseTimeTaskDetail")
-    public Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId){
-        return omsFeign.getPauseTimeTaskDetail(orderId);
-    }
-
-    @ApiOperation(value="批量关闭运输订单")
-    @PostMapping("/batchCloseOrder")
-    public Map<String, Object> batchCloseOrder(@RequestBody List<Map<String,Object>> mapList) {
-        return omsFeign.batchCloseOrder(mapList);
-    }
-
-    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
-    @PostMapping("/getOrderMaterial/{orderId}")
-    public Map<String,Object> getOrderMaterial(@PathVariable("orderId")Integer orderId){
-        return omsFeign.getOrderMaterial(orderId);
-    }
-
-
-    @ApiOperation(value = "正常关闭运输订单")
-    @PostMapping("/closeInwardOrder")
-    public Map<String, Object> closeInwardOrder(Integer orderId){
-        return omsFeign.closeInwardOrder(orderId);
-    }
-
-    @ApiOperation(value = "计时查询进程")
-    @PostMapping("/getTimeOrderResult")
-    public Map<String, Object> getTimeOrderResult(@RequestBody(required = false) Map<String, Object> map){
-        return omsFeign.getTimeOrderResult(map);
-    }
-
-    @ApiOperation(value = "装机查询所以已装车的订单信息")
-    @PostMapping("/getCapacityTypeByUserId")
-    public Map<String, Object> getCapacityTypeByUserId(@RequestBody (required = false) Map<String, Object> map) {
-        return omsFeign.getCapacityTypeByUserId(map);
-    }
-
-    @ApiOperation(value = "查询钢材订单号")
-    @GetMapping("getSteelOrderNum")
-    public Map<String, Object> getSteelOrderNum(String capacityId){
-        return omsFeign.getSteelOrderNum(capacityId);
-    }
-
-    @ApiOperation(value = "查询钢材订单信息")
-    @GetMapping("getMesToSteelDepartment")
-    public Map<String, Object> getMesToSteelDepartment(Integer orderId){
-        return omsFeign.getMesToSteelDepartment(orderId);
-    }
-
-    @ApiOperation(value = "查询钢材订单信息")
-    @PostMapping("updateMaterialMes")
-    public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map) {
-        return omsFeign.updateMaterialMes(map);
-    }
-
-    @ApiOperation(value = "修改正在装的状态")
-    @PostMapping("/updateContinueStaus")
-    public Map<String, Object> updateContinueStaus(@RequestBody(required = false) Map<String, Object> map) {
-        return omsFeign.updateContinueStaus(map);
-    }
-
-    @ApiOperation(value = "展示销售订单下的运输订单")
-    @PostMapping("getDriverInfoForSale2")
-    public Map<String, Object> getDriverInfoForSale2(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     Integer saleOrderId,
-                                                     String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return omsFeign.getDriverInfoForSale2(mapValue,apiId,pageNum,pageSize,new BigDecimal(saleOrderId),con);
-    }
-
-    @ApiOperation(value = "通过运单id或者运单号查询车辆是否放行")
-    @PostMapping("canCapacityEnfactory")
-    public Map<String, Object> canCapacityEnfactory(@RequestBody Map<String, Object> mapValue) {
-        return omsFeign.canCapacityEnfactory(mapValue);
-    }
-
-    @ApiOperation(value = "出库信息")
-    @PostMapping("getWarehouseMes")
-    public Map<String, Object> getWarehouseMes(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               @RequestParam(required = false) String startTime,
-                                               @RequestParam(required = false) String endTime,
-                                               @RequestParam(required = false) String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return omsFeign.getWarehouseMes(mapValue,startTime,endTime, con);
-    }
-
-    @ApiOperation(value = "通过运单下的物资信息")
-    @PostMapping("/closeInwardOrderByPlan")
-    public  Map<String, Object> closeInwardOrderByPlan(@RequestParam Integer planId) {
-        return omsFeign.closeInwardOrderByPlan(planId);
-    }
-
-
-    @ApiOperation(value = "查询内转钢材异地库物资详情")
-    @GetMapping("/getOrderTrainMes")
-    public Map<String,Object> getOrderTrainMes(@RequestParam Integer orderId){
-        return omsFeign.getOrderTrainMes(orderId);
-    }
-
-    @ApiOperation(value = "查询内转钢材火车发运明细")
-    @PostMapping("getWagonShippingDetails")
-    public Map<String,Object> getWagonShippingDetails(@RequestBody(required = false)  Map<String,Object> map,
-                                                      @RequestParam(required = false) String startTime,
-                                                      @RequestParam(required = false) String endTime,
-                                                      @RequestParam(required = false) String sendStation,
-                                                      @RequestParam(required = false) String toTheStation,
-                                                      @RequestParam(required = false) String consigneeName,
-                                                      @RequestParam(required = false) String wagonNo){
-        if (map == null) {
-            map = new HashMap<>();
-        }
-        return omsFeign.getWagonShippingDetails(map,startTime,endTime,sendStation,toTheStation,consigneeName,wagonNo);
-    }
 }

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

@@ -1,380 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.config.ImageFileUtils;
-import com.steerinfo.dil.feign.OtmsFeign;
-import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartRequest;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("${api.version}/otms")
-public class OTMSController {
-
-    @Autowired
-    private OtmsFeign otmsFeign;
-    @Autowired
-    private ImageFileUtils imageFileUtils;
-    @ApiOperation(value="全路径展示接口")
-    @PostMapping("/fullPath")
-    public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception {
-        return otmsFeign.fullPath(orderNumber);
-    }
-
-    @ApiOperation(value = "在途订单列表")
-    @PostMapping("/getInTransitTransportation")
-    public RESTfulResult getInTransitTransportation(@RequestBody(required=false)   Map<String,Object> mapValue,
-                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                    @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
-                                                    @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
-    )
-    {
-        return otmsFeign.getInTransitTransportation(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
-    }
-
-    @ApiOperation(value = "有异常订单列表")
-    @PostMapping("/getHaveAbnormalTruckOrderInfo")
-    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody(required=false)   Map<String,Object> mapValue,
-                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                    @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
-                                                    @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
-    )
-    {
-        return otmsFeign.getHaveAbnormalTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
-    }
-
-    @ApiOperation("已完成订单列表")
-    @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")
-    })
-    @PostMapping("/getFinishTruckOrderInfo")
-    public RESTfulResult getFinishTruckOrderInfo(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                 @RequestParam(required = false,defaultValue = "468",name = "apiId")Integer apiId,
-                                                 @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
-                                                 @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
-    ){
-        return otmsFeign.getFinishTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
-    }
-
-    @ApiOperation(value = "新增抵达")
-    @PostMapping(value = "/addtmstruckArrivalResult")
-    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, Long arrivalTime,  MultipartRequest request) throws Exception {
-        //添加到files数组
-        List<MultipartFile> files = new ArrayList<>();
-        int index=-1;
-        for(int i=0;i<21;i++){
-            MultipartFile file = request.getFile("file"+i);
-            if(file!=null){
-                files.add(file);
-                if(index<0){
-                    index=i;
-                }
-            }
-        }
-        //没有上传，当做重复上传
-        if(files.size() == 0){
-            return  new RESTfulResult("201","请勿重复上传！","请勿重复上传！");
-        }
-        //上传图片,拼接在一个url里
-        Map<String,Object> mapValue=new HashMap<>();
-        String url="";
-        try{
-            //如果存在预览图片，查询，把那个位置的图片截取下来
-            if(index > 0){
-                String[] arrivalPhoto=otmsFeign.getArrivalPhoto(orderNumber).split(";");
-                for(int i=0;i<index;i++){
-                    url=url+arrivalPhoto[i]+";";
-                }
-            }
-        }catch (Exception e){
-
-        }
-        //上传图片
-        for (int i=0;i<files.size();i++){
-            MultipartFile file=files.get(i);
-            url += imageFileUtils.updateFile(file,i)+';';
-        }
-        mapValue.put("url",url);
-        mapValue.put("arrivalTime",arrivalTime);
-        return otmsFeign.addtmstruckArrivalResult(mapValue,orderNumber,resultArrivalAddress,url);
-    }
-
-    @ApiOperation(value = "新增签收")
-    @PostMapping(value = "/addTmstruckReceiptResult")
-    public synchronized RESTfulResult addTmstruckReceiptResult(MultipartRequest request, Integer num, String orderNumber, String resultArrivalAddress, Integer imgcount3, Integer imgcount4) throws Exception {
-        //添加到files数组
-        List<MultipartFile> files = new ArrayList<>();
-        for(int i=0;i<21;i++){
-            MultipartFile file = request.getFile("file"+i);
-            if(file!=null){
-                files.add(file);
-            }else{
-                break;
-            }
-        }
-        if(files.size()<2){
-            return  new RESTfulResult("201","至少上传两张图片！","至少上传两张图片！");
-        }
-        //上传图片,拼接在一个url里
-        Map<String,Object> mapValue=new HashMap<>();
-        String url="";
-        for (int i=0;i<files.size();i++){
-            MultipartFile file=files.get(i);
-            url += imageFileUtils.updateFile(file,i)+';';
-        }
-        mapValue.put("url",url);
-        return otmsFeign.addTmstruckReceiptResult(mapValue,orderNumber,resultArrivalAddress);
-    }
-
-    @ApiOperation(value = "新增签收网页端")
-    @PostMapping(value = "/addTmstruckReceiptResultForWeb")
-    public synchronized RESTfulResult addTmstruckReceiptResultForWeb(MultipartRequest request,Long receiptTime, String orderNumber, String resultArrivalAddress) throws Exception {
-        //添加到files数组
-        List<MultipartFile> files = new ArrayList<>();
-        int index=-1;
-        for(int i=0;i<21;i++){
-            MultipartFile file = request.getFile("file"+i);
-            if(file!=null){
-                files.add(file);
-                if(index<0){
-                    index=i;
-                }
-            }
-        }
-        //没有上传，当做重复上传
-        if(files.size() == 0){
-            return  new RESTfulResult("201","若要重复上传，必须两张都是新图片！","请勿重复上传！");
-        }
-        //上传图片,拼接在一个url里
-        Map<String,Object> mapValue=new HashMap<>();
-        String url="";
-        try{
-            //如果存在预览图片，查询，把那个位置的图片截取下来
-            if(index > 0){
-                String[] receivePhoto=otmsFeign.getReceivingPhotoByUrl(orderNumber).split(";");
-                for(int i=0;i<index;i++){
-                    url=url+receivePhoto[i]+";";
-                }
-            }
-        }catch (Exception e){
-
-        }
-        //上传图片
-        for (int i=0;i<files.size();i++){
-            MultipartFile file=files.get(i);
-            url += imageFileUtils.updateFile(file,i)+';';
-        }
-        mapValue.put("url",url);
-        mapValue.put("receiptTime",receiptTime);
-        return otmsFeign.addTmstruckReceiptResult(mapValue,orderNumber,resultArrivalAddress);
-    }
-
-    @ApiOperation(value="查询当前报警类型")
-    @PostMapping(value = "/selectWarnSwitch")
-    public RESTfulResult selectWarnSwitch(){
-        return otmsFeign.selectWarnSwitch();
-    }
-
-
-    @ApiOperation(value="是否开启运输报警状态")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "warnSwitch", value = "运输报警状态", required = false, dataType = "String")
-    })
-    @PostMapping(value = "/inTransitWarn")
-    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio){
-        return otmsFeign.inTransitWarn(warnSwitch,radio);
-    }
-
-    @ApiOperation(value="获得异常信息")
-    @PostMapping("/getTransportAbnormalInfo")
-    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
-                                                  @RequestParam(name = "pageNum") Integer pageNum,
-                                                  @RequestParam(name = "orderNumbers") String orderNumbers,
-                                                  @RequestParam(name = "pageSize") Integer pageSize){
-        mapValue=mapValue!=null?mapValue:new HashMap<>();
-        mapValue.put("orderNumbers",orderNumbers);
-        return otmsFeign.getTransportAbnormalInfo(mapValue,apiId,pageNum,pageSize);
-    }
-
-    @ApiOperation(value="车牌号和时间查询路径")
-    @PostMapping("/fullPathVisualizationByCarNumber")
-    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue) throws Exception{
-        return otmsFeign.fullPathVisualizationByCarNumber(mapValue);
-    }
-
-    @ApiOperation("厂外抵达作业")
-    @PostMapping("/getArrivalResult")
-    public Map<String,Object> getArrivalResult(@RequestBody(required = false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               String con,
-                                               String startTime,
-                                               String endTime){
-        return otmsFeign.getArrivalResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
-    }
-
-    @ApiOperation("查询抵达图片")
-    @PostMapping("/getArrivalPhoto")
-    public List<String> getArrivalPhoto(@RequestParam String orderNumber) throws Exception{
-        try{
-            String arrivalPhoto=otmsFeign.getArrivalPhoto(orderNumber);
-            return getPhotoByUrl(arrivalPhoto);
-        }catch (Exception e){
-            return null;
-        }
-    }
-
-    @ApiOperation("厂外抵达作业")
-    @PostMapping("/getReceiptResult")
-    public Map<String,Object> getReceiptResult(@RequestBody(required = false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               String con,
-                                               String startTime,
-                                               String endTime){
-        return otmsFeign.getReceiptResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
-    }
-
-    @ApiOperation("查询签收图片")
-    @PostMapping("/getReceivingPhotoByUrl")
-    public List<String> getReceivingPhotoByUrl(@RequestParam String orderNumber) throws Exception {
-        try{
-            String receivePhoto=otmsFeign.getReceivingPhotoByUrl(orderNumber);
-            return getPhotoByUrl(receivePhoto);
-        }catch (Exception e){
-            return null;
-        }
-    }
-
-    //切割字符串，下载图片并返回
-    private List<String> getPhotoByUrl(String urls) throws Exception {
-        List<String> results=new ArrayList<>();
-        String files[]=urls.split(";");
-        for(int i=0;i<files.length && files[i].length()>5;i++){
-            results.add((String)imageFileUtils.downloadFile(files[i]));
-        }
-        return results;
-    }
-
-    @GetMapping("/getCurrentLocation")
-    public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception{
-        return otmsFeign.getCurrentLocation(capcityNumber);
-    }
-    //获取地图顶点
-    @GetMapping(value = "/mapvertexs/findAllAvailableVertex")
-    public RESTfulResult findAllAvailableVertex(){
-        return  otmsFeign.findAllAvailableVertex();
-    }
-
-    //获取最佳路径
-    @GetMapping(value = "/mapvertexs/getObtainTheOptimalPath")
-    public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) throws Exception{
-        return otmsFeign.getObtainTheOptimalPath(startPoint,endPoint);
-    }
-
-    @ApiOperation(value="获取当前订单导航路径")
-    @GetMapping(value = "/mapvertexs/getPathByOrderID")
-    public RESTfulResult getPathByOrderID(@RequestParam("orderId") String orderId,@RequestParam("startStep")  String startStep,@RequestParam("endStep")  String endStep) throws  Exception {
-       return otmsFeign.getPathByOrderID(orderId,startStep,endStep);
-    }
-
-    @ApiOperation(value="查询所有可选地点")
-    @GetMapping(value = "/mapvertexs/findSelections")
-    public RESTfulResult findSelections(){
-        return otmsFeign.findSelections();
-    }
-
-    @ApiOperation(value="查询点")
-    @PostMapping(value = "/getMapVertex")
-    public RESTfulResult getMapVertex(@RequestBody Map<String,Object> map,
-                                      @RequestParam Integer apiId,
-                                      @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return otmsFeign.getMapVertex(map,apiId,pageNum,pageSize);
-    }
-
-    @ApiOperation(value="查询边")
-    @PostMapping(value = "/getMapEdge")
-    public RESTfulResult getMapEdge(@RequestBody Map<String,Object> map,
-                                    @RequestParam Integer apiId,
-                                    @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return otmsFeign.getMapEdge(map,apiId,pageNum,pageSize);
-    }
-
-    @ApiOperation(value="新增点")
-    @PostMapping(value = "/addMapVertex")
-    public RESTfulResult addMapVertex(@RequestBody Map<String,Object> map){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return otmsFeign.addMapVertex(map);
-    }
-
-    @ApiOperation(value="新增边")
-    @PostMapping(value = "/addMapEdge")
-    public RESTfulResult addMapEdge(@RequestBody Map<String,Object> map){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return otmsFeign.addMapEdge(map);
-    }
-
-    @ApiOperation(value="删除点")
-    @PostMapping(value = "/delMapVertex")
-    public RESTfulResult delMapVertex(@RequestBody Map<String,Object> map){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return otmsFeign.delMapVertex(map);
-    }
-
-    @ApiOperation(value="删除边")
-    @PostMapping(value = "/delMapEdge")
-    public RESTfulResult delMapEdge(@RequestBody Map<String,Object> map){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return otmsFeign.delMapEdge(map);
-    }
-
-    //在途订单列表
-    @PostMapping("/transportationPerformance")
-    public RESTfulResult transportationPerformance(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                   @RequestParam(required = true,defaultValue = "479",name = "apiId")Integer apiId,
-                                                   @RequestParam(required = false,name = "pageNum")Integer pageNum,
-                                                   @RequestParam(required = false,name = "pageSize")Integer pageSize){
-        return otmsFeign.transportationPerformance(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
-    }
-
-    @GetMapping("/getLocationForAddress")
-    public RESTfulResult getLocationForAddress(@RequestParam("address") String address){
-        return otmsFeign.getLocationForAddress(address);
-    }
-
-    @PostMapping("/getAddress")
-    public RESTfulResult getAddress(@RequestBody Map<String,Object> map){
-        return otmsFeign.getAddress(map);
-    }
-}

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

@@ -1,472 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.feign.QmsFeign;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author luobang
- * @create 2021-09-17 14:09
- */
-@RestController
-@RequestMapping("${api.version}/qms")
-public class QMSController extends BaseRESTfulController {
-
-    @Autowired
-    private QmsFeign qmsFeign;
-
-    @ApiOperation(value="触发电子围栏-->新增排队实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
-    })
-    @PostMapping("/addQueueResult")
-    public Map<String, Object> addQueueResult(String vno){
-        return qmsFeign.addQueueResult(vno);
-    }
-
-    @ApiOperation(value="指令接收-->新增排队链表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
-    })
-    @PostMapping("/addQueueList")
-    public Map<String, Object> addQueueList(String resultId){
-        return qmsFeign.addQueueList(resultId);
-    }
-
-    @ApiOperation(value="指令接收")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(130)", 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("/orderReceive")
-    public Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer queueType,
-                                            String con
-    ){
-        return qmsFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, queueType,con);
-    }
-
-
-    @ApiOperation(value="查询排队申请")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(125)", 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("/getQueueApply")
-    public Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             String con
-    ){
-        return qmsFeign.getQueueApply(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
-    }
-
-
-    @ApiOperation(value="查询排队开始")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(128)", 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("/getQueueListByQueueUp")
-    public Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     Integer locationId,
-                                                     String capacityNumber,
-                                                     Integer isSpelling
-    ){
-        return qmsFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, locationId,capacityNumber, isSpelling);
-    }
-
-    @ApiOperation(value="查询排队转移")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(124)", 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("/getChangeQueue")
-    public Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              String con
-    ){
-        return qmsFeign.getChangeQueue(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="查询排队取消")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(131)", 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("/getQueueCancel")
-    public Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              String con
-    ){
-        return qmsFeign.getQueueCancel(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="修改排队取消实绩：时间、原因")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
-    })
-    @PostMapping("/updateQueueCancel")
-    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue){
-        return qmsFeign.updateQueueCancel(mapValue);
-    }
-
-    @ApiOperation(value="排队取消-->修改排队链表deleted为1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
-    })
-    @PostMapping("/queueCancel")
-    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsFeign.queueCancel(mapValue);
-    }
-
-
-    @ApiOperation(value="排队插队-->修改排队链表顺序号为最小")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
-    })
-    @PostMapping("/queueCutInLine")
-    public Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsFeign.queueCutInLine(mapValue);
-    }
-
-
-    @ApiOperation(value="查询排队插队")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(132)", 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("/getQueueInsert")
-    public Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              String con
-    ){
-        return qmsFeign.getQueueInsert(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="查询排队结束")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(133)", 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("/getQueueEndResult")
-    public Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 String con
-    ){
-        return qmsFeign.getQueueEndResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="链表监控")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(134)", 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("/listMonitor")
-    public Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           Integer isSpelling
-    ){return qmsFeign.listMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,isSpelling);
-    }
-
-    @ApiOperation(value="通过车牌号查询司机接单")
-    @PostMapping("/getOrderReceive/{capacityNumber}")
-    public Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber){
-        return qmsFeign.getOrderReceive(capacityNumber);
-    }
-
-    @ApiOperation(value="通过车牌号取消排队")
-    @PostMapping("/cancelQueue")
-    public Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue){
-        return qmsFeign.cancelQueue(mapValue);
-    }
-
-    @ApiOperation(value="钢材科允许进厂")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
-    })
-    @PostMapping("/allowEnFactory")
-    public Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsFeign.allowEnFactory(mapValue);
-    }
-
-    @PostMapping("/modifyLoadWarehouse")
-    public Map<String, Object> modifyLoadWarehouse(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsFeign.modifyLoadWarehouse(mapValue);
-    }
-
-    @ApiOperation(value="APP端司机查看排队信息")
-    @GetMapping("getQueueResultByTotalId")
-    public Map<String, Object> getQueueResultByTotalId(String resultTotalId){
-        return  qmsFeign.getQueueResultByTotalId(resultTotalId);
-    }
-
-
-    @ApiOperation(value="单拼链表查看详情")
-    @PostMapping("/getListMonitorMes")
-    public Map<String, Object> getListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue){
-        return qmsFeign.getListMonitorMes(mapValue);
-    }
-
-    @ApiOperation(value="多拼链表查看详情")
-    @PostMapping("/getSpellingListMonitorMes")
-    public Map<String, Object> getSpellingListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue){
-        return qmsFeign.getSpellingListMonitorMes(mapValue);
-    }
-
-
-    @ApiOperation(value="排队结束-->修改deleted = 1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
-    })
-    @PostMapping("/queueEndByPDA")
-    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsFeign.queueEnd(mapValue);
-    }
-
-    @ApiOperation(value = "判断车辆有没有在圆心里面")
-    @PostMapping("/isInCircle")
-    public Map<String,Object> isInCircle(String longitude,
-                                         String latitude,
-                                         String capacityNo){
-        return qmsFeign.isInCircle(longitude,latitude,capacityNo);
-    }
-
-    @ApiOperation(value = "撤销进厂确认")
-    @PostMapping("/ctrlZQueueAllow")
-    public Map<String,Object> ctrlZQueueAllow(@RequestBody(required = false) Map<String,Object> map){
-        return qmsFeign.ctrlZQueueAllow(map);
-    }
-
-    @PostMapping("/getStoreQueueList")
-    public Map<String, Object> getStoreQueueList(){
-        return qmsFeign.getStoreQueueList();
-    }
-
-
-
-//    @ApiOperation(value="查询进厂排队详情")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-//            @ApiImplicitParam(name = "apiId(184)", value = "动态表头", required = false, dataType = "Integer"),
-//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-//    })
-//    @PostMapping("/getAllQueueMes")
-//    public Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                              Integer apiId,
-//                                              Integer pageNum,
-//                                              Integer pageSize,
-//                                              Integer gatepostId,
-//                                              String con
-//    ){
-//        return qmsFeign.getAllQueueMes(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, gatepostId,con);
-//    }
-
-//    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗名称、转移原因")
-//    @PostMapping("/changeQueue")
-//    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
-//        return qmsFeign.changeQueue(mapValue);
-//    }
-
-
-
-
-//    @ApiOperation(value="通过Id查询排队取消实绩")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
-//    })
-//    @PostMapping("/getQueueCancelByResultId/{resultId}")
-//    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
-//        return qmsFeign.getQueueCancelByResultId(resultId);
-//    }
-
-
-
-//    @ApiOperation(value="汽车监控")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-//            @ApiImplicitParam(name = "apiId(135)", 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("/capacityMonitor")
-//    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                               Integer apiId,
-//                                               Integer pageNum,
-//                                               Integer pageSize,
-//                                               Integer gridType,
-//                                               String con
-//    ){
-//        return qmsFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize, gridType,con);
-//    }
-
-
-
-
-//    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
-//    @PostMapping("/getQueueStatusList")
-//    public Map<String, Object> getQueueStatusList(){
-//        return qmsFeign.getQueueStatusList();
-//    }
-
-
-
-//    @ApiOperation(value="查询执行中订单")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-//            @ApiImplicitParam(name = "apiId(156)", 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("/getAllExecutionOrder")
-//    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                                    Integer apiId,
-//                                                    Integer pageNum,
-//                                                    Integer pageSize,
-//                                                    Integer orderType,
-//                                                    Integer status,
-//                                                    String con
-//    ){
-//        return qmsFeign.getAllExecutionOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, status,con);
-//    }
-
-//    @ApiOperation(value="查询某一个门岗的排队详情")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
-//    })
-//    @PostMapping("/getListQueueMes")
-//    public RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue){
-//        return qmsFeign.getListQueueMes(mapValue);
-//    }
-
-
-//    @ApiOperation(value="查询仓库排队详情")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-//            @ApiImplicitParam(name = "apiId(187)", value = "动态表头", required = false, dataType = "Integer"),
-//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-//    })
-//    @PostMapping("/getWarehouseQueueApply")
-//    public Map<String, Object> getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                                      Integer apiId,
-//                                                      Integer pageNum,
-//                                                      Integer pageSize,
-//                                                      Integer platformId,
-//                                                      String con
-//    ){return qmsFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
-//    }
-//    @ApiOperation(value="查询仓库排队转移")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-//            @ApiImplicitParam(name = "apiId(193)", value = "动态表头", required = false, dataType = "Integer"),
-//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-//    })
-//    @PostMapping("/getWarehouseQueueChange")
-//    public Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                                       Integer apiId,
-//                                                       Integer pageNum,
-//                                                       Integer pageSize,
-//
-//                                                       String con
-//    ){return qmsFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
-//    }
-
-
-//    @ApiOperation(value="查询仓库排队结束")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-//            @ApiImplicitParam(name = "apiId(194)", value = "动态表头", required = false, dataType = "Integer"),
-//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-//    })
-//    @PostMapping("/getWarehouseQueueEndMes")
-//    public Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                                       Integer apiId,
-//                                                       Integer pageNum,
-//                                                       Integer pageSize,
-//                                                       String con
-//    ){return qmsFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
-//    }
-    @ApiOperation(value="查看所有物资")
-    @GetMapping("/getAllModel")
-    public Map<String, Object>  getAllModel(String index){
-        return qmsFeign.getAllModel(index);
-    }
-
-    @ApiOperation(value="查看所有未轧物资")
-    @GetMapping("/getAllModelUnrolled")
-    public Map<String, Object>  getAllModelUnrolled(String index){
-        return qmsFeign.getAllModelUnrolled(index);
-    }
-
-    @ApiOperation(value="添加未轧物资")
-    @PostMapping("/addModel")
-    public Map<String, Object> addModel(@RequestBody(required=false) Map<String,Object> mapValue){
-        return qmsFeign.addModel(mapValue);
-    }
-
-    @ApiOperation(value="修改未轧物资")
-    @PostMapping("/updateModel")
-    public Map<String, Object> updateModel(@RequestBody(required=false) Map<String,Object> mapValue){
-        return qmsFeign.updateModel(mapValue);
-    }
-
-    @ApiOperation(value="删除未轧物资")
-    @PostMapping("/deleteModel")
-    public Map<String, Object> deleteModel(@RequestBody(required=false) Map<String,Object> mapValue){
-        return qmsFeign.deleteModel(mapValue);
-    }
-}

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

@@ -1,34 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.service.RmsReceivingCompanyService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author xiaosh
- */
-@RestController
-@RequestMapping("${api.version}/rmsReceivingCompany")
-public class RmsReceivingCompanyController {
-
-    @Resource(name = "rmsReceivingCompanyService1")
-    private RmsReceivingCompanyService rmsReceivingCompanyService;
-
-    @ApiOperation(value = "查询收款客户")
-    @PostMapping("/name")
-    public List<String> queryRmsReceivingCompanyName(){
-        return rmsReceivingCompanyService.queryRmsReceivingCompanyName();
-    }
-
-    @ApiOperation(value = "查询收款客户")
-    @PostMapping("/map")
-    public List<Map<String, Object>> queryRmsReceivingCompanyMap(){
-        return rmsReceivingCompanyService.queryRmsReceivingCompanyMap();
-    }
-    }

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

@@ -1,9 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.config.ImageFileUtils;
-import com.steerinfo.dil.feign.TmsshipFeign;
-import com.steerinfo.dil.feign.TmsTrainFeign;
-import com.steerinfo.dil.feign.TmsTruckFeign;
+import com.steerinfo.dil.feign.TmsFeign;
 import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -29,2828 +27,7 @@ import java.util.concurrent.Callable;
 @RequestMapping("${api.version}/tms")
 public class TMSController extends BaseRESTfulController {
     @Autowired
-    private TmsTruckFeign tmsTruckFeign;
-    @Autowired
-    private TmsTrainFeign tmsTrainFeign;
-    @Autowired
-    TmsshipFeign tmsshipFeign;
-    @Autowired
-    UniversalMapper universalMapper;
-    @Autowired
-    private ImageFileUtils imageFileUtils;
-    /*======================================船运==========================================*/
-
-    /**
-     * 驳船
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getBargeOperationList")
-    @ApiOperation(value = "展示驳船")
-    public Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.getBargeOperationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
-    }
-
-    @PostMapping("selectBargeOperation/{bargeOperationId}")
-    @ApiOperation(value = "通过id查询驳船")
-    Map<String, Object> selectBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId) {
-        return tmsshipFeign.selectBargeOperation(bargeOperationId);
-    }
-
-    @PostMapping("getBargeOperation/{bargeOperationId}")
-    @ApiOperation(value = "查询驳船")
-    Map<String, Object> getBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId) {
-        return tmsshipFeign.getBargeOperation(bargeOperationId);
-    }
-
-    @PostMapping("deleteBargeOperation/{bargeOperationId}")
-    @ApiOperation(value = "逻辑删除驳船")
-    Map<String, Object> deleteBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId) {
-        return tmsshipFeign.deleteBargeOperation(bargeOperationId);
-    }
-
-    @PostMapping("updateBargeOperation")
-    @ApiOperation(value = "修改驳船")
-    Map<String, Object> updateBargeOperation(@RequestBody Map<String, Object> tmsshipBargeOperation) {
-        return tmsshipFeign.updateBargeOperation(tmsshipBargeOperation);
-    }
-
-    @PostMapping("addBargeOperation")
-    @ApiOperation(value = "新增驳船")
-    Map<String, Object> addBargeOperation(@RequestBody Map<String, Object> map) {
-        return tmsshipFeign.addBargeOperation(map);
-    }
-
-    @PostMapping("addTmsShipEntryWharyResult")
-    @ApiOperation(value = "新增抵港")
-    Map<String, Object> addTmsShipEntryWharyResult(@RequestBody Map<String, Object> mapVal) {
-        return tmsshipFeign.addTmsShipEntryWharyResult(mapVal);
-    }
-
-    @PostMapping("addTmsShipOutWharyResult")
-    @ApiOperation(value = "新增离港")
-    Map<String, Object> addTmsShipOutWharyResult(@RequestBody Map<String, Object> mapVal) {
-        return tmsshipFeign.addTmsShipOutWharyResult(mapVal);
-    }
-
-    /**
-     * 装船
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getLoadShipList")
-    @ApiOperation(value = "展示装船")
-    public Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer apiId,
-                                               Integer status,
-                                               @RequestParam(required = false) String con,
-                                               String startTime,
-                                               String endTime) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con,startTime,endTime);
-    }
-
-    @PostMapping("getLoadShip/{resultId}")
-    @ApiOperation(value = "查询装船")
-    Map<String, Object> getLoadShip(@PathVariable("resultId") BigDecimal resultId) {
-        return tmsshipFeign.getLoadShip(resultId);
-    }
-
-    @PostMapping("selectLoadShip/{resultId}")
-    @ApiOperation(value = "通过id查询装船")
-    Map<String, Object> selectLoadShip(@PathVariable("resultId") BigDecimal resultId) {
-        return tmsshipFeign.selectLoadShip(resultId);
-    }
-
-    @PostMapping("deleteLoadShip/{resultId}")
-    @ApiOperation(value = "逻辑删除装船")
-    Map<String, Object> deleteLoadShip(@PathVariable("resultId") BigDecimal resultId) {
-        return tmsshipFeign.deleteLoadShip(resultId);
-    }
-
-    @PostMapping("updateLoadShip")
-    @ApiOperation(value = "修改装船")
-    Map<String, Object> updateLoadShip(@RequestBody Map<String, Object> tmsshipLoadShipResult) {
-        return tmsshipFeign.updateLoadShip(tmsshipLoadShipResult);
-    }
-
-    @PostMapping("addLoadShip")
-    @ApiOperation(value = "新增装船")
-    Map<String, Object> addLoadShip(@RequestBody Map<String, Object> map) {
-        return tmsshipFeign.addLoadShip(map);
-    }
-
-    /**
-     * 位置作业
-     *
-     * @param mapValue
-     * @return
-     */
-    @PostMapping("getShipLocationList")
-    @ApiOperation(value = "展示位置作业")
-    public Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   String con
-                                                   ) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.getShipLocationList(mapValue==null?new HashMap<>():mapValue,con);
-    }
-
-    @PostMapping("getShipLocation/{locationId}")
-    @ApiOperation(value = "查询位置作业")
-    Map<String, Object> getShipLocation(@PathVariable("locationId") BigDecimal locationId) {
-        return tmsshipFeign.getShipLocation(locationId);
-    }
-
-    @PostMapping("/getWareHouseOutresult/{resultId}")
-    @ApiOperation(value = "查询港口出库")
-    Map<String, Object> getWareHouseOutresult(@PathVariable("resultId") BigDecimal resultId) {
-        return tmsTrainFeign.getWareHouseOutresult(resultId);
-    }
-
-    @PostMapping("selectShipLocation/{locationId}")
-    @ApiOperation(value = "通过id查询位置作业")
-    Map<String, Object> selectShipLocation(@PathVariable("locationId") BigDecimal locationId) {
-        return tmsshipFeign.selectShipLocation(locationId);
-    }
-
-    @PostMapping("deleteShipLocation/{locationId}")
-    @ApiOperation(value = "逻辑删除位置作业")
-    Map<String, Object> deleteShipLocation(@PathVariable("locationId") BigDecimal locationId) {
-        return tmsshipFeign.deleteShipLocation(locationId);
-    }
-
-    @PostMapping("updateShipLocation")
-    @ApiOperation(value = "修改位置作业")
-    Map<String, Object> updateShipLocation(@RequestBody Map<String, Object> tmsshipShipLocation) {
-        return tmsshipFeign.updateShipLocation(tmsshipShipLocation);
-    }
-
-    @PostMapping("addShipLocation")
-    @ApiOperation(value = "新增位置作业")
-    Map<String, Object> addShipLocation(@RequestBody Map<String, Object> map) {
-        return tmsshipFeign.addShipLocation(map);
-    }
-
-    /**
-     * 水路货物运单
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("listAllOrders")
-    @ApiOperation(value = "展示水路货物运单")
-    public Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             Integer apiId,
-                                             String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
-    }
-
-
-    @PostMapping("/getBatchList")
-    public Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer apiId){
-        return  tmsshipFeign.getBatchList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
-    }
-
-
-    //为提货委托查询批次
-    @PostMapping("/getBatchListForAttorney")
-    public Map<String, Object> getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer apiId,
-                                          String con){
-        return  tmsshipFeign.getBatchListForAttorney(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    //为装船指令查询批次
-    @PostMapping("/getBatchListForInstruction")
-    public Map<String, Object> getBatchListForInstruction(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-                                                       Integer apiId,
-                                                       String con){
-        return  tmsshipFeign.getBatchListForInstruction(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
-    }
-
-
-    //框计算计算货权转移中出现的批次
-    @PostMapping("/getBatchIdByForeign")
-    public Map<String, Object> getBatchIdByForeign(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-                                                       Integer apiId,
-                                                       String con){
-        return  tmsshipFeign.getBatchIdByForeign(mapValue==null?new HashMap<String, Object>():mapValue, pageNum, pageSize, apiId, con);
-    }
-
-
-
-    /**
-     * 展示船只信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getCapacityList")
-    @ApiOperation(value = "展示船只信息")
-    public Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer apiId,
-                                               String con) {
-        return tmsshipFeign.getCapacityList(mapValue==null?new HashMap<String, Object>():mapValue,pageNum, pageSize, apiId,con);
-    }
-
-
-    @PostMapping(value = "/uploadCargoPic")
-    public String uploadCargoPic(@RequestParam ("file") MultipartFile multipartFile){
-        return tmsshipFeign.uploadCargoPic(multipartFile);
-    }
-
-    /**
-     * 卸船作业
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getUnLoadShipList")
-    @ApiOperation(value = "展示卸船作业信息列表")
-    public Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 Integer apiId,
-                                                 String con) {
-
-        return tmsshipFeign.getUnLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
-    }
-
-    @PostMapping("getUnloadShip/{resultId}")
-    @ApiOperation(value = "查询卸船作业")
-    Map<String, Object> getUnloadShip(@PathVariable("resultId") BigDecimal resultId) {
-        return tmsshipFeign.getUnloadShip(resultId);
-    }
-
-    @PostMapping("selectUnLoadShip/{resultId}")
-    @ApiOperation(value = "通过id查询卸船作业")
-    Map<String, Object> selectUnLoadShip(@PathVariable("resultId") BigDecimal resultId) {
-        return tmsshipFeign.selectUnLoadShip(resultId);
-    }
-
-    @PostMapping("deleteUnLoadShip/{resultId}")
-    @ApiOperation(value = "逻辑删除卸船作业")
-    Map<String, Object> deleteUnLoadShip(@PathVariable("resultId") BigDecimal resultId) {
-        return tmsshipFeign.deleteUnLoadShip(resultId);
-    }
-
-    @PostMapping("updateUnLoadShip")
-    @ApiOperation(value = "修改卸船作业")
-    Map<String, Object> updateUnLoadShip(@RequestBody Map<String, Object> tmsshipUnloadShipResult) {
-        return tmsshipFeign.updateUnLoadShip(tmsshipUnloadShipResult);
-    }
-
-    @PostMapping("addUnLoadShip")
-    @ApiOperation(value = "新增卸船作业")
-    Map<String, Object> addUnLoadShip(@RequestBody Map<String, Object> map) {
-        return tmsshipFeign.addUnLoadShip(map);
-    }
-
-    /**
-     * 水分质检
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getWaterQualityResultList")
-    @ApiOperation(value = "展示水分质检信息列表")
-    public Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                         Integer pageNum,
-                                                         Integer pageSize,
-                                                         Integer apiId,
-                                                         @RequestParam(required = false) String con) {
-
-        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    @PostMapping("getWaterQuality/{resultId}")
-    @ApiOperation(value = "查询水分质检")
-    Map<String, Object> getWaterQuality(@PathVariable("resultId") BigDecimal resultId) {
-        return tmsshipFeign.getWaterQuality(resultId);
-    }
-
-    @PostMapping("selectWaterQualityResult/{resultId}")
-    @ApiOperation(value = "通过id查询水分质检")
-    Map<String, Object> selectWaterQualityResult(@PathVariable("resultId") BigDecimal resultId) {
-        return tmsshipFeign.selectWaterQualityResult(resultId);
-    }
-
-    @PostMapping("deleteWaterQualityResult/{resultId}")
-    @ApiOperation(value = "逻辑删除水分质检")
-    Map<String, Object> deleteWaterQualityResult(@PathVariable("resultId") BigDecimal resultId) {
-        return tmsshipFeign.deleteWaterQualityResult(resultId);
-    }
-
-    @PostMapping("updateWaterQualityResult")
-    @ApiOperation(value = "修改水分质检")
-    Map<String, Object> updateWaterQualityResult(@RequestBody Map<String, Object> tmsshipWaterQualityResult) {
-        return tmsshipFeign.updateWaterQualityResult(tmsshipWaterQualityResult);
-    }
-
-    @PostMapping("addWaterQualityResult")
-    @ApiOperation(value = "新增水分质检")
-    Map<String, Object> addWaterQualityResult(@RequestBody Map<String, Object> map) {
-        Map<String, Object> stringObjectMap = tmsshipFeign.addWaterQualityResult(map);
-        return stringObjectMap;
-    }
-
-    /**
-     * 船只信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getCapacities")
-    @ApiOperation(value = "展示船只信息列表")
-    public Map<String, Object> getCapacities(BigDecimal instructionsId,
-                                             @RequestBody(required = false) Map<String, Object> mapValue,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.getCapacities(instructionsId, mapValue, pageNum, pageSize, apiId);
-    }
-
-    @PostMapping("getInstructionsCapacity/{instructionsCapacityId}")
-    @ApiOperation(value = "查询船只信息")
-    Map<String, Object> getInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId) {
-        return tmsshipFeign.getInstructionsCapacity(instructionsCapacityId);
-    }
-
-    @PostMapping("deleteInstructionsCapacity/{instructionsCapacityId}")
-    @ApiOperation(value = "逻辑删除船只信息")
-    Map<String, Object> deleteInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId) {
-        return tmsshipFeign.deleteInstructionsCapacity(instructionsCapacityId);
-    }
-
-    @PostMapping("updateInstructionsCapacity")
-    @ApiOperation(value = "修改船只信息")
-    Map<String, Object> updateInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity) {
-        return tmsshipFeign.updateInstructionsCapacity(omsshipInstructionsCapacity);
-    }
-
-    @PostMapping("addInstructionsCapacity")
-    @ApiOperation(value = "新增船只信息")
-    Map<String, Object> addInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity) {
-        return tmsshipFeign.addInstructionsCapacity(omsshipInstructionsCapacity);
-    }
-
-    /**
-     * 装船指令
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getShipMentInstructionsList")
-    @ApiOperation(value = "展示装船指令列表")
-    public Map<String, Object> getShipMentInstructionsList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           Integer apiId,
-                                                           String status,
-                                                           String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
-    }
-
-    @PostMapping("getShipmentInstructions/{instructionsId}")
-    @ApiOperation(value = "下发装船指令")
-    Map<String, Object> getShipmentInstructions(@PathVariable("instructionsId") BigDecimal instructionsId) {
-        return tmsshipFeign.getShipmentInstructions(instructionsId);
-    }
-
-    @PostMapping("deleteByPrimaryKey/{instructionsId}")
-    @ApiOperation(value = "逻辑删除装船指令")
-    Map<String, Object> deleteByPrimaryKey(@PathVariable("instructionsId") BigDecimal instructionsId) {
-        return tmsshipFeign.deleteByPrimaryKey(instructionsId);
-    }
-
-    @PostMapping("sendShipmentInstructionsStatus/{shipmentInstructionsId}")
-    @ApiOperation(value = "修改状态")
-    Map<String, Object> sendShipmentInstructionsStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId) {
-        return tmsshipFeign.sendShipmentInstructionsStatus(shipmentInstructionsId);
-    }
-
-    @PostMapping("updateShipmentInstructions")
-    @ApiOperation(value = "修改装船指令")
-    Map<String, Object> updateShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions) {
-        return tmsshipFeign.updateShipmentInstructions(omsshipShipmentInstructions);
-    }
-
-    @PostMapping("addShipmentInstructions")
-    @ApiOperation(value = "新增装船指令")
-    Map<String, Object> addShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions) {
-        return tmsshipFeign.addShipmentInstructions(omsshipShipmentInstructions);
-    }
-
-    /**
-     * 货权转移
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getAmsshipCargoTranferResultList")
-    @ApiOperation(value = "展示货权转移")
-    public Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                                Integer pageNum,
-                                                                Integer pageSize,
-                                                                Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
-    }
-    @PostMapping("getGroupList")
-    @ApiOperation(value = "展示收货人列表")
-    @ApiImplicitParams(
-            @ApiImplicitParam(name="apiId",value="217")
-    )
-    public Map<String, Object> getGroupList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                                Integer pageNum,
-                                                                Integer pageSize,
-                                                                Integer apiId,
-                                                                String con) {
-
-        return tmsshipFeign.getGroupList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
-    }
-    @PostMapping("getMaterialList")
-    @ApiOperation(value = "展示物资列表")
-    @ApiImplicitParams(
-            @ApiImplicitParam(name="apiId",value="216")
-    )
-    public Map<String, Object> getMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer apiId,
-                                            String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.getMaterialList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
-    }
-    @PostMapping("selectShippeByName")
-    @ApiOperation(value = "展示货权转移送达单位列表")
-    @ApiImplicitParams(
-            @ApiImplicitParam(name = "apiId",value = "215")
-    )
-    public Map<String, Object> selectShippeByName(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer apiId,
-                                               String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.selectShippeByName(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
-    }
-    @PostMapping("insertamsshipCargoTransferResult")
-    @ApiOperation(value = "新增货权转移")
-    Map<String, Object> insertamsshipCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult) {
-        return tmsshipFeign.insertamsshipCargoTransferResult(amsshipCargoTransferResult);
-    }
-
-    @PostMapping("deleteByCargoId/{cargoTransferResultId}")
-    @ApiOperation(value = "逻辑删除货权转移")
-    Map<String, Object> deleteByCargoId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId) {
-        return tmsshipFeign.deleteByCargoId(cargoTransferResultId);
-    }
-
-    @PostMapping("editCargoTransferResult")
-    @ApiOperation(value = "修改货权转移")
-    Map<String, Object> editCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult) {
-        return tmsshipFeign.editCargoTransferResult(amsshipCargoTransferResult);
-    }
-
-    @PostMapping("selectByCargoTranferResultId/{cargoTransferResultId}")
-    @ApiOperation(value = "通过id查询货权转移")
-    Map<String, Object> selectByCargoTranferResultId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId) {
-        return tmsshipFeign.selectByCargoTranferResultId(cargoTransferResultId);
-    }
-
-    /**
-     * 提货委托
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getAmsshipDeliveryAttroneyList")
-    @ApiOperation(value = "展示提货委托")
-    public Map<String, Object> getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                              Integer pageNum,
-                                                              Integer pageSize,
-                                                              Integer apiId,
-                                                              Integer status,
-                                                              String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
-    }
-
-    @PostMapping("insertshipDeliveryAttorney")
-    @ApiOperation(value = "新增提货委托")
-    Map<String, Object> insertshipDeliveryAttorney(@RequestBody Map<String, Object> map) {
-        return tmsshipFeign.insertshipDeliveryAttorney(map);
-    }
-
-    @PostMapping("deleteByAttorneyId/{attorneyId}")
-    @ApiOperation(value = "逻辑删除提货委托")
-    Map<String, Object> deleteByAttorneyId(@PathVariable("attorneyId") Integer attorneyId) {
-        return tmsshipFeign.deleteByAttorneyId(attorneyId);
-    }
-
-    @PostMapping("editDeliveryAttroney")
-    @ApiOperation(value = "修改提货委托")
-    Map<String, Object> editDeliveryAttroney(@RequestBody Map<String, Object> amsshipDeliveryAttorney) {
-        return tmsshipFeign.editDeliveryAttroney(amsshipDeliveryAttorney);
-    }
-
-    @PostMapping("getDeliveryAttorneyId/{attorneyId}")
-    @ApiOperation(value = "通过id查询提货委托")
-    Map<String, Object> getDeliveryAttorneyId(@PathVariable("attorneyId") Integer attorneyId) {
-        return tmsshipFeign.getDeliveryAttorneyId(attorneyId);
-    }
-
-    @PostMapping("sendDeliveryAttorneyStatus/{attorneyId}")
-    @ApiOperation(value = "下发提货委托")
-    Map<String, Object> sendDeliveryAttorneyStatus(@PathVariable("attorneyId") Integer attorneyId) {
-        return tmsshipFeign.sendDeliveryAttorneyStatus(attorneyId);
-    }
-
-    /**
-     * 放货通知
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getshipDeliveryNoticeList")
-    @ApiOperation(value = "展示放货通知")
-    public Map<String, Object> getshipDeliveryNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                         Integer pageNum,
-                                                         Integer pageSize,
-                                                         Integer apiId,
-                                                         Integer status,
-                                                         @RequestParam(required = false) String con,
-                                                         @RequestParam(required = false) String startTime,
-                                                         @RequestParam(required = false) String endTime) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con,startTime,endTime);
-    }
-
-    @PostMapping("insertDeliveryNotice")
-    @ApiOperation(value = "新增放货通知")
-    Map<String, Object> insertDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice) {
-        return tmsshipFeign.insertDeliveryNotice(amsshipDeliveryNotice);
-    }
-
-    @PostMapping("deleteByNoticeId/{noticeId}")
-    @ApiOperation(value = "逻辑删除放货通知")
-    Map<String, Object> deleteByNoticeId(@PathVariable("noticeId") Integer noticeId) {
-        return tmsshipFeign.deleteByNoticeId(noticeId);
-    }
-
-    @PostMapping("editDeliveryNotice")
-    @ApiOperation(value = "修改放货通知")
-    Map<String, Object> editDeliveryNotice(@RequestBody Map<String, Object> editDeliveryNotice) {
-        return tmsshipFeign.editDeliveryNotice(editDeliveryNotice);
-    }
-
-    @PostMapping("selectByNoticeId/{noticeId}")
-    @ApiOperation(value = "通过id查询放货通知")
-    Map<String, Object> selectByNoticeId(@PathVariable("noticeId") Integer noticeId) {
-        return tmsshipFeign.selectByNoticeId(noticeId);
-    }
-
-    @PostMapping("sendDeliveryNotice/{noticeId}")
-    @ApiOperation(value = "下发放货通知")
-    Map<String, Object> sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId) {
-        return tmsshipFeign.sendDeliveryNotice(noticeId);
-    }
-    //船舶动态表
-    @PostMapping("/selectAllShipDynamaics")
-    Map<String, Object> selectAllShipDynamaics(@RequestBody(required = false) Map<String,Object> map,
-                                               String con){
-        if (map==null){
-            map=new HashMap<>();
-        }
-        return tmsshipFeign.selectAllShipDynamaics(map,con);
-    }
-
-    //万州港装车数据
-    @PostMapping("/getLoadData")
-    Map<String, Object> getLoadData(@RequestBody(required = false) Map<String,Object> map){
-        if (map==null){
-            map=new HashMap<>();
-        }
-        return tmsshipFeign.getLoadData(map);
-    }
-
-    //万州港卸船数据
-    @PostMapping("/getUnloadData")
-    Map<String, Object> getUnloadData(@RequestBody(required = false) Map<String,Object> map){
-        if (map==null){
-            map=new HashMap<>();
-        }
-        return tmsshipFeign.getUnloadData(map);
-    }
-
-    //下游港口船舶动态表
-    @PostMapping("/getDownShipDynamaics")
-    Map<String, Object> getDownShipDynamaics(@RequestBody(required = false) Map<String,Object> map){
-        if (map==null){
-            map=new HashMap<>();
-        }
-        return tmsshipFeign.getDownShipDynamaics(map);
-    }
-
-    @PostMapping("getControlLines")
-    @ApiOperation(value = "查询控制线等闸")
-    Map<String, Object> getControlLines(@RequestBody Map<String, Object> map) {
-        return tmsshipFeign.getControlLines(map);
-    }
-
-    @PostMapping("updateControlLine")
-    @ApiOperation(value = "修改控制线等闸")
-    Map<String, Object> updateControlLine(@RequestBody Map<String, Object> map) {
-        return tmsshipFeign.updateControlLine(map);
-    }
-
-    @PostMapping("getControlLinesTable")
-    @ApiOperation(value = "控制线等闸表格")
-    Map<String, Object> getControlLinesTable(@RequestBody Map<String, Object> map) {
-        return tmsshipFeign.getControlLinesTable(map);
-    }
-
-    /**
-     * 下拉框
-     *
-     * @return
-     */
-    @GetMapping("getGroupId")
-    @ApiOperation(value = "得到下拉")
-    public Map<String, Object> getGroupId() {
-        return tmsshipFeign.getGroupId();
-    }
-
-    @GetMapping("getMaterialId")
-    @ApiOperation(value = "得到物资ID下拉")
-    public Map<String, Object> getMaterialId(){
-        return tmsshipFeign.getMaterialId();
-    }
-
-    @GetMapping("getCargoId")
-    @ApiOperation(value = "得到货物下拉")
-    public Map<String, Object> getCargoId() {
-        return tmsshipFeign.getCargoId();
-    }
-
-    @GetMapping("insertBetchId")
-    @ApiOperation(value = "得到批次下拉")
-    public Map<String, Object> insertBetchId() {
-        return tmsshipFeign.insertBetchId();
-    }
-
-    @GetMapping("getAttorneyId")
-    @ApiOperation(value = "得到提货下拉")
-    public Map<String, Object> getAttorneyId() {
-        return tmsshipFeign.getAttorneyId();
-    }
-
-    @GetMapping("getNoticeId")
-    @ApiOperation(value = "得到放货下拉")
-    public Map<String, Object> getNoticeId() {
-        return tmsshipFeign.getNoticeId();
-    }
-
-    @GetMapping("getPortName")
-    @ApiOperation(value = "得到货权转移单位")
-    public Map<String, Object> getPortName() {
-        return tmsshipFeign.getPortName();
-    }
-
-    @GetMapping("getPortId")
-    @ApiOperation(value = "得到港口下拉")
-    public Map<String, Object> getPortId() {
-        return tmsshipFeign.getPortId();
-    }
-
-    @GetMapping("getRmRawId")
-    @ApiOperation(value = "得到仓库下拉")
-    public Map<String, Object> getRmRawId() {
-        return tmsshipFeign.getRmRawId();
-    }
-
-    @GetMapping("getPierId")
-    @ApiOperation(value = "得到码头下拉")
-    public Map<String, Object> getPierId() {
-        return tmsshipFeign.getPierId();
-    }
-
-    @ApiOperation(value = "查询特定所有的物资")
-    @GetMapping("/getFuMaterial/{type}")
-    public Map<String, Object> getFuMaterial(@PathVariable("type") Integer type) {
-        return tmsTruckFeign.getFuMaterial(type);
-    }
-
-    @GetMapping("getResultNumber")
-    @ApiOperation(value = "得到实绩编号下拉")
-    public Map<String, Object> getResultNumber() {
-        return tmsshipFeign.getResultNumber();
-    }
-
-    @GetMapping("getCarrier")
-    @ApiOperation(value = "得到承运商下拉")
-    public Map<String, Object> getCarrier() {
-        return tmsshipFeign.getCarrier();
-    }
-
-    @GetMapping("getShipperId")
-    @ApiOperation(value = "得到托运方下拉")
-    public Map<String, Object> getShipperId() {
-        return tmsshipFeign.getShipper();
-    }
-
-    @GetMapping("getOrderId")
-    @ApiOperation(value = "得到装船指令下拉")
-    public Map<String, Object> getTask() {
-        return tmsshipFeign.getTask();
-    }
-
-    @GetMapping("getCapacityId")
-    @ApiOperation(value = "得到船下拉")
-    public Map<String, Object> getCapacityId() {
-        return tmsshipFeign.getCapacityId();
-    }
-
-
-    /*======================================火运==========================================*/
-
-
-    //************************************TmstrainLoadingResultController********************
-    @ApiOperation(value = "查询装车作业信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId(58)", value = "表头", required = false, dataType = "Interger")
-    })
-    @PostMapping("/getTmstrainWagonLoad")
-    public Map<String, Object> getTmstrainWagonLoad(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                    Integer apiId,
-                                                    Integer pageNum,
-                                                    Integer pageSize,
-                                                    Integer resultType,
-                                                    Integer materialId,
-                                                    Integer supplierId,
-                                                    String con,
-                                                    String startTime,
-                                                    String endTime) {
-        return tmsTrainFeign.getTmstrainWagonLoad(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,materialId,supplierId, con,startTime,endTime);
-    }
-
-
-    @ApiOperation(value = "修改港口出库")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "tmstrainLoadingResult", value = "车皮装车对象", required = false, dataType = "TmstrainLoadingResult")
-    })
-    @PostMapping(value = "/updateWarehouseResult")
-    public Map<String, Object> updateWarehouseResult(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsTrainFeign.updateWarehouseResult(map);
-    }
-
-
-    @ApiOperation(value = "新增车皮装车作业实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "tmstrainLoadingResult", value = "车皮装车对象", required = false, dataType = "TmstrainLoadingResult")
-    })
-    @PostMapping(value = "/insertTmstrainLoadingResult")
-    public Map<String, Object> insertTmstrainLoadingResult(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsTrainFeign.insertTmstrainLoadingResult(map);
-    }
-
-
-    @ApiOperation(value = "通过主键查询车皮装车作业信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "resultId", value = "车皮装车主键", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping(value = "/getTmstrainLoadingResultByResultId/{resultId}")
-    public Map<String, Object> getTmstrainLoadingResultByResultId(@PathVariable("resultId") BigDecimal resultId) {
-        return tmsTrainFeign.getTmstrainLoadingResultByResultId(resultId);
-    }
-
-    @ApiOperation(value = "通过主键修改车皮装车作业实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "tmstrainLoadingResult", value = "修改车皮装车map", required = false, dataType = "TmstrainWagonLoadResult")
-    })
-    @PostMapping(value = "/upadteTmstrainLoadingResultByResultId")
-    public Map<String, Object> upadteTmstrainLoadingResultByResultId(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsTrainFeign.upadteTmstrainLoadingResultByResultId(map);
-    }
-
-    @ApiOperation(value = "通过主键删除车皮装车作业实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "resultId", value = "主键ID", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping(value = "/deleteTmstrainLoadingResultByResultId")
-    public Map<String, Object> deleteTmstrainLoadingResultByResultId(@RequestParam BigDecimal resultId) {
-        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 = "获取发站地点名称")
-    @ApiImplicitParams({
-    })
-    @GetMapping(value = "/getSendStationName")
-    public Map<String, Object> getSendStationName() {
-        return tmsTrainFeign.getSendStationName();
-    }
-
-    @ApiOperation(value = "获取到站地点名称")
-    @GetMapping(value = "/getArrivalStationName")
-    public Map<String, Object> getArrivalStationName() {
-        return tmsTrainFeign.getArrivalStationName();
-    }
-
-    @ApiOperation(value = "装车新增港存库出库")
-    @PostMapping(value = "/addWarehouseOutResult")
-    public Map<String, Object> addWarehouseOutResult(@RequestBody(required = false) Map<String,Object> map) {
-        return tmsTrainFeign.addWarehouseOutResult(map);
-    }
-
-
-    @ApiOperation(value = "获取批次ID")
-    @GetMapping(value = "/getBatchId")
-    public Map<String, Object> getBatchId() {
-        return tmsTrainFeign.getBatchId();
-    }
-
-
-    @ApiOperation(value = "获取已装车还未卸车车皮")
-    @PostMapping(value = "/getWagonNo/{resultType}")
-    public Map<String, Object> getWagonNo(@PathVariable("resultType") Integer resultType,
-                                          @RequestBody(required = false) Map<String, Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          String wagon,
-                                          String purchaseOrderNum,
-                                          String materialName){
-        return tmsTrainFeign.getWagonNo(resultType, mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,wagon,purchaseOrderNum,materialName);
-    }
-
-    @ApiOperation(value = "查询所有发运计划")
-    @GetMapping(value = "/getRailPlan")
-    public Map<String, Object> getRailPlan() {
-        return tmsTrainFeign.getRailPlan();
-    }
-
-    @GetMapping(value = "/getDilBatch")
-    public Map<String, Object> getDilBatch() {
-        return tmsTruckFeign.getDilBatch();
-    }
-
-    @GetMapping(value = "/getCarrierId")
-    public Map<String, Object> getCarrierId() {
-        return tmsTruckFeign.getCarrier();
-    }
-
-    @GetMapping(value = "/getLine")
-    public Map<String, Object> getLine() {
-        return tmsTruckFeign.getLine();
-    }
-
-    @GetMapping(value = "/getWarehouse")
-    public Map<String, Object> getWarehouse() {
-        return tmsTruckFeign.getWarehouse();
-    }
-
-    @GetMapping(value = "/getGatepost")
-    public Map<String, Object> getGatepost() {
-        return tmsTruckFeign.getGatepost();
-    }
-
-    @GetMapping(value = "/getAPO")
-    public Map<String, Object> getAPO() {
-        return tmsTruckFeign.getAPO();
-    }
-
-    @GetMapping(value = "/getFuCapacityId")
-    public Map<String, Object> getFuCapacityId() {
-        return tmsTruckFeign.getFuCapacityId();
-    }
-
-    @GetMapping(value = "/getPort")
-    public Map<String, Object> getPort() {
-        return tmsTruckFeign.getPort();
-    }
-
-    @ApiOperation(value = "查询卸货点")
-    @GetMapping("/getUnloadPoint/{type}")
-    public Map<String, Object> getUnloadPoint(@PathVariable("type") Integer type) {
-        return tmsTruckFeign.getUnloadPoint(type);
-    }
-
-    @ApiOperation(value = "查询卸车作业信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId(60)", value = "表头", required = false, dataType = "Interger")
-    })
-    @PostMapping("/getTmstrainWagonUnLoad")
-    public Map<String, Object> getTmstrainWagonUnLoad(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                      Integer apiId,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer resultType,
-                                                      String con) {
-        return tmsTrainFeign.getTmstrainWagonUnLoad(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,con);
-    }
-
-    @ApiOperation(value = "通过主键删除车皮卸车作业实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "unloadingId", value = "主键ID", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping(value = "/deleteTmstrainWagonUnLoadResultByUnLoadingId")
-    public Map<String, Object> deleteTmstrainWagonUnLoadResultByUnLoadingId(@RequestParam BigDecimal unloadingId) {
-        return tmsTrainFeign.deleteTmstrainWagonUnLoadResultByUnLoadingId(unloadingId);
-    }
-
-    @ApiOperation(value = "新增车皮卸车作业实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "tmstrainWagonUnloadResult", value = "车皮卸车对象", required = false, dataType = "TmstrainWagonUnloadResult")
-    })
-    @PostMapping(value = "/insertTmstrainWagonUnLoadResult")
-    public Map<String, Object> insertTmstrainWagonUnLoadResult(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult) {
-        return tmsTrainFeign.insertTmstrainWagonUnLoadResult(tmstrainWagonUnloadResult);
-    }
-
-    @ApiOperation(value = "通过主键修改车皮卸车作业实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "tmstrainWagonUnloadResult", value = "车皮卸车对象", required = false, dataType = "TmstrainWagonUnloadResult")
-    })
-    @PostMapping(value = "/upadteTmstrainWagonUnLoadResultByUnLoadingId")
-    public Map<String, Object> upadteTmstrainWagonUnLoadResultByUnLoadingId(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult) {
-        return tmsTrainFeign.upadteTmstrainWagonUnLoadResultByUnLoadingId(tmstrainWagonUnloadResult);
-    }
-
-    @ApiOperation(value = "查看火运实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId(65)", value = "表头", required = false, dataType = "Interger")
-    })
-    @PostMapping("/getTmstrainresult")
-    public Map<String, Object> getTmstrainresult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 String con) {
-        return tmsTrainFeign.getTmstrainresult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value = "通过主键查询车皮卸车作业信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "unloadingId", value = "车皮卸车主键", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping(value = "/getTmstrainWagonUnLoadResultByUnLoadingId/{unloadingId}")
-    public Map<String, Object> getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId) {
-        return tmsTrainFeign.getTmstrainWagonUnLoadResultByUnLoadingId(unloadingId);
-    }
-
-    //下拉框
-    @ApiOperation(value = "获取卸车地点名称")
-    @ApiImplicitParams({
-    })
-    @GetMapping(value = "/getUnloadingPointName")
-    public Map<String, Object> getUnloadingPointName() {
-        return tmsTrainFeign.getUnloadingPointName();
-    }
-
-
-    //下拉框
-    @ApiOperation(value = "获取货权转移图片")
-    @ApiImplicitParams({
-    })
-    @PostMapping(value = "/downLoadDeilveryNotice")
-    public Map<String, Object> downLoadDeilveryNotice(@RequestParam Integer noticeId) {
-        return tmsshipFeign.downLoadDeilveryNotice(noticeId);
-    }
-
-    @ApiOperation(value = "获取卸车路径名称")
-    @ApiImplicitParams({
-    })
-    @GetMapping(value = "/getUnloadingRouteName")
-    public Map<String, Object> getUnloadingRouteName() {
-        return tmsTrainFeign.getUnloadingRouteName();
-    }
-
-
-    @ApiOperation(value = "查询请车作业")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(57)", 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("/getAllWagonPlease")
-    public Map<String, Object> getAllWagonPlease(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 Integer status,
-                                                 Integer resultType,
-                                                 Integer resultId,
-                                                 String con) {
-
-        return tmsTrainFeign.getAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, resultType,resultId,con);
-    }
-
-    @ApiOperation(value = "通过Id查询请车作业")
-    @PostMapping("/getWagonPleaseById/{resultId}")
-    public Map<String, Object> getWagonPleaseById(@PathVariable("resultId") Integer resultId) {
-        return tmsTrainFeign.getWagonPleaseById(resultId);
-    }
-
-    @ApiOperation(value = "新增请车作业")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "amstrainWagonPlease", value = "请车作业对象", required = false, dataType = "AmstrainWagonPlease"),
-    })
-    @PostMapping("/addWagonPlease")
-    public Map<String, Object> addWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult) {
-        return tmsTrainFeign.addWagonPlease(tmstrainPleaseApproveResult);
-    }
-
-    @ApiOperation(value = "修改请车作业")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
-    })
-    @PostMapping("/updateWagonPlease")
-    public Map<String, Object> updateWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult) {
-        return tmsTrainFeign.updateWagonPlease(tmstrainPleaseApproveResult);
-    }
-
-    @ApiOperation(value = "逻辑删除请车作业 设置状态码为 3")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
-    })
-    @PostMapping("/deleteWagonPlease/{resultId}")
-    public Map<String, Object> deleteWagonPlease(@PathVariable("resultId") Integer resultId) {
-        return tmsTrainFeign.deleteWagonPlease(resultId);
-    }
-
-    @ApiOperation(value = "下发请车作业 设置状态码为 1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "resultId", value = "请车作业实绩对象", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/sendWagonPlease/{resultId}")
-    public Map<String, Object> sendWagonPlease(@PathVariable("resultId") Integer resultId) {
-        return tmsTrainFeign.sendWagonPlease(resultId);
-    }
-
-    //下拉框
-
-    @ApiOperation(value = "查询所有发货单位")
-    @GetMapping("/getShipper")
-    public Map<String, Object> getShipper() {
-        return tmsTrainFeign.getShipper();
-    }
-
-    @ApiOperation(value = "查询批车作业")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(70)", 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("/getApproveAllWagonPlease")
-    public Map<String, Object> getApproveAllWagonPlease(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                        Integer apiId,
-                                                        Integer pageNum,
-                                                        Integer pageSize,
-                                                        Integer resultType,
-                                                        Integer status,
-                                                        String con) {
-        return tmsTrainFeign.getApproveAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,status,con);
-    }
-
-    @ApiOperation(value = "通过Id查询批车作业")
-    @PostMapping("/getApproveWagonPleaseById/{resultId}")
-    public Map<String, Object> getApproveWagonPleaseById(@PathVariable("resultId") Integer resultId) {
-        return tmsTrainFeign.getApproveWagonPleaseById(resultId);
-    }
-
-    @ApiOperation(value = "新增批车作业")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
-    })
-    @PostMapping("/addApproveWagonPlease")
-    public Map<String, Object> addApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult) {
-        return tmsTrainFeign.addApproveWagonPlease(tmstrainPleaseApproveResult);
-    }
-
-    @ApiOperation(value = "修改批车作业")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
-    })
-    @PostMapping("/updateApproveWagonPlease")
-    public Map<String, Object> updateApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult) {
-        return tmsTrainFeign.updateApproveWagonPlease(tmstrainPleaseApproveResult);
-    }
-
-    @ApiOperation(value = "逻辑删除批车作业")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "resultId", value = "请车作业实绩对象", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/deleteApproveWagonPlease/{resultId}")
-    public Map<String, Object> deleteApproveWagonPlease(@PathVariable("resultId") Integer resultId) {
-        return tmsTrainFeign.deleteApproveWagonPlease(resultId);
-    }
-
-
-    /*======================================汽运==========================================*/
-
-
-    //******************************************TmstruckLoadResultController***********************************
-
-    @ApiOperation(value="查询所有正在排队的销售订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(227)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getSaleOrderOnQueue")
-    public Map<String, Object> getSaleOrderOnQueue(@RequestBody(required=false) Map<String,Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             String con){
-        return tmsTruckFeign.getSaleOrderOnQueue(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con);
-    }
-
-    @ApiOperation(value="查询订单下的物资")
-    @GetMapping("getOrderMaterial/{orderId}")
-    public Map<String, Object> getOrderMaterial(@PathVariable("orderId") Integer orderId){
-        return tmsTruckFeign.getOrderMaterial(orderId);
-    }
-
-    @ApiOperation(value="查询仓库下所有月台")
-    @GetMapping("getPlatformIdByWarehouse/{warehouseId}")
-    public Map<String, Object> getPlatformIdByWarehouse(@PathVariable("warehouseId") Integer warehouseId){
-        return tmsTruckFeign.getPlatformIdByWarehouse(warehouseId);
-    }
-
-    @ApiOperation(value="修改装车点和装车顺序：销售钢材专用 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
-    })
-    @PostMapping("/updateLoadingIdAndLoadSq")
-    public Map<String, Object> updateLoadingIdAndLoadSq(@RequestBody(required=false) Map<String, Object> map){
-        return tmsTruckFeign.updateLoadingIdAndLoadSq(map);
-    }
-
-    @ApiOperation(value="根据运输订单号查询装/卸点、卸货物资、装机备注信息：后台管理 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
-    })
-    @PostMapping("/selectLoadingIdRemark")
-    public Map<String, Object> selectLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map){
-        return tmsTruckFeign.selectLoadingIdRemark(map);
-    }
-
-    @ApiOperation(value="根据运输订单号修改装/卸点、卸货物资、装机备注等：后台管理 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
-    })
-    @PostMapping("/updateLoadingIdRemark")
-    public Map<String, Object> updateLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map){
-        return tmsTruckFeign.updateLoadingIdRemark(map);
-    }
-
-    @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("/getAllLoadResult")
-    public Map<String, Object> getAllLoadResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer status,
-                                          Integer orderType,
-                                          String con,
-                                          String userId,
-                                          String userIds,
-                                                String startTime,String endTime){
-        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType, con,userId,userIds,startTime,endTime);
-    }
-
-    @ApiOperation(value = "新增采购汽车装车实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
-    })
-    @PostMapping("/addCGLoadResult")
-    public Map<String, Object> addCGLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
-        return tmsTruckFeign.addCGLoadResult(mapValue);
-    }
-
-    @ApiOperation(value="销售新增钢材装车实绩 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
-    })
-    @PostMapping("addSaleLoadResult")
-    public Map<String, Object> addSaleLoadResult(@RequestBody(required=false) Map<String, Object> map){
-        return tmsTruckFeign.addSaleLoadResult(map);
-    }
-
-    @ApiOperation(value="销售新增钢渣、水渣、危化品装车实绩 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
-    })
-    @PostMapping("/addSale2LoadResult")
-    public Map<String, Object> addSale2LoadResult(@RequestBody(required=false) Map<String, Object> map){
-        return tmsTruckFeign.addSale2LoadResult(map);
-    }
-
-    @ApiOperation(value = "修改汽车装车实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "tmstruckLoadResult", value = "装车作业实绩对象", required = false, dataType = "TmstruckLoadResult"),
-    })
-    @PostMapping("/updateLoadResult")
-    public Map<String, Object> updateLoadResult(@RequestBody Map<String, Object> map) {
-        return tmsTruckFeign.updateLoadResult(map);
-    }
-
-    @ApiOperation(value = "通过ID查询装车实绩 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getLoadResultById/{resultId}")
-    public Map<String, Object> getLoadResultById(@PathVariable("resultId") Integer resultId) {
-        return tmsTruckFeign.getLoadResultById(resultId);
-    }
-
-    @ApiOperation(value = "逻辑删除车装车实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "tmstruckLoadResult", value = "装车作业实绩对象", required = false, dataType = "TmstruckLoadResult"),
-    })
-    @PostMapping("/deleteLoadResult/{resultId}")
-    public Map<String, Object> deleteLoadResult(@PathVariable("resultId") Integer resultId) {
-        return tmsTruckFeign.deleteLoadResult(resultId);
-    }
-
-    //***************************************TmstruckEnfactoryResultController***************************
-
-    @ApiOperation(value = "查询所有的进厂实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(220)", 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("/getAllEnFactoryResult")
-    public Map<String, Object> getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer orderType,
-                                               String startTime,
-                                               String endTime,
-                                               String userId,
-                                               String userIds
-    ){
-        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, startTime,endTime,userId,userIds);
-    }
-
-    @ApiOperation(value="通过运输订单id查询物资信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderId", value = "运输订单id", required = false, dataType = "Integer"),
-    })
-    @GetMapping("/getMaterial")
-    public Map<String, Object> getMaterial(Integer orderId){
-        return tmsTruckFeign.getMaterial(orderId);
-    }
-
-    @ApiOperation(value="通过采集系统传来的数据新增进厂作业实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("/addEnFactoryResult")
-    public Map<String, Object> addEnFactoryResult(@RequestBody(required = false) Map<String, Object> mapValue) {
-        return tmsTruckFeign.addEnFactoryResult(mapValue);
-    }
-
-    @ApiOperation(value = "PDA扫描更新进厂作业实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("/enFactoryResultByPDA")
-    public Callable<Map<String, Object>> enFactoryResultByPDA(@RequestBody(required = false) Map<String, Object> mapValue) {
-        //PDA扫码会多个反斜杠所以需要截取
-        return ()->{
-                String orderNumber = (String) mapValue.get("orderNumber");
-                orderNumber = orderNumber.substring(0, orderNumber.length()-1);
-                mapValue.put("orderNumber", orderNumber);
-                return tmsTruckFeign.enFactoryResultByPDA(mapValue);
-        };
-
-    }
-
-    //***************************************TmstruckWeightResultController***************************
-    @ApiOperation(value = "查询计毛实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(102)", 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("/getAllJiMaoResult")
-    public Map<String, Object> getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 Integer orderType,
-                                                 String con,
-                                                 String userId,
-                                                 String userIds,
-                                                 String startTime,
-                                                 String endTime){
-        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
-    }
-
-    @ApiOperation(value = "查询计皮实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(104)", 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("/getAllJiPiResult")
-    public Map<String, Object> getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer orderType,
-                                                String con,
-                                                String userId,
-                                                String userIds,
-                                                String startTime,
-                                                String endTime) {
-        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
-    }
-
-
-    @ApiOperation(value = "采集新增计毛实绩 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "采集的数据", required = false, dataType = "Map"),
-    })
-    @PostMapping("/addJiMaoResult")
-    public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue) {
-        return tmsTruckFeign.addJiMaoResult(mapValue);
-    }
-
-    @ApiOperation(value = "采集新增计皮实绩 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "采集的数据", required = false, dataType = "Map"),
-    })
-    @PostMapping("/addJiPiResult")
-    public Map<String, Object> addJiPiResult(@RequestBody Map<String, Object> mapValue) {
-        return tmsTruckFeign.addJiPiResult(mapValue);
-    }
-
-    //****************************************TmstruckUnloadResultController*******************************
-
-    @ApiOperation(value = "查询卸货实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(103)", 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("/getUnloadResult")
-    public Map<String, Object> getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer orderType,
-                                               String con,
-                                               String userId,
-                                               String userIds,
-                                               String startTime,
-                                               String endTime
-    ){
-        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
-    }
-
-    @ApiOperation(value = "添加卸货实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/addUnloadResult")
-    public Map<String, Object> addUnloadResult(@RequestBody Map<String, Object> mapValue) {
-        return tmsTruckFeign.addUnloadResult(mapValue);
-    }
-
-    @ApiOperation(value = "更新卸货实绩 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/updateUnloadResult")
-    public Map<String, Object> updateUnloadResult(@RequestBody Map<String, Object> mapValue) {
-        return tmsTruckFeign.updateUnloadResult(mapValue);
-    }
-    //****************************************TmstruckReceiptResultController*******************************
-
-
-    @ApiOperation(value = "查询收货实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(107)", 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("/getReceiveResult")
-    public Map<String, Object> getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                                Integer orderType,String con,
-                                                String startTime,
-                                                String endTime
-    ){
-        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,startTime,endTime);
-    }
-
-
-    //****************************************TmstruckLeaveFactoryResultController*******************************
-
-
-    @ApiOperation(value="查询出厂实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(110)", 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("/getLeaveFactoryResult")
-    public Map<String, Object> getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     Integer orderType,
-                                                     String con,
-                                                     String carrierSsoId,
-                                                     String userId,
-                                                     String userIds,
-                                                     String startTime,
-                                                     String endTime
-    ){
-        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con, carrierSsoId,userId,userIds,startTime,endTime);
-    }
-
-
-    @ApiOperation(value="PAD扫描汽车出厂实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
-    })
-    @PostMapping("/addLeaveFactoryResult")
-    public Map<String, Object> addLeaveFactoryResult(@RequestBody(required = false) Map<String, Object> mapValue) {
-        return tmsTruckFeign.addLeaveFactoryResult(mapValue);
-    }
-
-    //****************************************TmstruckMeasureCommissionController*******************************
-
-    @ApiOperation(value = "查询计量委托,apiId=521")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllMeasureCommission")
-    public Map<String, Object> getAllMeasureCommission(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-                                                       String con) {
-        if(mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        return tmsTruckFeign.getAllMeasureCommission(mapValue, apiId, pageNum, pageSize, con);
-    }
-
-    //****************************************TmstruckQualityResultController*******************************
-
-    @ApiOperation(value = "查询所有的质检作业")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(111)", 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("/getQualityResult")
-    public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer orderType,
-                                                String con,
-                                                String startTime,
-                                                String endTime
-    ){
-        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,orderType, con,startTime,endTime);
-    }
-
-    @ApiOperation(value = "通过ID获取质检实绩 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "resultId", value = "质检作业实绩ID", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getQualityResultById/{resultId}")
-    public Map<String, Object> getQualityResultById(@PathVariable("resultId") Integer resultId) {
-        return tmsTruckFeign.getQualityResultById(resultId);
-    }
-
-    @ApiOperation(value = "修改质检实绩 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "resultId", value = "质检作业实绩ID", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/updateQualityResult")
-    public Map<String, Object> updateQualityResult(@RequestBody(required = false) Map<String, Object> mapValue) {
-        return tmsTruckFeign.updateQualityResult(mapValue);
-    }
-
-    //*********************************内转物流tms-train*********************************************************************
-    @PostMapping("/addTrainLoadResultForConverted")
-    @ApiOperation(value = "内转物流新增装车")
-    public Map<String, Object> addTrainLoadResultForConverted(@RequestBody(required = false) Map<String, Object> tmstrainLoadingResult) {
-        return tmsTrainFeign.addTrainLoadResultForConverted(tmstrainLoadingResult);
-    }
-
-    @ApiOperation(value = "内转新增卸车实绩")
-    @ApiImplicitParams({
-    })
-    @PostMapping(value = "/addTmsTrainUnloadResultForNZ")
-    public Map<String, Object> addTmsTrainUnloadResultForNZ(@RequestBody(required = false)Map<String, Object> map) {
-        return tmsTrainFeign.addTmsTrainUnloadResultForNZ(map);
-    }
-
-    @ApiOperation(value = "查询车皮物资信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId(213)", value = "表头", required = false, dataType = "Interger")
-    })
-    @PostMapping(value = "/getMaterialAndCarByLoadingId")
-    public Map<String, Object> getMaterialAndCarByLoadingId(
-            @RequestBody(required = false) Map<String, Object> mapValue,
-            Integer apiId,
-            Integer pageNum,
-            Integer pageSize,
-            Integer loadingId,
-            Integer unloadingId) {
-        return tmsTrainFeign.getMaterialAndCarByLoadingId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, loadingId, unloadingId);
-    }
-
-    @PostMapping("/selectLoadByResultId/{resultId}")
-    @ApiOperation(value = "内转物流通过主键查询车皮装车作业信息")
-    public Map<String, Object> selectLoadByResultId(@PathVariable("resultId") BigDecimal resultId) {
-        Map<String, Object> mes = tmsTrainFeign.selectLoadByResultId(resultId);
-        return mes;
-    }
-
-    @ApiOperation(value = "内转查询装车作业信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(203)", 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("/getTmstrainWagonLoadForConverted")
-    public Map<String, Object> getTmstrainWagonLoadForConverted(@RequestBody(required = false)
-                                                                        Integer apiId,
-                                                                Integer pageNum,
-                                                                Integer pageSize,
-                                                                String con
-    ) {
-        return tmsTrainFeign.getTmstrainWagonLoadForConverted(apiId, pageNum, pageSize,con);
-    }
-
-
-
-
-    @ApiOperation(value = "查询进口矿未绑定装车实绩的车皮")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(203)", 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("/getResultType")
-    public Map<String, Object> getResultType(@RequestBody(required = false)Map<String,Object> map,
-                                                                        Integer apiId,
-
-                                                                String con
-    ) {
-        return tmsTrainFeign.getResultType(map == null ? new HashMap<>() : map,apiId,con);
-    }
-
-    @PostMapping("/addShipLoadResult")
-    @ApiOperation(value = "江港-达州新增装车")
-    public Map<String, Object> addShipLoadResult(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsTrainFeign.addShipLoadResult(map);
-    }
-
-
-    @PostMapping("/addWagonPleaseForNZ")
-    @ApiOperation(value = "内转物流新增请车")
-    public Map<String, Object> addPleaseForNZ(@RequestBody(required = false) Map<String, Object> tmstrainLoadingResult) {
-        return tmsTrainFeign.addPleaseForNZ(tmstrainLoadingResult);
-    }
-
-    @ApiOperation(value="内转新增达州站-厂内装车实绩 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
-    })
-        @PostMapping("/addDaZhouToDaGangLoadResult")
-    public Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map){
-        return tmsTruckFeign.addDaZhouToDaGangLoadResult(map);
-    }
-
-    @ApiOperation(value = "内转查询请车作业信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(199)", 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("/getAllWagonPleaseForConverted")
-    public Map<String, Object> getAllWagonPleaseForConverted(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                             Integer apiId,
-                                                             Integer pageNum,
-                                                             Integer pageSize,
-                                                             Integer status,
-                                                             String con
-    ) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        mapValue.put("status", status);
-        return tmsTrainFeign.getTmstrainWagonLoadForConverted(apiId, pageNum, pageSize,con);
-    }
-
-    @PostMapping("/getPleasePlanByResultId/{resultId}")
-    @ApiOperation(value = "内转物流通过主键查请车计划")
-    public Map<String, Object> getPleasePlanByResultId(@PathVariable("resultId") BigDecimal resultId) {
-        Map<String, Object> mes = tmsTrainFeign.getPleasePlanByResultId(resultId);
-        return mes;
-    }
-
-    @PostMapping("/getApproveByResultId/{resultId}")
-    @ApiOperation(value = "内转物流通过主键查询车皮请车作业信息")
-    public Map<String, Object> getApproveByResultId(@PathVariable("resultId") BigDecimal resultId) {
-        Map<String, Object> mes = tmsTrainFeign.getApproveByResultId(resultId);
-        return mes;
-    }
-
-    @ApiOperation(value = "查询卸车作业信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(201)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-
-    })
-    @PostMapping("/selectWagonUnLoadResultForConverted")
-    public Map<String, Object> selectWagonUnLoadResultForConverted(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                                   Integer apiId,
-                                                                   Integer pageNum,
-                                                                   Integer pageSize,
-                                                                   String con
-    ) {
-        return tmsTrainFeign.selectWagonUnLoadResultForConverted(apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value = "内转查询火车卸货信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(202)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-
-    })
-    @PostMapping("/selectTrainUnLoadResultForConverted")
-    public Map<String, Object> selectTrainUnLoadResultForConverted(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                                   Integer apiId,
-                                                                   Integer pageNum,
-                                                                   Integer pageSize,
-                                                                   String con
-    ) {
-        return tmsTrainFeign.selectTrainUnLoadResultForConverted(apiId, pageNum, pageSize,con);
-    }
-
-    /**
-     * 新增汽车装货实绩
-     */
-    @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(364)", 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==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
-    }
-
-    //采购内转待装车实绩
-    @ApiOperation(value = "查询待装车运单列表")
-    @PostMapping("/cgNzLoadingResult")
-    public Map<String, Object> cgNzLoadingResult(@RequestBody(required = false) Map<String, Object> mapVal,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer orderType,
-                                               Integer orderStatus
-    ) {
-        return tmsTruckFeign.cgNzLoadingResult(mapVal==null?new HashMap<>():mapVal, apiId, pageNum, pageSize,orderType,orderStatus);
-    }
-
-
-
-    /**
-     * 内转物流卸货装车实绩
-     *
-     * @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;
-    }
-
-    @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("/getTmstruckMonthResult")
-    public Map<String, Object> getTmstruckMonthResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                      Integer apiId,
-                                                      Integer pageNum,
-                                                      Integer pageSize
-    ) {
-        return tmsTruckFeign.getTmstruckMonthResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
-    }
-
-    /**
-     * 通过运输订单判断下一步是否需要计量,更新汽车衡到计量实绩中
-     */
-    @PostMapping("/updateTruckCalculate/{orderId}")
-    public Map<String, Object> updateTruckCalculate(@PathVariable("orderId") Integer orderId) {
-        return tmsTruckFeign.isNextNeedJl(orderId);
-    }
-
-    @ApiOperation(value="查询所有的短信实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(175)", 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("/getSmsResult")
-    public Map<String, Object> getSmsResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            String con
-    ){
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsTruckFeign.getSmsResult(mapValue,apiId,pageNum,pageSize,con);
-    }
-
-    @ApiOperation(value="APP查询进厂实绩")
-    @PostMapping("/getEnfactoryResultList")
-    public Map<String ,Object> getEnfactoryResultList() {
-        return tmsTruckFeign.getEnfactoryResultList();
-    }
-
-    @ApiOperation(value="APP通过运输订单id查询进厂实绩")
-    @PostMapping("/getEnfactoryMessageByOrderId")
-    public Map<String ,Object> getEnfactoryMessageByOrderId(String orderNumber) {
-        return tmsTruckFeign.getEnfactoryMessageByOrderId(orderNumber);
-    }
-
-    @ApiOperation(value="查询计皮实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(363)", 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("/getAllTimeTaskResult")
-    public RESTfulResult getAllTimeTaskResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              String con,
-                                              String  userId,
-                                              String startTime,
-                                              String endTime,
-                                              Integer orderType
-    ){
-        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime,orderType);
-    }
-
-    @ApiOperation(value="查询倒库实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(516)", 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("/getAllReverseResult")
-    public RESTfulResult getAllReverseResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              String con,
-                                              String  userId,
-                                              String startTime,
-                                              String endTime){
-        return tmsTruckFeign.getAllReverseResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime);
-    }
-
-    @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
-    @PostMapping("/addSteelNzReceiptResult")
-    public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsTruckFeign.addSteelNzReceiptResult(map);
-    }
-
-
-    @ApiOperation(value="更新计量实绩 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapList", value = "计量数据", required = false, dataType = "List<Map>"),
-    })
-    @PostMapping("/updateTruckWeight")
-    public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList){
-        return tmsTruckFeign.updateTruckWeight(mapList);
-    }
-
-    @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("/getAllReturnResult")
-    public Map<String, Object> getAllReturnResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer orderType,
-                                            String con
-    ){
-        return tmsTruckFeign.getAllReturnResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, con);
-    }
-    @ApiOperation(value="提货单 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
-    })
-    @PostMapping("/getBillOrder")
-    public Map<String, Object> getBillOrder(@RequestParam String orderNumber){
-        return tmsTruckFeign.getBillOrder(orderNumber);
-    }
-
-    @ApiOperation(value="发货通知单 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
-    })
-    @PostMapping("/getDeliveryOrder")
-    public Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber){
-        return tmsTruckFeign.getDeliveryOrder(orderNumber);
-    }
-    @ApiOperation(value="模糊查询江船名 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "state", value = "用户输入的江船名", required = false, dataType = "String"),
-    })
-    @PostMapping("getShipNameList")
-    public Map<String, Object> getShipNameList(@RequestParam(value = "state") String state){
-        return tmsshipFeign.getShipNameList(state);
-    }
-
-    @ApiOperation(value = "国产矿导入")
-    @PostMapping(value = "/importDomesticLoadResult")
-    public Map<String, Object> importDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
-        return tmsTrainFeign.importDomesticLoadResult(mapValue);
-    }
-
-    @ApiOperation(value = "进口矿导入")
-    @PostMapping(value = "/importImportedLoadResult")
-    public Map<String, Object> importImportedLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
-        return tmsTrainFeign.importImportedLoadResult(mapValue);
-    }
-
-
-    @ApiOperation(value = "国产矿新增/海港-老区轨道衡新增装车")
-    @PostMapping(value = "/addDomesticLoadResult")
-    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
-        return tmsTrainFeign.addDomesticLoadResult(mapValue);
-    }
-
-    @ApiOperation(value = "国产矿物流补录装车信息")
-    @PostMapping(value = "/updateDomesticLoadResult")
-    public Map<String, Object> updateDomesticLoadResult(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsTrainFeign.updateDomesticLoadResult(map);
-    }
-
-    @ApiOperation(value = "添加火车计量委托")
-    @PostMapping(value = "/addTrainMeasureCommission")
-    public Map<String, Object> addTrainMeasureCommission(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsTrainFeign.addTrainMeasureCommission(map);
-    }
-
-    @ApiOperation(value = "查询需要发送计量委托的车皮信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId(209)", value = "表头", required = false, dataType = "Interger")
-    })
-    @PostMapping(value = "/getLoadResultToSendMC")
-    public Map<String, Object> getLoadResultToSendMC( @RequestBody(required = false) Map<String, Object> mapValue,
-            Integer apiId,
-            Integer pageNum,
-            Integer pageSize, String startTime, String endTime,Integer resultType,String con) {
-        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,startTime,endTime,con);
-    }
-
-    @ApiOperation(value = "查询计量数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId(209)", value = "表头", required = false, dataType = "Interger")
-    })
-    @PostMapping(value = "/getWeightResult")
-    public Map<String, Object> getWeightResult( @RequestBody(required = false) Map<String, Object> mapValue,
-                                                      Integer apiId,
-                                                      Integer pageNum,
-                                                      Integer pageSize,String startTime, String endTime,Integer resultType,String con) {
-        return tmsTrainFeign.getWeightResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,startTime,endTime,con);
-    }
-
-    @ApiOperation(value = "批量新增计量委托")
-    @PostMapping(value = "/batchSendMeasureCommission")
-    public Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsTrainFeign.batchSendMeasureCommission(map);
-    }
-
-
-      //获取合同水分值，实装吨位，水分吨位
-    @PostMapping("/getMoistureAndInstallations")
-    public Map<String,Object> getMoistureAndInstallations(@RequestBody(required=false) Map<String,Object> map){
-        return tmsshipFeign.getMoistureAndInstallations(map);
-    }
-
-
-    @ApiOperation(value="查询辅料燃料统计报表")
-    @PostMapping("/getRLFLReport")
-    public Map<String, Object> getRLFLReport(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               String startTime,
-                                               String endTime,
-                                               Integer orderType,
-                                               String con
-    ){
-        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType,con);
-    }
-    @ApiOperation(value="查询销售统计报表")
-    @PostMapping("/getAllSaleReport")
-    public Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          String startTime,
-                                          String endTime,
-                                          String carrierSsoId,
-                                                Integer orderType,
-                                                Integer shipperId,
-                                                String receiveName,
-                                                String materialName,
-                                                String wareHouse
-    ){
-        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId,receiveName,materialName,wareHouse);
-    }
-
-    @ApiOperation(value="查询销售统计报表筛选过后的总净重")
-    @PostMapping("/getAllSaleReportTotal")
-    public Map<String, Object> getAllSaleReportTotal(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                String startTime, String endTime,
-                                                String carrierSsoId
-    ){
-        return tmsTruckFeign.getAllSaleReportTotal(mapValue==null?new HashMap<>():mapValue, startTime, endTime, carrierSsoId);
-    }
-
-    @ApiOperation(value="查询零星物资进厂统计报表")
-    @PostMapping("/getSporadicSuppliesReport1")
-    public Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                String startTime, String endTime,
-                                                String carrierSsoId,
-                                               String userId,
-                                               String userIds,
-                                               String con,
-                                               Integer orderType
-    ){
-        return tmsTruckFeign.getSporadicSuppliesReport1(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
-    }
-    @ApiOperation(value="查询零星物资出厂统计报表")
-    @PostMapping("/getSporadicSuppliesReport2")
-    public Map<String, Object> getSporadicSuppliesReport2(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                          Integer apiId,
-                                                          Integer pageNum,
-                                                          Integer pageSize,
-                                                          String startTime,
-                                                          String endTime,
-                                                          String carrierSsoId,
-                                                          String userId,
-                                                          String userIds,
-                                                          String con,
-                                                          Integer orderType
-    ){
-        return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
-    }
-
-    @ApiOperation(value="查询采购内转运输实绩")
-    @PostMapping("/getPurInwardReport")
-    public Map<String, Object> getPurInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                          Integer apiId,
-                                                          Integer pageNum,
-                                                          Integer pageSize,
-                                                          String startTime,
-                                                          String endTime) {
-        return tmsTruckFeign.getPurInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
-    }
-    @ApiOperation(value="查询内转运输实绩")
-    @PostMapping("/getInwardReport")
-    public Map<String, Object> getInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                          Integer apiId,
-                                                          Integer pageNum,
-                                                          Integer pageSize,
-                                                          String startTime,
-                                                          String endTime) {
-        return tmsTruckFeign.getInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
-    }
-    @ApiOperation(value="")
-    @PostMapping("/getLoaderForResultDetail")
-    public Map<String, Object> getLoaderForResultDetail(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               String startTime,
-                                               String endTime,
-                                               String con, String isPage) {
-        return tmsTruckFeign.getLoaderForResultDetail(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime,con,isPage);
-    }
-
-
-    @ApiOperation(value="获取内转报表")
-    @PostMapping("/getPurchaseInwardList")
-    public Map<String, Object> getPurchaseInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                        Integer apiId,
-                                                        Integer pageNum,
-                                                        Integer pageSize,
-                                                        String startTime,
-                                                        String endTime,
-                                                        String orgCode,
-                                                        String isPage,
-                                                        String index) {
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        return tmsTruckFeign.getPurchaseInwardList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
-    }
-
-
-
-
-
-    @ApiOperation(value="获取采购订单报表")
-    @PostMapping("/getPurchaseOrderList")
-    public Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             String startTime,
-                                             String endTime,
-                                             String orgCode,
-                                                    String isPage,
-                                                    String index) {
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        return tmsTruckFeign.getPurchaseOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
-    }
-
-
-
-    @ApiOperation(value="获取采购订单报表")
-    @PostMapping("/getInwardInFactory")
-    public Map<String, Object> getInwardInFactory(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                    Integer apiId,
-                                                    Integer pageNum,
-                                                    Integer pageSize,
-                                                    String startTime,
-                                                    String endTime,
-                                                    String orgCode,
-                                                    String isPage,
-                                                  String index) {
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        return tmsTruckFeign.getInwardInFactory(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
-    }
-
-
-
-    @ApiOperation(value="获取销售订单列表")
-    @PostMapping("/getSaleOrderList")
-    public Map<String, Object> getSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                    Integer apiId,
-                                                    Integer pageNum,
-                                                    Integer pageSize,
-                                                    String startTime,
-                                                    String endTime,
-                                                    String orgCode,
-                                                    String isPage,
-                                                   String index) {
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        return tmsTruckFeign.getSaleOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
-    }
-
-
-    @PostMapping("/sendMeasureCommission")
-    public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
-        return  tmsTruckFeign.sendMeasureCommission(map);
-    }
-
-    @ApiOperation(value="发送留皮计量委托(neizhuan)")
-    @GetMapping("/sendLiuPiMeasureCommission")
-    public Map<String, Object> sendLiuPiMeasureCommission(String capacityNumber){
-        return tmsTruckFeign.sendLiuPiMeasureCommission(capacityNumber);
-    }
-
-
-    @ApiOperation(value="新增计时作业实绩")
-    @PostMapping("/addTimeTaskResult")
-    public Map<String, Object> addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map){
-        return  tmsTruckFeign.addTimeTaskResult(map);
-    }
-
-    @ApiOperation(value="计时判断是否开始")
-    @PostMapping("/JudgeTimeTask")
-    public Map<String, Object> JudgeTimeTask(@RequestBody(required = false) Map<String, Object> map){
-        return  tmsTruckFeign.JudgeTimeTask(map);
-    }
-
-
-
-    @ApiOperation(value="计时暂停")
-    @PostMapping("/unitSureEndTimeout")
-    public Map<String, Object> unitSureEndTimeout(@RequestBody(required = false) Map<String, Object> map){
-        return  tmsTruckFeign.unitSureEndTimeout(map);
-    }
-
-    @ApiOperation(value="计时暂停")
-    @PostMapping("/JudgeTimeTaskPause")
-    public Map<String, Object> JudgeTimeTaskPause(@RequestBody(required = false) Map<String, Object> map){
-        return  tmsTruckFeign.JudgeTimeTaskPause(map);
-    }
-
-
-    @ApiOperation(value="对内转车辆装货点进行统计")
-    @PostMapping("/getLoading")
-    public Map<String, Object> getLoading(@RequestBody(required=false) Map<String,Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             String startTime,
-                                             String endTime
-    ){
-        return tmsTruckFeign.getLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
-    }
-
-
-    @ApiOperation(value="对内转车辆装货点进行统计")
-    @PostMapping("/getLoaderResult")
-    public Map<String, Object> getLoaderResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          String startTime,
-                                          String endTime
-    ){
-        return tmsTruckFeign.getLoaderResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
-    }
-
-
-
-
-
-    @ApiOperation(value="对内转车辆装卸货点进行统计")
-    @PostMapping("/getUnLoading")
-    public Map<String, Object> getUnLoading(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          String startTime,
-                                          String endTime
-    ){
-        return tmsTruckFeign.getUnLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
-    }
-
-
-
-
-
-
-
-    @ApiOperation(value="查询零星中转统计报表")
-    @PostMapping("/getLXInwardReport")
-    public Map<String, Object> getLXInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           String startTime,
-                                           String endTime,
-                                                 String con
-    ){
-        return tmsTruckFeign.getLXInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,con);
-    }
-
-
-    @ApiOperation(value="拼装车内转统计报表")
-    @PostMapping("/getInwardReportForAssemble")
-    public Map<String, Object> getInwardReportForAssemble(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 String startTime,
-                                                 String endTime,BigDecimal orderType, String index, String isPage,String orgCode
-
-    ){
-        return tmsTruckFeign.getInwardReportForAssemble(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,orderType,index,isPage,orgCode);
-    }
-
-
-    @ApiOperation("保卫部随机抽查车牌号")
-    @PostMapping("/getCapacityByDefend")
-    public Map<String,Object> getCapacityByDefend(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                  Integer apiId,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  String startTime,
-                                                  String endTime,
-                                                  String con,
-                                                  String yes){
-        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con,yes);
-    }
-
-    @ApiOperation("厂外抵达作业")
-    @PostMapping("/getReceiptResult")
-    public Map<String,Object> getReceiptResult(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                  Integer apiId,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  String con,
-                                                  String startTime,
-                                                  String endTime){
-        return tmsTruckFeign.getReceiptResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
-    }
-
-    @ApiOperation("展示满货箱的照片")
-    @PostMapping("/getReceiptPhoto")
-    public String getReceiptPhoto(@RequestParam String orderNumber){
-        return tmsTruckFeign.getReceiptPhoto(orderNumber);
-    }
-
-
-    @ApiOperation("厂外收货作业")
-    @PostMapping("/getReceivingResult")
-    public Map<String,Object> getReceivingResult(@RequestBody(required = false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               String con,
-                                               String startTime,
-                                               String endTime){
-        return tmsTruckFeign.getReceivingResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
-    }
-
-    @ApiOperation("展示收货的照片")
-    @PostMapping("/getReceivingPhoto")
-    public Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber){
-        return tmsTruckFeign.getReceivingPhoto(orderNumber);
-    }
-    @ApiOperation("展示收货的照片")
-    @PostMapping("/getReceivingPhotoByUrl")
-    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber) throws Exception {
-        Map<String,Object> map=tmsTruckFeign.getReceivingPhotoByUrl(orderNumber);
-        if(map.containsKey("resultEmptyContainerPhoto") && map.get("resultEmptyContainerPhoto")!=null){
-            String resultEmptyContainerPhoto = (String) imageFileUtils.downloadFile(map.get("resultEmptyContainerPhoto").toString());
-            map.put("resultEmptyContainerPhoto",resultEmptyContainerPhoto);
-        }
-        if(map.containsKey("resultSignedNotePhoto") && map.get("resultSignedNotePhoto")!=null){
-            String resultSignedNotePhoto = (String) imageFileUtils.downloadFile(map.get("resultSignedNotePhoto").toString());
-            map.put("resultSignedNotePhoto",resultSignedNotePhoto);
-        }
-        return map;
-    }
-
-
-    @ApiOperation("根据船舶位置查询船舶动态")
-    @PostMapping("/getShipLocationStatus")
-    public Map<String,Object> getShipLocationStatus(String shipLocation) {
-        Map<String, Object> map = tmsshipFeign.getShipLocationStatus(shipLocation);
-        return map;
-    }
-    //根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话
-    @ApiOperation(value="根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话", notes="模糊查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "personName",value = "用户输入的输入提货联系人", required = false, dataType = "String")
-    })
-
-    @PostMapping("/getPersonByName")
-    public Map<String,Object>  getPersonByName(@RequestParam(value ="personName")String personName){
-        return tmsshipFeign.getPersonByName(personName);
-
-    }
-
-    //根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话
-    @ApiOperation(value="根据发货通知中用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话", notes="模糊查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "personName",value = "用户输入的输入提货联系人", required = false, dataType = "String")
-    })
-
-    @PostMapping("/getNoticeContactNumberByPerson")
-    public Map<String,Object>  getNoticeContactNumberByPerson(@RequestParam(value ="personName")String personName){
-        return tmsshipFeign.getNoticeContactNumberByPerson(personName);
-
-    }
-
-
-
-
-    @ApiOperation(value="获取内转报表")
-    @PostMapping("/getOutFactoryInwardList")
-    public Map<String, Object> getOutFactoryInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     String startTime,
-                                                     String endTime,
-                                                     String orgCode,
-                                                     String isPage,
-                                                     String index) {
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        return tmsTruckFeign.getOutFactoryInwardList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
-    }
-	
-	@ApiOperation(value = "根据物资名和外轮船名查询采购订单号")
-    @PostMapping(value = "/findPurchaseOrderList")
-    public Map<String, Object> findPurchaseOrderList(@RequestBody(required = false) Map<String, Object> map,
-                                                          Integer apiId,
-                                                          Integer pageNum,
-                                                          Integer pageSize,
-                                                          String materialName,
-                                                          String resultForeignShipName,
-                                                          String supplierName){
-        if(map==null)
-            map=new HashMap<>();
-        System.out.println(map);
-        return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName,supplierName);
-    }
-
-    @ApiOperation(value = "查询待绑定的批次")
-    @PostMapping(value = "/findBatchForBind")
-    public Map<String, Object> findBatchForBind(@RequestBody(required = false) Map<String, Object> map,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     String materialName,
-                                                     String foreignShipName){
-        if(map==null)
-            map=new HashMap<>();
-        return tmsshipFeign.findBatchForBind(map,apiId,pageNum,pageSize,materialName, foreignShipName);
-    }
-
-    @ApiOperation(value = "绑定批次")
-    @PostMapping(value = "bindBatch")
-    Map<String, Object> bindBatch(@RequestBody(required = false) Map<String, Object> map){
-        return tmsshipFeign.bindBatch(map);
-    }
-
-    @ApiOperation(value = "销售钢材统计报表")
-    @PostMapping("/getSaleSteelReport")
-    public Map<String,Object> getSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
-                                                 String startTime,
-                                                 String endTime,
-                                                 String carrierSsoId,
-                                                 String receiveName,
-                                                 String materialName,
-                                                 String specification,
-                                                 String remark,
-                                                 String capacityNo,
-                                                 String carrierName,
-                                                 String consigneeName,
-                                                 String saler,
-                                                 String easPrimaryId){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return tmsTruckFeign.getSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
-    }
-
-    @ApiOperation(value = "销售钢材统计报表")
-    @PostMapping("/getSaleSteelSpellingReport")
-    public Map<String,Object> getSaleSteelSpellingReport(@RequestBody(required = false)Map<String,Object>map){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return tmsTruckFeign.getSaleSteelSpellingReport(map);
-    }
-
-    @ApiOperation(value = "计费详单（未结算）")
-    @PostMapping("/getSaleSteelReportNew")
-    public Map<String,Object> getSaleSteelReportNew(@RequestBody(required = false)Map<String,Object>map,
-                                                 String startTime,
-                                                 String endTime,
-                                                 String carrierSsoId,
-                                                 String receiveName,
-                                                 String materialName,
-                                                 String specification,
-                                                 String remark,
-                                                 String capacityNo,
-                                                 String carrierName,
-                                                 String consigneeName,
-                                                 String saler,
-                                                 String easPrimaryId){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return tmsTruckFeign.getSaleSteelReportNew(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
-    }
-
-
-    @ApiOperation(value = "计费详单（已结算）")
-    @PostMapping("/getSettledSaleSteelReportNew")
-    public Map<String,Object> getSettledSaleSteelReportNew(@RequestBody(required = false)Map<String,Object>map,
-                                                    String startTime,
-                                                    String endTime,
-                                                    String carrierSsoId,
-                                                    String receiveName,
-                                                    String materialName,
-                                                    String specification,
-                                                    String remark,
-                                                    String capacityNo,
-                                                    String carrierName,
-                                                    String consigneeName,
-                                                    String saler,
-                                                    String easPrimaryId){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return tmsTruckFeign.getSettledSaleSteelReportNew(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
-    }
-
-    @ApiOperation(value = "销售钢材未装统计报表")
-    @PostMapping("/loadingSaleSteelReport")
-    public Map<String,Object> loadingSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
-                                                 String startTime,
-                                                 String endTime,
-                                                 String carrierSsoId,
-                                                 String receiveName,
-                                                 String materialName,
-                                                 String specification,
-                                                 String remark,
-                                                 String capacityNo,
-                                                 String carrierName,
-                                                 String consigneeName,
-                                                 String saler,
-                                                 String easPrimaryId){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return tmsTruckFeign.loadingSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
-    }
-
-
-    @ApiOperation(value = "销售钢材统计报表")
-    @PostMapping("/getInwardSaleSteelReport")
-    public Map<String,Object> getInwardSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
-                                                 String startTime,
-                                                 String endTime,
-                                                 String carrierSsoId,
-                                                 String receiveName,
-                                                 String materialName,
-                                                 String specification,
-                                                 String remark,
-                                                 String capacityNo,
-                                                 String carrierName,
-                                                 String consigneeName,
-                                                 String saler){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return tmsTruckFeign.getInwardSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler);
-    }
-
-    @ApiOperation(value = "销售钢材派单列表")
-    @PostMapping("/getInwardSaleSteelOrder")
-    public Map<String,Object> getInwardSaleSteelOrder(@RequestBody(required = false)Map<String,Object>map,
-                                                       String startTime,
-                                                       String endTime,
-                                                       String remark,
-                                                       String capacityNo,
-                                                       String consigneeName,
-                                                       String saler){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return tmsTruckFeign.getInwardSaleSteelOrder(map,startTime,endTime,remark,capacityNo,consigneeName);
-    }
-
-    @ApiOperation(value = "发送短信")
-    @PostMapping("sendMeaage")
-    public Map<String,Object> sendMeaage(@RequestParam String mobile,
-                                         @RequestParam String content){
-        return tmsTruckFeign.sendMeaage(mobile,content);
-    }
-
-    /**
-     * 修改三程船装船作业明细
-     * @param
-     * @return
-     */
-    @PostMapping("/updateThreeSectionDetails")
-    public Map<String,Object> updateThreeSectionDetails(@RequestBody(required = false) Map<String, Object> mapVal){
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return tmsshipFeign.updateThreeSectionDetails(mapVal);
-    }
-
-    @PostMapping("/addPleaseResult")
-    public Map<String,Object> addPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal){
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return tmsshipFeign.addPleaseResult(mapVal);
-    }
-
-    @PostMapping("/editPleaseResult")
-    public Map<String,Object> editPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal){
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return tmsshipFeign.editPleaseResult(mapVal);
-    }
-
-    @PostMapping("/getAllPleaseResult")
-    public Map<String,Object> getAllPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                 @RequestParam Integer pageNum,
-                                                 @RequestParam Integer pageSize,
-                                                 @RequestParam Integer apiId,
-                                                  String con,
-                                                  String startTime,
-                                                  String endTime){
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return tmsshipFeign.getAllPleaseResult(mapVal,pageNum,pageSize,apiId,con,startTime,endTime);
-    }
-
-    @PostMapping("/getPleaseResult/{resultId}")
-    public Map<String,Object> getPleaseResult(@PathVariable("resultId") BigDecimal resultId){
-        return tmsshipFeign.getPleaseResult(resultId);
-    }
-
-    @PostMapping("/getRealNumber")
-    public Map<String,Object> getRealNumber(@RequestBody(required = false) Map<String, Object> map){
-        return tmsshipFeign.getRealNumber(map);
-    }
-
-    @PostMapping("/getWagonWork")
-    public Map<String,Object> getWagonWork(@RequestBody(required = false) Map<String, Object> map){
-        return tmsshipFeign.getWagonWork(map);
-    }
-
-    @PostMapping("/queryNumber")
-    public Map<String,Object> queryNumber(@RequestParam String orderNumber){
-        return tmsTruckFeign.queryNumber(orderNumber);
-    }
-
-    @PostMapping("/changeNumber")
-    public Map<String,Object> changeNumber(@RequestParam String orderNumber){
-        return tmsTruckFeign.changeNumber(orderNumber);
-    }
-
-    @ApiOperation("根据车序号id查询主干数据")
-    @PostMapping("/getSteelReportDetailsBySmId")
-    public Map<String,Object> getSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId){
-        return tmsTruckFeign.getSteelReportDetailsBySmId(saleOrderMaterialId);
-    }
-
-    @PostMapping("/changeOrderLine")
-    public Map<String,Object> changeOrderLine(@RequestBody(required = false) Map<String, Object> map){
-        return tmsTruckFeign.changeOrderLine(map);
-    }
-
-    @ApiOperation("根据车序号id查询主干数据")
-    @PostMapping("/getSaleSteelReportForFinance")
-    public Map<String,Object> getSaleSteelReportForFinance(@RequestParam BigDecimal saleOrderMaterialId){
-        return tmsTruckFeign.getSaleSteelReportForFinance(saleOrderMaterialId);
-    }
+    private TmsFeign tmsFeign;
 
-    @ApiOperation(value = "销售钢材运输情况统计报表")
-    @PostMapping("/steelTransportReport")
-    public Map<String,Object> steelTransportReport(@RequestBody(required = false)Map<String,Object>map,
-                                                     String startTime,
-                                                     String endTime){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return tmsTruckFeign.steelTransportReport(map,startTime,endTime);
-    }
 
-    @ApiOperation(value = "欠运力统计报表")
-    @PostMapping("/yawnReport")
-    public Map<String,Object> yawnReport(@RequestBody(required = false)Map<String,Object>map){
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return tmsTruckFeign.yawnReport(map);
-    }
 }

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

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.feign.QmsFeign;
 import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -23,1101 +22,6 @@ import java.util.Map;
 @RestController
 @RequestMapping("${api.version}/wms")
 public class WMSController extends BaseRESTfulController {
-    @Autowired
-    WMSFeign wmsFeign;
-    @Autowired
-    QmsFeign qmsFeign;
-    @PostMapping("getWmsInboundResult")
-    @ApiOperation(value = "展示入库实绩信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize,
-                                                   Integer warehouseId,
-                                                   String startTime,
-                                                   String endTime) {
-        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
-    }
-    @PostMapping("getWmsInboundResultStatistics")
-    @ApiOperation(value = "展示入库实绩信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "445", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> getWmsInboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize,
-                                                   Integer warehouseId,
-                                                   String startTime,
-                                                   String endTime) {
-        return wmsFeign.getWmsInboundResultStatistics(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
-    }
-    @PostMapping("getWmsInboundResults")
-    @ApiOperation(value = "展示入库实绩信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> getWmsInboundResults(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize,
-                                                   Integer warehouseId,
-                                                   String startTime,
-                                                   String endTime) {
-        return wmsFeign.getWmsInboundResults(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
-    }
-    @PostMapping("getWmsReservedResult")
-    @ApiOperation(value = "展示预留入库实绩信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> getWmsReservedResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize,
-                                                    Integer warehouseId,
-                                                    String con) {
-        return wmsFeign.getWmsReservedResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con);
-    }
-    @PostMapping("getWmspOutboundResult")
-    @ApiOperation(value = "展示出库实绩信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "152", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> getWmspOutboundResult(@RequestBody(required = false) Map<String,Object> map,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     Integer apiId,
-                                                     Integer warehouseId,
-                                                     String startTime,
-                                                     String endTime) {
-        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,warehouseId,startTime,endTime);
-    }
-
-    @PostMapping("/wmspoutboundresults/insertWmspOutBoundResult")
-    @ApiOperation(value = "新增出单实绩并返回出库单详情")
-    public Map<String, Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval) {
-        Map<String, Object> resTfulResult = wmsFeign.insertWmspOutBoundResult(mapval);
-        return resTfulResult;
-    }
-
-    @PostMapping(value = "/deletewmspOutboundResult")
-    public Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId){
-        return wmsFeign.deleteWmspOutboundResult(resultId);
-    }
-
-    @PostMapping("/wmspoutboundresults/insertwmspOutboundScanResult")
-    public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
-        Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
-        return resTfulResult;
-    }
-
-    @PostMapping("/wmspoutboundscanresults/copyWmspOutboundScanResult")
-    public Map<String, Object> copyWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
-        Map<String, Object> resTfulResult = wmsFeign.copyWmspOutboundScanResult(map);
-        return resTfulResult;
-    }
-
-    @PostMapping("/wmspoutboundscanresults/deleteWmspOutboundScanResult")
-    public Map<String, Object> deleteWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
-        Map<String, Object> resTfulResult = wmsFeign.deleteWmspOutboundScanResult(map);
-        return resTfulResult;
-    }
-
-    @PostMapping("/wmspoutboundresults/outbountResultToSuccess")
-    public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
-        return wmsFeign.outbountResultToSuccess(resultId);
-    }
-
-    @PostMapping("/updataResultStatus")
-    public Map<String, Object> updataResultStatus(@RequestParam Integer resultId) {
-        Map<String, Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
-        return resTfulResult;
-    }
-
-    @PostMapping("/getRmsMaterial")
-    public Map<String, Object> getRmsMaterial(@RequestBody(required = false) Map<String, Object> mapval) {
-        Map<String, Object> resTfulResult = wmsFeign.getRmsMaterial(mapval);
-        return resTfulResult;
-    }
-
-    //查询实时库存数据
-    @PostMapping("/selectGridMaterialList")
-    @ApiOperation(value = "展示实时库存数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer apiId,
-                                                      String warehouseId,
-                                                      String time,
-                                                      String con) {
-        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,warehouseId,time,con);
-
-    }
-//    查询仓库中超过库龄预警的物资
-    @PostMapping("/getGridMaterialAgeList")
-    @ApiOperation(value = "查询仓库中超过库龄预警的物资")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> getGridMaterialAgeList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                      Integer warehouseId) {
-        return wmsFeign.getGridMaterialAgeList(mapVal==null?new HashMap<>():mapVal,warehouseId);
-
-    }
-
-    //通过成品仓库网格ID查询实时库存数据
-    @PostMapping("/selectGridMaterialListByGridId")
-    @ApiOperation(value = "通过成品仓库网格ID展示实时库存数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "155", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String,Object> selectGridMaterialListByGridId(BigDecimal gridId) {
-        return wmsFeign.selectGridMaterialListByGridId(gridId);
-
-    }
-
-    //修改物资钢材表的质量是否合格字段和逻辑删除
-    @PostMapping(value = "/updateRmsMaterialSteelDemotion")
-    public Map<String,Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String,Object> map){
-        return wmsFeign.updateRmsMaterialSteelDemotion(map);
-    }
-
-    //钢材异地库出库扫描
-    @PostMapping("/OutScanResultTag")
-    public Map<String, Object> OutScanResultTag(@RequestBody(required = false) Map<String, Object> mapval) {
-        Map<String, Object> resTfulResult = wmsFeign.OutScanResultTag(mapval);
-        return resTfulResult;
-    }
-
-    //钢材异地库出库展示实绩
-    @PostMapping("/getWmsOffsiteLibaryOutboundList")
-    @ApiOperation(value = "展示实时库存数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "164", required = false, dataType = "BigDecimal"),
-    })
-    public Map<String, Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                               Integer pageNum,
-                                                               Integer pageSize,
-                                                               Integer apiId,
-                                                               String con) {
-        return wmsFeign.getWmsOffsiteLibaryOutboundList(mapVal == null ? new HashMap<>() : mapVal, pageNum, pageSize, apiId, con);
-    }
-
-    //展示钢材扫描入库实绩列表
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "165", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping("/getWmsOffsiteLibaryInboundList")
-    public Map<String, Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String, Object> map,
-                                                              Integer pageNum,
-                                                              Integer pageSize,
-                                                              Integer apiId,
-                                                              String con) {
-        return wmsFeign.getWmsOffsiteLibaryInboundList(map == null ? new HashMap<>() : map, pageNum, pageSize, apiId, con);
-    }
-
-    //钢材异地库扫描入库
-    @PostMapping("/ScanResultTag")
-    public Map<String, Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String, Object> map) {
-        Map<String, Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
-        return resTfulResult;
-    }
-    //获取扫描实绩
-    @PostMapping("/getScanResult")
-    public Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map) {
-        Map<String, Object> resTfulResult = wmsFeign.getScanResult(map);
-        return resTfulResult;
-    }
-    //获取已下发的钢材的每个炉号的数量
-    @PostMapping("/getFurnaceNoAmount")
-    public Map<String, Object> getFurnaceNoAmount(@RequestBody(required = false) Map<String, Object> map) {
-        Map<String, Object> resTfulResult = wmsFeign.getFurnaceNoAmount(map);
-        return resTfulResult;
-    }
-    //更新状态
-    @PostMapping("/updateStatus")
-    public Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> map) {
-        Map<String, Object> resTfulResult = wmsFeign.updateStatus(map);
-        return resTfulResult;
-    }
-
-    //展示在途库存数据
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping("/getWmspIntransitInventory")
-    public Map<String, Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                         Integer pageNum,
-                                                         Integer pageSize,
-                                                         Integer apiId,
-                                                         String con) {
-        return wmsFeign.getWmspIntransitInventory(mapVal == null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
-    }
-
-    //新增倒库出库实绩
-    @PostMapping("/insertOutBoundResult")
-    public Map<String, Object> insertOutBoundResult(@RequestBody(required = false) Map<String, Object> map) {
-        Map<String, Object> resTfulResult = wmsFeign.insertOutBoundResult(map);
-        return resTfulResult;
-    }
-
-    //新增倒库出库扫描实绩
-    @PostMapping("/AddWmspOutboundScanResult")
-    public Map<String, Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapVal) {
-        Map<String, Object> resTfulResult = wmsFeign.AddWmspOutboundScanResult(mapVal);
-        return resTfulResult;
-    }
-
-    //通过下拉框筛选数据
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping("/getWmspRestackMakeResultList")
-    public Map<String, Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                            Integer pageNum,
-                                                            Integer pageSize,
-                                                            Integer apiId,
-                                                            Integer warehouseid,
-                                                            Integer stackingId,
-                                                            Integer gradtionNumber) {
-        return wmsFeign.getWmspRestackMakeResultList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, warehouseid, stackingId, gradtionNumber);
-    }
-
-
-    @PostMapping(value = "/addRestackMakeResult")
-    public Map<String,Object> addRestackMakeResult(@RequestBody  Map<String,Object> mapval){
-        return wmsFeign.addRestackMakeResult(mapval);
-    }
-
-    //删除倒垛单
-    @PostMapping("/deleteByResultId/{resultId}")
-    public Map<String, Object> deleteByResultId(@PathVariable String resultId) {
-        Map<String, Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
-        return resTfulResult;
-    }
-
-    //下发倒垛单
-    @PostMapping("/dispatchDistrubtionStatus/{resultId}")
-    public Map<String, Object> dispatchDistrubtionStatus(@PathVariable String resultId) {
-        Map<String, Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
-        return resTfulResult;
-    }
-
-    //下拉框获取层次
-    @GetMapping("/selectGardationNumber")
-    public Map<String, Object> selectGardationNumber(Integer warehouseid, Integer stackingId) {
-        Map<String, Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid, stackingId);
-        return resTfulResult;
-    }
-
-    //下拉框获取仓库名称
-    @GetMapping("/selectWarehouse")
-    public Map<String, Object> selectWarehouse() {
-        Map<String, Object> resTfulResult = wmsFeign.selectWarehouse();
-        return resTfulResult;
-    }
-
-    //下拉框获取仓库名称
-    @GetMapping("/selectStackingId")
-    public Map<String, Object> selectStackingId(Integer warehouseid) {
-        Map<String, Object> resTfulResult = wmsFeign.selectStackingId(warehouseid);
-        return resTfulResult;
-    }
-
-    //展示倒垛单
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping("/selectRestackList")
-    public Map<String, Object> selectRestackList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 Integer apiId,
-                                                 Integer DistrubtionStatus) {
-        return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
-    }
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping("/selectRestackList2")
-    public Map<String, Object> selectRestackList2(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 Integer apiId,
-                                                 Integer DistrubtionStatus) {
-        return wmsFeign.selectRestackList2(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
-    }
-
-    @PostMapping("/editRestackMakeResult")
-    public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
-        Map<String, Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
-
-        return resTfulResult;
-    }
-
-    //渲染倒垛后的仓库信息
-    @PostMapping("/selectAfterWarehouseByResultId/{resultId}")
-    public Map<String, Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId) {
-        Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
-        return resTfulResult;
-    }
-
-    //渲染倒垛后的垛位信息
-    @PostMapping("/selectAfterstackingByResultId/{resultId}")
-    public Map<String, Object> selectAfterstackingByResultId(@PathVariable Integer resultId) {
-        Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
-        return resTfulResult;
-    }
-
-    //PDA展示倒垛单
-    @PostMapping("/selectRestackForPDA")
-    public Map<String, Object> selectRestackForPDA(@RequestBody(required = false) Map<String, Object> map) {
-        Map<String, Object> resTfulResult = wmsFeign.selectRestackForPDA(map);
-        return resTfulResult;
-    }
-
-    //PDA根据实绩id查找物资信息
-    @PostMapping("/selectMaterialInfoByResultId")
-    public Map<String, Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String, Object> map) {
-        Map<String, Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
-        return resTfulResult;
-    }
-
-
-   @ApiImplicitParams({
-           @ApiImplicitParam(value = "395",name = "apiId")
-   })
-    @PostMapping(value = "/getRestackInfoByResultId")
-    public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer apiId
-
-    ){
-        return  wmsFeign.getRestackInfoByResultId(mapVal==null?new HashMap<>():mapVal, pageNum, pageSize, apiId);
-    }
-
-    //PDA根据仓库id查找倒垛单
-    @PostMapping("/selectRestackByWarehouseId")
-    public Map<String, Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String, Object> map) {
-        Map<String, Object> resTfulResult = wmsFeign.selectRestackByWarehouseId(map);
-        return resTfulResult;
-    }
-
-    //扫描吊牌添加扫描实绩
-    @PostMapping("/ScanTagResult")
-    public Map<String, Object> ScanTagResult(@RequestBody(required = false) Map<String, Object> mal) {
-        Map<String, Object> resTfulResult = wmsFeign.ScanTagResult(mal);
-        return resTfulResult;
-    }
-
-    //下发
-    @PostMapping("/Issue")
-    public Map<String, Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList) {
-        Map<String, Object> resTfulResult = wmsFeign.Issue(mapList);
-        return resTfulResult;
-    }
-
-    /**
-     * 2.展示退库实绩信息
-     *
-     * @param mapValue
-     * @param apiId
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @PostMapping("/getWmsReboundResult")
-    @ApiOperation(value = "展示退库实绩信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "161", required = false, dataType = "BigDecimal"),
-    })
-    public RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             String con) {
-        return wmsFeign.getWmsReboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @PostMapping("/selectScanResultByIboundResultId")
-    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
-    })
-    public RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                          @RequestParam Integer apiId,
-                                                          @RequestParam Integer pageNum,
-                                                          @RequestParam Integer pageSize,
-                                                          @RequestParam Integer inboundId
-    ) {
-        return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
-    }
-    //根据物资信息获取原来垛位信息
-    @PostMapping("/selectInfoByMaterialCode")
-    public Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal) {
-        if (mal == null) {
-            mal = new HashMap<>();
-        }
-        return  wmsFeign.selectInfoByMaterialCode(mal);
-    }
-    //根据仓库查询未接收的垛位
-    @PostMapping("/selectStackingInfoByWarehouseId")
-    public Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal) {
-        if (mal == null) {
-            mal = new HashMap<>();
-        }
-        return  wmsFeign.selectStackingInfoByWarehouseId(mal);
-    }
-
-    @PostMapping("/getWmsIvboundResult")
-    @ApiOperation(value = "展示倒库实绩信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "162", required = false, dataType = "BigDecimal"),
-    })
-    public RESTfulResult getWmsIvboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize) {
-        return wmsFeign.getWmsIvboundResult(mapValue, apiId, pageNum, pageSize);
-    }
-
-
-    /**
-     * 展示倒库物资实绩
-     *
-     * @param mapValue
-     * @param apiId
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @PostMapping("/getWmsIvboundMaterialt")
-    @ApiOperation(value = "展示倒库物资实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "163", required = false, dataType = "BigDecimal"),
-    })
-    public RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize) {
-        return wmsFeign.getWmsIvboundMaterial(mapValue, apiId, pageNum, pageSize);
-    }
-
-    @PostMapping("/getInventoryCheck")
-    @ApiOperation(value = "展示库存盘点实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "94", required = false, dataType = "BigDecimal"),
-    })
-    public RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           String  con) {
-        return wmsFeign.getInventoryCheck(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @PostMapping("/getInventoryClose")
-    @ApiOperation(value = "展示库存结转实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "95", required = false, dataType = "BigDecimal"),
-    })
-    public RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           String  value) {
-        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,value);
-    }
-    //库存结转定时器
-    @PostMapping("/addInventoryClose")
-    @ApiOperation(value = "库存结转定时器")
-    public RESTfulResult addInventoryClose(){
-        return wmsFeign.addInventoryClose();
-    }
-
-    @PostMapping("/getSendReceive")
-    @ApiOperation(value = "展示收发存实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
-    })
-    public RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        Integer apiId,
-                                        Integer pageNum,
-                                        Integer pageSize,
-                                        String con,
-                                        String startTime,
-                                        String endTime) {
-        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
-    }
-
-    /**
-     * 展示未下发吊钢工扫描吊牌实绩
-     *
-     * @return
-     */
-    @ApiOperation(value = "展示未下发吊钢工扫描吊牌实绩")
-    @PostMapping("/getTagResult")
-    public Map<String, Object> getTagResult() {
-        return wmsFeign.getTagResult();
-    }
-
-    /**
-     * 展示正常入库吊钢工扫描吊牌实绩
-     *
-     * @return
-     */
-    @ApiOperation(value = "展示正常入库吊钢工扫描吊牌实绩")
-    @PostMapping("/getIssuedTagResult")
-    public Map getIssuedTagResult() {
-        return wmsFeign.getIssuedTagResult();
-    }
-
-    /**
-     * 展示异常入库吊钢工扫描吊牌实绩
-     *
-     * @return
-     */
-    @ApiOperation(value = "展示异常入库吊钢工扫描吊牌实绩")
-    @PostMapping("/getIssuedTagNoResult")
-    public Map getIssuedTagNoResult() {
-        return wmsFeign.getIssuedTagNoResult();
-    }
-
-    /**
-     * 展示已退库吊钢工扫描吊牌实绩
-     *
-     * @return
-     */
-    @ApiOperation(value = "展示已退库吊钢工扫描吊牌实绩")
-    @PostMapping("/getReIssuedResult")
-    public Map getReIssuedResult() {
-        return wmsFeign.getIssuedResult();
-    }
-
-    /**
-     * 展示未下发退库吊钢工扫描吊牌实绩
-     *
-     * @return
-     */
-    @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
-    @PostMapping("/getReTagResult")
-    public Map getReTagResult() {
-        return wmsFeign.getReTagResult();
-    }
-
-    /**
-     * 展示已倒库入库吊钢工扫描吊牌实绩
-     *
-     * @return
-     */
-    @ApiOperation(value = "展示已倒库入库吊钢工扫描吊牌实绩")
-    @PostMapping("/getIvIssuedResult")
-    public Map getIvIssuedResult() {
-        return wmsFeign.getIvIssuedResult();
-    }
-
-    /**
-     * 展示未下发退库吊钢工扫描吊牌实绩
-     *
-     * @return
-     */
-    @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
-    @PostMapping("/getIvTagResult")
-    public Map getIvTagResult() {
-        return wmsFeign.getIvTagResult();
-    }
-
-    /**
-     * 新增入库实绩
-     *
-     * @param mapList
-     * @return
-     */
-    @ApiOperation("新增入库实绩")
-    @PostMapping("/insertInboundResult")
-    @Transactional
-    public Map<String,Object> addInvoice(@RequestBody(required = false) List<Map<String, Object>> mapList) {
-        return wmsFeign.insertInboundResult(mapList);
-    }
-
-    /**
-     * 新增退库实绩
-     *
-     * @param mapList
-     * @return
-     */
-    @ApiOperation("新增退库实绩")
-    @PostMapping("/insertReboundResult")
-    @Transactional
-    public String addReboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
-        /*
-        获取入库物资件数
-         */
-        int size = mapList.size();
-        /*
-        获取入库垛位
-         */
-        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
-        String stackNo = (String) map1.get("stackNo");
-        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
-        for (Map<String, Object> map : mapList
-        ) {
-            map.put("stackingId", stackId);
-        }
-        wmsFeign.insertReboundResult(mapList);
-        return stackNo;
-    }
-
-    /**
-     * 新增倒库入库实绩
-     *
-     * @param mapList
-     * @return
-     */
-    @ApiOperation("新增倒库入库实绩")
-    @PostMapping("/insertIvboundResult")
-    @Transactional
-    public String addIvboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
-        /*
-        获取入库物资件数
-         */
-        int size = mapList.size();
-        /*
-        获取入库垛位
-         */
-        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
-        String stackNo = (String) map1.get("stackNo");
-        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
-        for (Map<String, Object> map : mapList
-        ) {
-            map.put("stackingId", stackId);
-        }
-        wmsFeign.insertIvboundResult(mapList);
-        return stackNo;
-    }
-
-    /**
-     * 展示入库垛位
-     *
-     * @param DriverId
-     * @return
-     */
-    @PostMapping("/getInboundStack")
-    @ApiOperation(value = "展示入库垛位")
-    public Integer getInboundStack(Integer DriverId) {
-        return wmsFeign.getInboundStack(DriverId);
-    }
-
-    /**
-     * 新增库存盘点
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping("/inventoryCheck")
-    @ApiOperation(value = "新增库存盘点")
-    public Map<String, Object> inventoryCheck(@RequestBody(required = false) Map<String, Object> map) {
-        return wmsFeign.inventoryCheck(map);
-    }
-
-    /**
-     * 新增入库扫描吊牌实绩
-     *
-     * @param map
-     * @return
-     */
-    @ApiOperation(value = "新增入库扫描吊牌实绩")
-    @PostMapping("/inboundScanResult/insertResult")
-    @Transactional
-    public Map<String, Object> insertResult(@RequestBody(required = false) Map<String, Object> map) {
-        return wmsFeign.insertResult(map);
-    }
-
-    /**
-     * 新增退库扫描吊牌实绩
-     *
-     * @param map
-     * @return
-     */
-    @ApiOperation(value = "新增退库扫描吊牌实绩")
-    @PostMapping("/insertReboundScanResult")
-    @Transactional
-    public Map<String, Object> insertReboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
-        return wmsFeign.insertReboundScanResult(map);
-    }
-
-    /**
-     * 新增倒库入库扫描吊牌实绩
-     *
-     * @param map
-     * @return
-     */
-    @ApiOperation(value = "新增倒库入库扫描吊牌实绩")
-    @PostMapping("/insertIvboundScanResult")
-    @Transactional
-    public Map<String, Object> insertIvboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
-        return wmsFeign.insertIvboundScanResult(map);
-    }
-
-    /**
-     * 根据实绩id查找物资唯一编码是否已经稽核完成
-     */
-    @PostMapping("/selectMaterialSteelIdByReusltId")
-    @Transactional
-    public Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map) {
-        return wmsFeign.selectMaterialSteelIdByReusltId(map);
-    }
-
-    //下发指令给行车工
-    @PostMapping("/updateInstruction")
-    public Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map) {
-        return wmsFeign.updateInstruction(map);
-    }
-
-
-
-    @PostMapping("/getIvboundMakeResultList")
-    @ApiOperation(value = "展示倒库列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
-    })
-    public RESTfulResult getIvboundMakeResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                          Integer pageNum,
-                                                          Integer pageSize,
-                                                          Integer apiId,
-                                                          String con) {
-
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return wmsFeign.getIvboundMakeResultList(mapValue, pageNum, pageSize, apiId, con);
-    }
-
-    /**
-     * 新增倒库作业
-     * @param mapValue
-     * @return
-     */
-    @PostMapping(value = "/addIvboundMakeResult")
-    public Map<String,Object> addIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
-        return wmsFeign.addIvboundMakeResult(mapValue);
-    }
-
-    /**
-     * 逻辑删除倒库作业
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/deleteIvboundMakeResult/{resultId}")
-    public Map<String,Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
-        return wmsFeign.deleteIvboundMakeResult(resultId);
-    }
-
-    /**
-     * 查询倒库作业
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/selectIvboundMakeResult/{resultId}")
-    public List<Map<String,Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
-        return wmsFeign.selectIvboundMakeResult(resultId);
-    }
-
-    /**
-     * 修改倒库作业
-     * @param mapValue
-     * @return
-     */
-    @PostMapping(value = "/updateIvboundMakeResult")
-    public Map<String,Object> updateIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
-        return wmsFeign.updateIvboundMakeResult(mapValue);
-    }
-    //下发给行车工
-    @PostMapping("/IssueToCrane")
-    Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map){
-        return wmsFeign.IssueToCrane(map);
-    }
-    //新增入库实绩
-    @PostMapping("/inboundResult/insertInboundResult")
-    public  RESTfulResult addInvoice(@RequestParam("userName") String userName,@RequestParam("groupId") BigDecimal groupId,@RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList){
-
-
-        return wmsFeign.addInvoice(userName,groupId,personnelWorkshopid,mapList);
-    }
-    //抢单
-    @PostMapping("/wmspinbounddistributes/grabDistribute")
-    public  RESTfulResult grabDistribute( @RequestBody Map<String,Object> mapValue){
-        return wmsFeign.grabDistribute(mapValue);
-    }
-
-    @GetMapping("/wmspinbounddistributes/getNewDistribute")
-    public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid){
-        return wmsFeign.getNewDistribute(personnelWorkshopid);
-    }
-
-
-//    @PostMapping("/createRestackMakeResult")
-//    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
-//                                                  @RequestParam("beforeLevel")BigDecimal  beforeLevel,
-//                                                  @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
-//                                                  @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
-//                                                  @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
-//                                                  @RequestParam("resultRemark")String resultRemark,
-//                                                  @RequestBody(required = false) List<Map<String,Object>> mps){
-//        return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
-//    }
-
-
-
-
-        //    获取物资类型
-        @PostMapping(value = "/getMaterialTypeList")
-        public Map<String, Object> getMaterialTypeList (@RequestParam("warehouseid") String warehouseid,
-                @RequestParam("stackingId") BigDecimal stackingId,
-                @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
-                @RequestParam("pageNum") Integer pageNum,
-                @RequestParam("pageSize") Integer pageSize,
-                @RequestParam("apiId") Integer apiId){
-            return wmsFeign.getMaterialTypeList(warehouseid, stackingId, gradtionNumber, pageNum, pageSize, apiId);
-        }
-
-
-    @ApiOperation("进入出库扫码页面，查询出库物资信息详情")
-    @GetMapping("/wmspoutboundresults/getInitOutboundScanResultMaterialInfo")
-    @ApiImplicitParam(name = "resultId",value = "出库实绩id",paramType = "BigDecimal",required = true)
-    public RESTfulResult getInitOutboundScanResultMaterialInfo(@RequestParam(value = "resultId",required = true) BigDecimal resultId){
-        return wmsFeign.getInitOutboundScanResultMaterialInfo(resultId);
-    }
-
-    @PostMapping("/wmspoutboundresults/deleteGridMaterial")
-    public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode){
-        return wmsFeign.deleteGridMaterial(materialOnlyCode);
-    }
-
-    @PostMapping(value = "/createRestackMakeResult")
-    public Map<String, Object> createRestackMakeResult (@RequestParam("keeperId") BigDecimal keeperId,
-                                                        @RequestParam("beforeLevel") BigDecimal beforeLevel,
-                                                        @RequestParam(name = "afterStackingId", defaultValue = "20") BigDecimal afterStackingId,
-                                                        @RequestParam("afterWarehouseId") BigDecimal afterWarehouseId,
-                                                        @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
-                                                        @RequestParam("resultRemark") String resultRemark,
-                                                        @RequestBody(required = false) List < Map < String, Object >> mps){
-        return wmsFeign.createRestackMakeResult(keeperId, beforeLevel, afterStackingId, afterWarehouseId, afterBeforeStackingId, resultRemark, mps);
-    }
-
-    //修改实时库存,针对倒垛
-    @PostMapping(value = "/updateWmspGridMaterialForRestack")
-    public Map<String, Object> updateWmspGridMaterialForRestack (@RequestBody Map < String, Object > mapValue){
-        return wmsFeign.updateWmspGridMaterialForRestack(mapValue);
-    }
-
-
-    //修改实时库存,针对倒垛
-    @PostMapping(value = "/getStockTakingList")
-    public Map<String, Object> getStockTakingList (@RequestParam(value = "pageNum") Integer pageNum,
-                                                   @RequestParam(value = "pageSize") Integer pageSize,
-                                                   @RequestParam(value = "apiId") Integer apiId){
-        return wmsFeign.getStockTakingList(pageNum, pageSize, apiId);
-    }
-    //    根据倒垛单ID获得物资类型
-    @GetMapping(value = "getRestackMakeTypeResult")
-    public Map<String, Object> getRestackMakeTypeResult (@RequestParam("restackMake") String restackMake,
-                                                         @RequestParam("context") String context){
-        return wmsFeign.getRestackMakeTypeResult(restackMake, context);
-    }
-    //    改变已经稽核的吊牌信息
-    @GetMapping(value = "changeRestackMakeResult")
-    public int changeRestackMakeResult (@RequestParam("restackMake") String restackMake){
-        return wmsFeign.changeRestackMakeResult(restackMake);
-
-    }
-
-    //PDA根据仓库id查找倒垛单
-    @GetMapping(value = "selectRestackByWarehouseIds")
-    public Map<String, Object> selectRestackByWarehouseIds(@RequestParam("warehouseid") String warehouseid) {
-        return wmsFeign.selectRestackByWarehouseIds(warehouseid);
-    }
-
-    //修改实时库存,针对倒垛
-    @PostMapping(value = "/insertStockTaking")
-    public Map<String,Object> insertStockTaking(@RequestParam(value = "warehouseId") String warehouseId,
-                                                @RequestParam(value = "materialCode") String materialCode,
-                                                @RequestParam(value = "quantity") Integer quantity) {
-        return wmsFeign.insertStockTaking(warehouseId,materialCode,quantity);
-    }
-    //修改入库转预留作业,针对预留
-    @PostMapping(value = "/insertReserved")
-    public Map<String,Object> insertReserved(@RequestParam(value = "warehouseId") String warehouseId,
-                                             @RequestParam(value = "materialCode") String materialCode,
-                                             @RequestParam(value = "materialSpecification") String materialSpecification,
-                                             @RequestParam(value = "materialModel") String materialModel,
-                                             @RequestParam(value = "quantity") Integer quantity,
-                                             @RequestParam String actuallyWeight,
-                                             @RequestParam String materialTheWeight,
-                                             @RequestParam(value = "remark") String remark) {
-        return wmsFeign.insertReserved(warehouseId,materialCode,materialSpecification,materialModel,quantity,actuallyWeight,materialTheWeight,remark);
-    }
-
-    //修改预留转入库作业,针对预留
-    @PostMapping(value = "/insertInbounds")
-    public Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
-                                             @RequestParam(value = "materialCode") String materialCode,
-                                             @RequestParam(value = "materialSpecification") String materialSpecification,
-                                             @RequestParam(value = "materialModel") String materialModel,
-                                             @RequestParam(value = "quantity") Integer quantity) {
-        return wmsFeign.insertInbounds(warehouseId,materialCode,materialSpecification,materialModel,quantity);
-    }
-//    查询所有的钢材物资信息
-    @PostMapping(value = "/getSteelMaterialList")
-    public Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer apiId,
-                                                  Integer warehouseId,
-                                                   String con) {
-        return wmsFeign.getSteelMaterialList(mapVal ==null? new HashMap<>():mapVal,pageNum,pageSize,apiId,warehouseId,con);
-    }
-    //    查询所有的钢材物资信息
-    @PostMapping(value = "/getSteelWarehouseList")
-    public Map<String,Object> getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                                   Integer apiId,
-                                                    Integer pageNum,
-                                                    Integer pageSize,
-                                                   String con) {
-        return wmsFeign.getSteelWarehouseList(mapVal ==null? new HashMap<>():mapVal,apiId,pageNum,pageSize,con);
-    }
-    //    查询所有的钢材物资规格型号信息
-    @PostMapping(value = "/getSteelMaterialModelList")
-    public Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                        @RequestParam(value = "pageNum") Integer pageNum,
-                                                        @RequestParam(value = "pageSize") Integer pageSize,
-                                                        @RequestParam(value = "apiId") Integer apiId,
-                                                        @RequestParam(value = "warehouseId") Integer warehouseId,
-                                                        @RequestParam(value = "status") Integer status,
-                                                        @RequestParam(value = "startTime",required = false)String startTime,
-                                                        @RequestParam(value = "endTime",required = false)String endTime,
-                                                        @RequestParam(value = "con") String con) {
-        return wmsFeign.getSteelMaterialModelList(mapValue ==null? new HashMap<>():mapValue,pageNum,pageSize,apiId,warehouseId,status,startTime,endTime,con);
-    }
-//    根据对应的入库实绩id修改入库状态为预留
-    @PostMapping("/changeReserved")
-    @ApiOperation(value = "根据对应的入库实绩id修改入库状态为预留")
-    public int changeReserved(@RequestBody(required = false) List<Map<String, Object>> mapList) {
-        return wmsFeign.changeReserved(mapList);
-    }
-
-    @PostMapping("/getWmsOutboundResultStatistics")
-    @ApiOperation(value = "展示炉号对应的出厂数量")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "446", required = false, dataType = "BigDecimal"),
-    })
-    public RESTfulResult getWmsOutboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        Integer apiId,
-                                        Integer pageNum,
-                                        Integer pageSize,
-                                        Integer warehouseId,
-                                        String con,
-                                        String startTime,
-                                        String endTime) {
-        return wmsFeign.getWmsOutboundResultStatistics(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con,startTime,endTime);
-    }
-
-    //删除扫码吊牌
-    @PostMapping("/undoInbound")
-    @ApiOperation(value = "删除扫码吊牌")
-    public Map<String, Object> undoInbound(@RequestParam("inboundId") BigDecimal inboundId){
-        return wmsFeign.undoInbound(inboundId);
-    }
-
-    @PostMapping("/disorderlyOutbound")
-    @ApiOperation(value = "")
-    public Map<String, Object> disorderlyOutbound(@RequestBody Map<String,Object> map){
-        return wmsFeign.disorderlyOutbound(map);
-    }
-
-
-    @ApiOperation(value="船舶动态表展示库存吨位", notes="分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "158", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping(value = "/gePortStockList")
-    public Map<String,Object> gePortStockList(@RequestBody(required = false) Map<String,Object> mapVal
-    ){
-        return wmsFeign.gePortStockList(mapVal);
-    }
-
-    @ApiOperation(value = "站台入库作业")
-    @PostMapping("platformInbound")
-    public Map<String,Object> platformInbound(@RequestBody Map<String,Object> map){
-        return wmsFeign.platformInbound(map);
-    }
-
-    @ApiOperation(value = "站台出库作业")
-    @PostMapping("afterInwardOutbound")
-    public Map<String,Object> afterInwardOutbound(@RequestBody Map<String,Object> map){
-        return wmsFeign.afterInwardOutbound(map);
-    }
-
-    @ApiOperation("获取理重信息")
-    @PostMapping("getTheoreticalByInfo")
-    public Map<String,Object> getTheoreticalByInfo(@RequestParam String warehouseId,
-                                                   @RequestParam String  materialCode,
-                                                   @RequestParam String materialSpecification,
-                                                   @RequestParam String materialModel,
-                                                   @RequestParam Integer status,
-                                                   @RequestParam Integer num){
-        return wmsFeign.getTheoreticalByInfo(warehouseId,materialCode,materialSpecification,materialModel,status,num);
-    }
-
-    @ApiOperation("获取上传金蝶信息")
-    @PostMapping("getInboundEasInfo")
-    public Map<String,Object> getInboundEasInfo(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer warehouseId,
-                                                String startTime,
-                                                String endTime){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        return wmsFeign.getInboundEasInfo(mapValue,apiId,pageNum,pageSize,warehouseId,startTime,endTime);
-    }
-
-    @ApiOperation("撤销上传金蝶")
-    @PostMapping("reduceInboundEas")
-    public Map<String,Object> reduceInboundEas(Integer inboundEasId){
-        return wmsFeign.reduceInboundEas(inboundEasId);
-    }
-
-    @ApiOperation("listAfterInwardOutbound")
-    @PostMapping("listAfterInwardOutbound")
-    public Map<String,Object> listAfterInwardOutbound(@RequestBody List<Map<String,Object>>mapList){
-        return wmsFeign.listAfterInwardOutbound(mapList);
-    }
-
-    @PostMapping(value = "/deleteInboundMaterial")
-    public Map<String,Object> deleteInboundMaterial(@RequestParam(value = "warehouseId") String warehouseId,
-                                             @RequestParam(value = "materialCode") String materialCode,
-                                             @RequestParam(value = "materialSpecification") String materialSpecification,
-                                             @RequestParam(value = "materialModel") String materialModel,
-                                             @RequestParam(value = "quantity") Integer quantity) {
-        return wmsFeign.deleteInboundMaterial(warehouseId,materialCode,materialSpecification,materialModel,quantity);
-    }
-
-    @PostMapping("/recordScanResult")
-    public Map<String,Object> recordScanResult(@RequestBody Map<String,Object> map) {
-        return wmsFeign.recordScanResult(map);
-    }
+   
 }
 

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

@@ -1,228 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.feign.WMSHFeign;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:HuJianGuo
- * @GreateTime:2021/10/12 9:54
- * @Version:V2.0
- */
-@RestController
-@RequestMapping("${api.version}/wmsh")
-public class WMSHController extends BaseRESTfulController {
-
-    @Autowired
-    WMSHFeign wmshFeign;
-
-    /**
-     * 展示下游港口港存库库存列表
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getUnloadPortStockList")
-    @ApiOperation(value = "展示下游港口港存库库存列表")
-    public RESTfulResult getUnloadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return wmshFeign.getUnloadPortStockList(mapValue, pageNum, pageSize, apiId);
-    }
-
-
-    /**
-     * 展示下游港口港存库库存列表
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getLoadPortStockByMaterialName")
-    @ApiOperation(value = "展示下游港口港存库库存列表")
-    public RESTfulResult getLoadPortStockByMaterialName(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer apiId,
-                                                        String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return wmshFeign.getLoadPortStockByMaterialName(mapValue, pageNum, pageSize, apiId,con);
-    }
-
-
-    @PostMapping("getUnLockPortStock")
-    @ApiOperation(value = "展示万州港口港存库库存列表")
-    public RESTfulResult getUnLockPortStock(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer apiId,
-                                                  String con,
-                                            String activeName,
-                                            String startTime,
-                                            String endTime) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return wmshFeign.getUnLockPortStock(mapValue, pageNum, pageSize, apiId,con,activeName,startTime,endTime);
-    }
-
-
-    @PostMapping("selectLoadResult")
-    @ApiOperation(value = "展示万州港口港存库库存列表")
-    public Map<String, Object> selectLoadResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return wmshFeign.selectLoadResult(mapValue,con);
-    }
-
-    /**
-     * 展示万州港港存库库存列表
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getLoadPortStockList")
-    @ApiOperation(value = "展示万州港港存库库存列表")
-    public RESTfulResult getLoadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer apiId,
-                                               String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return wmshFeign.getLoadPortStockList(mapValue, pageNum, pageSize, apiId,con);
-    }
-
-    @PostMapping("getDownPortStockList")
-    @ApiOperation(value = "下游港口库存")
-    public RESTfulResult getDownPortStockList(@RequestBody(required = false) Map<String, Object> mapValue) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return wmshFeign.getDownPortStockList(mapValue);
-    }
-
-    @PostMapping("getRunStockList")
-    @ApiOperation(value = "在途库存")
-    public RESTfulResult getRunStockList(@RequestBody(required = false) Map<String, Object> mapValue) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return wmshFeign.getRunStockList(mapValue);
-    }
-    /**
-     * 查询所有港存库入库实绩
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getInBoundResult")
-    @ApiOperation(value = "查询所有港存库入库实绩")
-    public RESTfulResult getInBoundResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return wmshFeign.getInBoundResult(mapValue, apiId, pageNum, pageSize);
-    }
-
-    /**
-     * 查询所有港存库出库实绩
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping("getOutBoundResult")
-    @ApiOperation(value = "查询所有港存库入库实绩")
-    public RESTfulResult getOutBoundResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return wmshFeign.getOutBoundResult(mapValue, apiId, pageNum, pageSize);
-    }
-
-    @PostMapping("getResultById/{resultId}")
-    @ApiOperation(value = "通过实绩Id查询实绩")
-    RESTfulResult getResultById(@PathVariable("resultId") Integer resultId) {
-        return wmshFeign.getResultById(resultId);
-    }
-
-    @PostMapping("deleteWareHosingResult/{resultId}")
-    @ApiOperation(value = "逻辑删除港存库入库实绩")
-    RESTfulResult deleteWareHosingResult(@PathVariable("resultId") Integer resultId) {
-        return wmshFeign.deleteWareHosingResult(resultId);
-    }
-
-    @PostMapping("updateWareHosingResult")
-    @ApiOperation(value = "修改港存库入库实绩")
-    RESTfulResult updateWareHosingResult(@RequestBody Map<String, Object> wmshInboundResult) {
-        return wmshFeign.updateWareHosingResult(wmshInboundResult);
-    }
-
-    @PostMapping("addWarehousingResult")
-    @ApiOperation(value = "添加港存库入库实绩")
-    RESTfulResult addWarehousingResult(@RequestBody Map<String, Object> wmshInboundResult) {
-        return wmshFeign.addWarehousingResult(wmshInboundResult);
-    }
-
-    @PostMapping("clearWmshGridMaterial")
-    @ApiOperation(value = "清场远程调用")
-    RESTfulResult clearWmshGridMaterial(@RequestBody Map<String, Object> wmshInboundResult) {
-        return wmshFeign.clearWmshGridMaterial(wmshInboundResult);
-    }
-
-
-
-    @PostMapping("addResult")
-    @ApiOperation(value = "添加港存库出库实绩")
-    RESTfulResult addResult(@RequestBody Map<String, Object> map) {
-        return wmshFeign.addResult(map);
-    }
-
-    @PostMapping("findInboundDetail")
-    @ApiOperation(value = "查询点后批次入库操作详情")
-    RESTfulResult findInboundDetail(@RequestBody Map<String, Object> map) {
-        return wmshFeign.findInboundDetail(map);
-    }
-
-    @PostMapping("findOutboundDetail")
-    @ApiOperation(value = "查询点后批次出库操作详情")
-    RESTfulResult findOutboundDetail(@RequestBody Map<String, Object> map) {
-        return wmshFeign.findOutboundDetail(map);
-    }
-}

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

@@ -1,40 +0,0 @@
-package com.steerinfo.dil.controller;
-
-
-import com.steerinfo.dil.feign.OtmsFeign;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("apis")
-public class ZhongJiaoXingLuContoller {
-
-    @Autowired
-    private OtmsFeign otmsFeign;
-
-    //偏离预警回调示例
-    @PostMapping("/abnormalLineWarn")
-    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception {
-        otmsFeign.abnormalLineWarn(data);
-
-        return "success";
-    }
-    //停车预警回调示例
-    @PostMapping("/parkWarn")
-    public String parkWarn(@RequestParam(value = "data") String data) throws Exception {
-        otmsFeign.parkWarn(data);
-        return "success";
-    }
-    //离线预警回调示例
-    @PostMapping("/offLineWarn")
-    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception {
-
-        otmsFeign.offLineWarn(data);
-        return "success";
-    }
-
-
-}

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @GreateTime:2021/9/23 8:46
  * @Version:V2.0
  */
-@FeignClient(value = "DIL-AMS-API-DEV", url = "${openfeign.AmsFeign.url}")
+@FeignClient(value = "ANTAI-AMS-API", url = "${openfeign.AmsFeign.url}")
 public interface AmsFeign {
 
     /**

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/23 8:46
+ * @Version:V2.0
+ */
+@FeignClient(value = "ANTAI-BMS-API", url = "${openfeign.BmsFeign.url}")
+public interface BmsFeign {
+
+}

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

@@ -1,331 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:HuJianGuo
- * @GreateTime:2021/9/23 8:46
- * @Version:V2.0
- */
-@FeignClient(value = "DIL-BMSSHIP-API-DEV", url = "${openfeign.BmsshipFeign.url}")
-public interface BmsshipFeign {
-
-    /**
-     * 展示港口装卸费
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getPortHandlingFeeList")
-    RESTfulResult getPortHandlingFeeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                         @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("apiId") Integer apiId,
-                                         @RequestParam("con") String con);
-
-    /**
-     * 展示批次信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getBatch")
-    RESTfulResult getBatch(@RequestBody(required = false) Map<String, Object> mapValue,
-                           @RequestParam("pageNum") Integer pageNum,
-                           @RequestParam("pageSize") Integer pageSize,
-                           @RequestParam("apiId") Integer apiId,
-                           @RequestParam("con") String con);
-
-    /**
-     * 生成港口装卸费
-     *
-     * @param portHandlingFee
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/addPortHandlingFee")
-    RESTfulResult addPortHandlingFee(@RequestBody Map<String, Object> portHandlingFee) throws Exception;
-
-    /**
-     * 修改港口装卸费信息
-     *
-     * @param portHandlingFee
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/updatePortHandlingFee")
-    RESTfulResult updatePortHandlingFee(@RequestBody Map<String, Object> portHandlingFee);
-
-    /**
-     * 查询修改港口装卸费数据渲染表单
-     *
-     * @param feeId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getFeeToUpdate/{feeId}")
-    RESTfulResult getFeeToUpdate(@PathVariable("feeId") BigDecimal feeId);
-
-    /**
-     * 逻辑删除港口装卸费
-     *
-     * @param feeId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/deletePortHandlingFee/{feeId}")
-    RESTfulResult deletePortHandlingFee(@PathVariable("feeId") String feeId);
-
-    /**
-     * 展示水运详单信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipdetailsorder/getDetailsOrderList")
-    RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize,
-                                      @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("con") String con);
-
-    /**
-     * 展示未生成账单的详单信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipdetailsorder/getUncomplateDetailsOrderList")
-    RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("con") String con);
-
-    /**
-     * 生成水运计费详单
-     *
-     * @param resultId
-     * @return
-     * @throws Exception
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipdetailsorder/addDetailsOrder/{resultId}")
-    RESTfulResult addDetailsOrder(@PathVariable("resultId") BigDecimal resultId) throws Exception;
-
-
-    /**
-     * 展示水运费和水分质检费账单信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getStatementList")
-    RESTfulResult getStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                   @RequestParam("pageNum") Integer pageNum,
-                                   @RequestParam("pageSize") Integer pageSize,
-                                   @RequestParam("apiId") Integer apiId,
-                                   @RequestParam("con") String con);
-
-    /**
-     * 展示途损费账单信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getLossStatementList")
-    RESTfulResult getLossStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       @RequestParam("pageNum") Integer pageNum,
-                                       @RequestParam("pageSize") Integer pageSize,
-                                       @RequestParam("apiId") Integer apiId,
-                                       @RequestParam("con") String con);
-
-    /**
-     * 展示水分质检实绩
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getWaterResult")
-    RESTfulResult getWaterResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                 @RequestParam("pageNum") Integer pageNum,
-                                 @RequestParam("pageSize") Integer pageSize,
-                                 @RequestParam("apiId") Integer apiId);
-
-    /**
-     * 生成水运费账单
-     *
-     * @param mapList
-     * @return
-     * @throws Exception
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addStatement")
-    RESTfulResult addStatement(@RequestBody List<Map<String, Object>> mapList) throws Exception;
-
-    /**
-     * 生成水分质检账单
-     *
-     * @param mapList
-     * @return
-     * @throws Exception
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addWaterStatement")
-    RESTfulResult addWaterStatement(@RequestBody List<Map<String, Object>> mapList) throws Exception;
-
-    /**
-     * 生成途损账单
-     *
-     * @param map
-     * @return
-     * @throws Exception
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addLossStatement")
-    RESTfulResult addLossStatement(@RequestBody Map<String, Object> map) throws Exception;
-
-    /**
-     * 展示账单下的详单
-     *
-     * @param batchId
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getStatementDetailsOrderList")
-    RESTfulResult getStatementDetailsOrderList(@RequestParam BigDecimal batchId,
-                                               @RequestBody(required = false) Map<String, Object> mapValue,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("statementId") BigDecimal statementId,
-                                               @RequestParam("con") String con);
-
-    /**
-     * 展示详单下的船运实绩
-     *
-     * @param batchId
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getShipResult")
-    RESTfulResult getShipResult(@RequestParam BigDecimal batchId,
-                                @RequestBody(required = false) Map<String, Object> mapValue,
-                                @RequestParam("pageNum") Integer pageNum,
-                                @RequestParam("pageSize") Integer pageSize,
-                                @RequestParam("apiId") Integer apiId);
-
-    /**
-     * 查询水运费计算公式
-     *
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipformulas/getShipFeesFormula")
-    RESTfulResult getShipFeesFormula();
-
-    /**
-     * 查询途损费计算公式
-     *
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipformulas/getLossFeesFormula")
-    RESTfulResult getLossFeesFormula();
-
-    /**
-     * 查询水分质检计算公式
-     *
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmsship/bmsshipformulas/getWaterFeesFormula")
-    RESTfulResult getWaterFeesFormula();
-
-     //新增二程船装卸费用
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/addPortHandlingFeeSecond")
-    Map<String, Object> addPortHandlingFeeSecond(@RequestBody(required = true) Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/uploadBmsshipOrder", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    Map<String, Object> uploadBmsshipOrder(@RequestPart("file") MultipartFile multipartFile);
-
-    //下载水运单图片
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/downloadBmsshipOrder")
-    Map<String, Object> downloadBmsshipOrder(@RequestParam("resultId") Integer resultId);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/selectPortFeeSecondList")
-    Map<String, Object> selectPortFeeSecondList(@RequestBody(required = false)Map<String, Object> mapVal,
-                                                @RequestParam("pageNum")Integer pageNum,
-                                                @RequestParam("pageSize")Integer pageSize,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("startTime") String startTime,
-                                                @RequestParam("feeType")Integer feeType,
-                                                @RequestParam("endTime") String endTime,
-                                                @RequestParam("con") String con);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getBmsshipFee/{id}")
-    Map<String, Object> getBmsshipFee(@PathVariable("id") Integer id);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/deletePortHandlingFeeSecond/{feeId}")
-    Map<String,Object> deletePortHandlingFeeSecond(@PathVariable("feeId")BigDecimal feeId);
-
-
-    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addwaterStatement")
-    Map<String, Object> addwaterStatement(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getTrainDetailsByBatch/{batchId}")
-    Map<String,Object> getTrainDetailsByBatch(@PathVariable("batchId")BigDecimal batchId);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getTruckDetailsByBatch/{batchId}")
-    Map<String,Object> getTruckDetailsByBatch(@PathVariable("batchId")BigDecimal batchId);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findBatchHavingLoad")
-    Map<String,Object> findBatchHavingLoad(String con);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findLoadByBatch")
-    Map<String, Object> findLoadByBatch(@RequestBody(required = false)Map<String, Object> mapVal,
-                                                @RequestParam("pageNum")Integer pageNum,
-                                                @RequestParam("pageSize")Integer pageSize,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("batchId") BigDecimal batchId);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getShipFeeStatement")
-    Map<String, Object> getShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getShipFeeStatemented")
-    Map<String, Object> getShipFeeStatemented(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/addShipFeeStatement")
-    Map<String, Object> addShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/editShipFeeStatement")
-    Map<String, Object> editShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getWetDryDetails")
-    Map<String, Object> getWetDryDetails(@RequestBody(required = false) Map<String, Object> map);
-}

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

@@ -1,185 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:BmsshipFeign
- * @Author:HuJianGuo
- * @GreateTime:2021/9/23 8:46
- * @Version:V2.0
- */
-@FeignClient(value = "DIL-BMSTRAIN-API-DEV", url = "${openfeign.BmstrainFeign.url}")
-public interface BmstrainFeign {
-
-    /**
-     * 展示火运详单
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/getTrainDetailsOrderList")
-    RESTfulResult getTrainDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("con") String con);
-
-    /**
-     * 展示未转账单的火运详单
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/getUncomplateTrainDetailsList")
-    RESTfulResult getUncomplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("con") String con);
-
-    /**
-     * 展示火运实绩
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/getTrainResultList")
-    RESTfulResult getTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam("pageNum") Integer pageNum,
-                                     @RequestParam("pageSize") Integer pageSize,
-                                     @RequestParam("apiId") Integer apiId);
-
-    /**
-     * 生成火运详单
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/addTrainDetails")
-    RESTfulResult addTrainDetails(@RequestBody Map<String, Object> map);
-
-    /**
-     * 展示火运账单列表
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getTrainStatementList")
-    RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("con") String con);
-
-    /**
-     * 展示火运实绩
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getStatementTrainResultList")
-    RESTfulResult getStatementTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("detailsId") Integer detailsId);
-
-    /**
-     * 展示账单下的详单
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getComplateTrainDetailsList")
-    RESTfulResult getComplateTrainDetailsList(@RequestParam("batchId") BigDecimal batchId,
-                                              @RequestBody(required = false) Map<String, Object> mapValue,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("statementId") BigDecimal statementId,
-                                              @RequestParam("con") String con);
-
-    /**
-     * 生成火运费账单
-     *
-     * @param mapList
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/addTrainStatement")
-    RESTfulResult addTrainStatement(@RequestBody List<Map<String, Object>> mapList);
-  
-  /**
-     * 展示销售火运结算列表
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/getSettlementList")
-    RESTfulResult getSettlementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                    @RequestParam("pageNum") Integer pageNum,
-                                    @RequestParam("pageSize") Integer pageSize,
-                                    @RequestParam("apiId") Integer apiId,
-                                    @RequestParam("con") String con);
-
-    /**
-     * 新增火运结算
-     * @param bmstrainSettlement
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/addTrainSettlement")
-    Map<String,Object> addTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement);
-
-    /**
-     * 修改火运结算
-     * @param bmstrainSettlement
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/updateTrainSettlement")
-    Map<String,Object> updateTrainSettlement(@RequestBody Map<String, Object> bmstrainSettlement);
-
-    /**
-     * 逻辑删除火运结算
-     * @param settlementId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/deleteTrainSettlement/{settlementId}")
-    Map<String,Object> deleteTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId);
-
-    /**
-     * 得到修改渲染
-     * @param settlementId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstrain/bmstrainsettlement/selectTrainSettlement/{settlementId}")
-    Map<String,Object> selectTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId);
-
-}

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

@@ -1,337 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:HuJianGuo
- * @GreateTime:2021/9/23 8:46
- * @Version:V2.0
- */
-@FeignClient(value = "DIL-BMSTRUCK-API-DEV", url = "${openfeign.BmstruckFeign.url}")
-public interface BmstruckFeign {
-
-    /**
-     * 展示汽运详单信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getTruckDetailsOrderList")
-    RESTfulResult getTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("orderType") Integer orderType,
-                                           @RequestParam("carrierSsoId") String carrierSsoId);
-
-    /**
-     * 展示汽运实绩信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getTruckResultList")
-    RESTfulResult getTruckResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam("pageNum") Integer pageNum,
-                                     @RequestParam("pageSize") Integer pageSize,
-                                     @RequestParam("apiId") Integer apiId,
-                                     @RequestParam("orderId") BigDecimal orderId);
-
-    /**
-     * 新增汽运详单
-     *
-     * @param orderId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addDetailsOrder/{orderId}")
-    RESTfulResult addTruckDetailsOrder(@PathVariable("orderId") BigDecimal orderId);
-
-
-    /**
-     * 展示内转汽运未生成账单的作业详单信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckConverted/getUnFinishedConvertedTruckDetailsOrderList")
-    RESTfulResult getUnFinishedConvertedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                              @RequestParam("pageNum") Integer pageNum,
-                                                              @RequestParam("pageSize") Integer pageSize,
-                                                              @RequestParam("apiId") Integer apiId,
-                                                              @RequestParam("orderType") BigDecimal orderType);
-
-    /**
-     * 新增内转汽运详单
-     *
-     * @param orderId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckConverted/addConvertedDetailsOrder/{orderId}")
-    RESTfulResult addConvertedDetailsOrder(@PathVariable("orderId") BigDecimal orderId);
-
-
-    /**
-     * 生成内转汽运账单
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/addConvertedTruckStatement")
-    RESTfulResult addConvertedTruckStatement(@RequestBody(required = false) List<Map<String, Object>> mapList);
-
-    /**
-     * 删除汽运账单
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/deleteConvertedTruckStatement/{statementId}")
-    RESTfulResult delete(@PathVariable("statementId") BigDecimal statementId);
-
-    /**
-     * 审批计费账单
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/updateConvertedTruckStatement/{statementId}")
-    RESTfulResult update(@PathVariable("statementId") BigDecimal statementId);
-
-    /**
-     * 销售汽运计费账单
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/getTruckStatementList")
-    RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("userId") String userId,
-                                        @RequestParam("startTime") String startTime,
-                                        @RequestParam("endTime") String endTime,
-                                        @RequestParam("con") String con);
-
-    /**
-     * 生成销售汽运计费账单
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/addTruckStatement")
-    RESTfulResult addTruckStatement(@RequestBody Map<String, Object> map);
-
-    /**
-     * 直接修改汽运计费详单
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/updateTruckDetail")
-    RESTfulResult updateTruckDetail(@RequestBody Map<String, Object> map);
-
-
-    /**
-     * 直接修改汽运计费详单
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addTruckDetail")
-    RESTfulResult addTruckDetail(@RequestBody Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/updateConsignee")
-    RESTfulResult updateConsignee(@RequestBody Map<String, Object> map);
-
-    /**
-     * 展示账单下的详单
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @param statementId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/getSaleTruckStatementDetailsOrderList")
-    RESTfulResult getSaleTruckStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                        @RequestParam("pageNum") Integer pageNum,
-                                                        @RequestParam("pageSize") Integer pageSize,
-                                                        @RequestParam("apiId") Integer apiId,
-                                                        @RequestParam("statementId") BigDecimal statementId);
-
-    /**
-     * 审核
-     *
-     * @param statementId
-     * @param status
-     * @param person
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckcheck/updateBmstruckCheck")
-    RESTfulResult updateBmstruckCheck(@RequestParam("statementId") BigDecimal statementId,
-                                      @RequestParam("status") Integer status,
-                                      @RequestParam("person") Integer person);
-
-    /**
-     * 查询销售汽运离100KM差距10KM内计费公式
-     *
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckformulas/getSmallTruckFormula")
-    RESTfulResult getSmallTruckFormula();
-
-    /**
-     * 查询销售汽运离100KM差距10KM外计费公式
-     *
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckformulas/getBigTruckFormula")
-    RESTfulResult getBigTruckFormula();
-
-    /**
-     * 展示发票
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckinvoice/getInvoiceList")
-    RESTfulResult getInvoiceList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                 @RequestParam("pageNum") Integer pageNum,
-                                 @RequestParam("pageSize") Integer pageSize,
-                                 @RequestParam("apiId") Integer apiId,
-                                 @RequestParam("con") String con);
-
-    /**
-     * 新增发票
-     *
-     * @param mapVal
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckinvoice/addBmstruckInvoice")
-    RESTfulResult addBmstruckInvoice(@RequestBody Map<String, Object> mapVal);
-
-    /**
-     * 展示汽运未生成账单的详单信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @param orderType
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getUnFinishedTruckDetailsOrderList")
-    RESTfulResult getUnFinishedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                     @RequestParam("pageNum") Integer pageNum,
-                                                     @RequestParam("pageSize") Integer pageSize,
-                                                     @RequestParam("apiId") Integer apiId,
-                                                     @RequestParam("orderType") Integer orderType,
-                                                     @RequestParam("carrierSsoId") String carrierSsoId);
-
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/updateDetailsOrder")
-    RESTfulResult updateDetailsOrder(@RequestBody Map<String, Object> mapValue);
-
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addLossFeeOfCoke")
-    RESTfulResult addLossFeeOfCoke(@RequestBody Map<String, Object> map);
-
-    /**
-     * 内转结算详单
-     * @param mapVal
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @param carrierSsoId
-     * @param detailStatus
-     * @param orderType
-     * @return
-     */
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getInwardWeightDetailsOrder")
-    Map<String, Object> getInwardWeightDetailsOrder(@RequestBody(required = false)Map<String, Object> mapVal,
-                                                    @RequestParam("pageNum") Integer pageNum,
-                                                    @RequestParam("pageSize") Integer pageSize,
-                                                    @RequestParam("apiId") Integer apiId,
-                                                    @RequestParam("carrierSsoId") String carrierSsoId,
-                                                    @RequestParam("detailStatus") Integer detailStatus,
-                                                    @RequestParam("orderType") Integer orderType,
-                                                    @RequestParam("userId") String userId,
-                                                    @RequestParam("startTime")String startTime,
-                                                    @RequestParam("endTime")String endTime,
-                                                    @RequestParam("capacityNo")String capacityNo,
-                                                    @RequestParam("shipperNames")String shipperNames,
-                                                    @RequestParam("transRangeValues")String transRangeValues,
-                                                    @RequestParam("materialTypeNames")String materialTypeNames,
-                                                    @RequestParam String isPage);
-
-
-
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getInwardWeightTimeDetailsOrder")
-    Map<String, Object> getInwardWeightTimeDetailsOrder(@RequestBody(required = false)Map<String, Object> mapVal,
-                                                        @RequestParam("pageNum") Integer pageNum,
-                                                        @RequestParam("pageSize") Integer pageSize,
-                                                        @RequestParam("apiId") Integer apiId,
-                                                        @RequestParam("carrierSsoId") String carrierSsoId,
-                                                        @RequestParam("detailStatus") Integer detailStatus,
-                                                        @RequestParam("orderType") Integer orderType,
-                                                        @RequestParam("userId") String userId,
-                                                        @RequestParam("startTime")String startTime,
-                                                        @RequestParam("endTime")String endTime);
-
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getNoInwardDetails")
-    Map<String, Object> getNoInwardDetails(@RequestBody(required = false)Map<String, Object> mapVal,
-                                           @RequestParam("pageNum")Integer pageNum,
-                                           @RequestParam("pageSize")Integer pageSize,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("carrierSsoId") String carrierSsoId,
-                                           @RequestParam("userId") String userId,
-                                           @RequestParam("startTime") String startTime,
-                                           @RequestParam("endTime") String endTime,
-                                           @RequestParam("orgCode") String orgCode,
-                                           @RequestParam("capacityNo") String capacityNo,
-                                           @RequestParam("transRangeValues") String transRangeValues,
-                                           @RequestParam("materialTypeNames") String materialTypeNames,
-                                           @RequestParam("shipperNames") String shipperNames,
-                                           @RequestParam("isPage") String isPage);
-
-
-    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getSteelTruckDetailsOrder")
-    Map<String, Object> getSteelTruckDetailsOrder(@RequestBody(required = false) Map<String, Object> map,
-                                                  @RequestParam Integer pageNum,
-                                                  @RequestParam Integer pageSize,
-                                                  @RequestParam Integer apiId,
-                                                  @RequestParam Integer orderType,
-                                                  @RequestParam String carrierSsoId,
-                                                  @RequestParam String startTime,
-                                                  @RequestParam String endTime,
-                                                  @RequestParam String con);
-
-    @PostMapping("/api/v1/bmstruck/bmstruckdetailsorder/newInwardSettle")
-    Map<String, Object> newInwardSettle(@RequestBody Map<String,Object> map);
-
-    @PostMapping("/api/v1/bmstruck/bmstruckdetailsorder/updateDetailsStatus")
-    Map<String, Object> updateDetailsStatus(Map<String, Object> map);
-
-    @PostMapping("/api/v1/bmstruck/bmstruckdetailsorder/updateBatchDetailsOrder")
-    Map<String, Object> updateBatchDetailsOrder(Map<String, Object> map);
-
-    @PostMapping("/api/v1/bmstruck/bmstruckstatement/findDetailsForStatement")
-    Map<String, Object> findDetailsForStatement(Map<String, Object> map);
-
-    @PostMapping("/api/v1/bmstruck/bmstruckstatement/getStatementPhoto")
-    String getStatementPhoto(@RequestParam BigDecimal statementId);
-
-}
-
-

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

@@ -12,7 +12,7 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "${openfeign.ColumnDataFeign.url}")
+@FeignClient(value = "ANTAI-COLUMN-DATA",url = "${openfeign.ColumnDataFeign.url}")
 public interface ColumnDataFeign {
     @RequestMapping("getColumnData")
     List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);

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

@@ -1,27 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2022/2/24 18:07
- */
-
-@FeignClient(value = "dal-dazhou-join-api",url = "${openfeign.JoinFeign.url}")
-public interface JoinFeign {
-
-    @PostMapping("api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult")
-    Map<String, Object> receiveTmsTruckWeightResult(@RequestBody List<Map<String, Object>> mapList);
-
-    @PostMapping("api/v1/join/wmsoutboundresult/sendWarranty")
-    String sendWarranty(@RequestBody Map<String, Object> map);
-
-    @PostMapping("/api/v1/join/tmstruckweightresult/linkageDeleteTransportOrder")
-    String linkageDeleteTransportOrder(List<Map<String, Object>> mapList);
-
-}

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

@@ -13,539 +13,8 @@ import java.util.Map;
  * @ time      :2021/10/28 13:28
  */
 
-@FeignClient(value = "DAL-OMS-API-DEV", url = "${openfeign.OMSFeign.url}")
+@FeignClient(value = "ANTAI-OMS-API", url = "${openfeign.OMSFeign.url}")
 public interface OmsFeign {
 
-     /*
-    OmstruckOrderController
-     */
-
-    @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrder")
-    public Map<String, Object> getAllTruckOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("orderStatus") Integer orderStatus,
-                                          @RequestParam("planId") Integer planId,
-                                          @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("fuelOrder") Integer fuelOrder,
-                                          @RequestParam("carrierSSOId")String carrierSSOId,
-                                          @RequestParam("con")String con,
-                                                @RequestParam("startTime")String startTime,
-                                                @RequestParam("endTime")String endTime);
-
-    @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrderReturnListMap")
-    public Map<String, Object> getAllTruckOrderReturnListMap(
-            @RequestParam("orderStatus") Integer orderStatus,
-            @RequestParam("planId") Integer planId,
-            @RequestParam("orderType") Integer orderType);
-
-    @PostMapping("api/v1/oms/omstruckorders/getAllCapacity")
-    public Map<String, Object> getAllCapacity(@RequestBody(required=false) Map<String,Object> mapValue,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("carrierId") Integer carrierId);
-
-    @PostMapping("api/v1/oms/omstruckorders/addPurOrder")
-    public Map<String, Object> addPurOrder(@RequestBody(required=false) Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/oms/omstruckorders/updateOrder")
-    public Map<String, Object> updateOrder(@RequestBody Map<String, Object> map);
-
-    @PostMapping("api/v1/oms/omstruckorders/dispatchOrder")
-    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> mapValue);
-
-    @PostMapping("api/v1/oms/omstruckorders/deleteOrder")
-    public Map<String, Object> deleteOrder(@RequestBody(required = false) Map<String, Object> map,
-                                     @RequestParam("planId") Integer planId);
-
-    @PostMapping("api/v1/oms/omstruckorders/driverReceiveOrRefuse")
-    public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping("api/v1/oms/omstruckorders/undoOrder")
-    Map<String, Object> undoOrder(@RequestBody Map<String, Object> map);
-
-
-
-    @PostMapping("api/v1/oms/omstruckorders/getReceiveRefuseOrder/{orderReceiveStatus}")
-    public Map<String, Object> getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
-                                               @RequestParam("orderType") Integer orderType,
-                                               @RequestParam("orderStatus") Integer orderStatus,
-                                                     @RequestParam("con")String con);
-
-    @PostMapping("api/v1/oms/omstruckorders/sendMesToDriver")
-    public Map<String, Object> sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber,
-                                         @RequestParam("orderStatus") Integer orderStatus);
-
-
-    @PostMapping("api/v1/oms/omstruckorders/getRefuseOrderByCapacityNum")
-    public Map<String, Object> sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber);
-
-
-    @PostMapping("api/v1/oms/omstruckorders/getOrderMesByOrderNum/{orderId}")
-    public Map<String, Object> getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId);
-
-    @PostMapping("api/v1/oms/omstruckorders/selectPlaceAndTime/{orderId}")
-    public Map<String, Object> selectPlaceAndTime(@PathVariable("orderId") Integer orderId);
-
-    @PostMapping("api/v1/oms/omstruckorders/selectOrderByOrderId/{orderId}")
-    public Map<String, Object> selectOrderByOrderId(@PathVariable("orderId") Integer orderId);
-
-    @PostMapping("api/v1/oms/omstruckorders/getTransportDispatch")
-    public Map<String, Object> getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("orderType") Integer orderType,
-                                              @RequestParam("orderStatus") Integer orderStatus,
-                                              @RequestParam("fuelOrder") Integer fuelOrder,
-                                              @RequestParam("carrierSSOId") String carrierSSOId,
-                                              @RequestParam("con")      String con,
-                                                    @RequestParam("startTime") String startTime,
-                                                    @RequestParam("endTime")String endTime);
-    /**
-     * 展示承运商接收销售公司已接受的销售订单
-     * @param carrierId
-     * @param apiId
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value = "api/v1/oms/omstruckorders/getSaleOrderForCarrierList/{carrierId}",method = RequestMethod.POST)
-    Map<String,Object> getSaleOrderForCarrierList(@RequestBody(required = false)Map<String,Object> map,
-                                                  @PathVariable("carrierId") Integer carrierId,
-                                                  @RequestParam Integer apiId,
-                                                  @RequestParam Integer pageNum,
-                                                  @RequestParam Integer pageSize,
-                                                  @RequestParam String con
-                                                  );
-
-
-    /**
-     * 销售物流司机接收新的订单
-     */
-    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale")
-    Map<String,Object> getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam Integer apiId,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam Integer orderType,
-                                            @RequestParam Integer orderStatus,
-                                            @RequestParam String con,
-                                            @RequestParam String carrierSsoId,
-                                            @RequestParam Integer shipperId
-    );
-
-
-    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale1")
-    Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            @RequestParam("orderStatus")Integer orderStatus,
-                                            @RequestParam("con")        String con,
-                                            @RequestParam("numberPlate")  String numberPlate,
-                                            @RequestParam("saleOrderId") Integer saleOrderId
-    );
-
-    /**
-     * 销售司机派单
-     */
-
-    @PostMapping("api/v1/oms/omstruckorders/dispatchOrderForSale")
-    Map<String, Object> dispatchOrderForSale(@RequestBody(required = false) Map<String, Object> map);
-
-
-
-
-
-    /**
-     * 查询所有已经接收的焦炭发运日计划
-     * @param carrierId
-     * @param apiId
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value = "api/v1/oms/omstruckorders/getCokeDayPlanAndRecivedList/{carrierId}",method = RequestMethod.POST)
-    Map<String,Object> getCokeDayPlanAndRecivedList(@RequestBody(required = false)Map<String,Object> map,
-                                                    @PathVariable("carrierId") Integer carrierId,
-                                                    @RequestParam Integer apiId,
-                                                    @RequestParam Integer pageNum,
-                                                    @RequestParam Integer pageSize);
-    /**
-     *查询所有已经接收的水渣发运日计划
-     * @param
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "api/v1/oms/omstruckorders/getWaterSlagDayPlanAndRecivedList/{carrierId}")
-    Map<String,Object> getWaterSlagDayPlanAndRecivedList(@RequestBody(required = false)Map<String,Object> map,
-                                                         @PathVariable("carrierId") Integer carrierId,
-                                                         @RequestParam Integer apiId,
-                                                         @RequestParam Integer pageNum,
-                                                         @RequestParam Integer pageSize);
-    //查询空闲运力信息
-    @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityForLeisure/{carrierId}")
-    Map<String,Object> getCapacityForLeisure(@RequestBody(required = false) Map<String,Object> mapValue,
-                                             @RequestParam("apiId") Integer apiId,
-                                             @RequestParam("pageNum") Integer pageNum,
-                                             @RequestParam("pageSize") Integer pageSize,
-                                             @PathVariable("carrierId")Integer carrierId);
-
-    //通过物资id查询批次表匹配最新的批次，关联最新的采购订单号
-    @PostMapping("api/v1/oms/omstruckorders/selectNewOrderId")
-    Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map);
-
-
-    @PostMapping(value = "api/v1/oms/omstruckorders/selectAllOrderForSale/{carrierId}")
-    Map<String, Object> selectAllOrderForSale(
-                                                   @RequestBody(required = false) Map<String,Object> mapValue,
-                                                   @PathVariable Integer carrierId,
-                                                   @RequestParam("apiId") Integer apiId,
-                                                   @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("orderType") Integer orderType,
-                                                   @RequestParam("orderStatus") Integer orderStatus,
-                                                   @RequestParam("saleOrderMaterialId") Integer saleOrderMaterialId,
-                                                   @RequestParam("con") String  con
-    );
-
-
-    //展示已经形成虚拟订单的焦炭发运计划
-    @PostMapping(value = "api/v1/oms/omstruckorders/getCokeRailDayPlanForGenOrder/{carrierId}")
-   Map<String,Object>  getCokeRailDayPlanForGenOrder(@RequestBody(required = false)Map<String,Object> map,
-                                                     @PathVariable("carrierId")  Integer carrierId,
-                                                     @RequestParam ("pageNum")   Integer pageNum,
-                                                     @RequestParam ("pageSize")  Integer pageSize,
-                                                     @RequestParam("apiId")      Integer apiId,
-                                                     @RequestParam("dayPlanId")  Integer dayPlanId,
-                                                     @RequestParam("orderStatus")Integer orderStatus,
-                                                     @RequestParam("orderType") Integer orderType,
-                                                     @RequestParam("con")  String con
-    );
-    @PostMapping(value = "api/v1/oms/omstruckorders/getWaterslagDayPlanForGenOrder/{carrierId}")
-    Map<String,Object>  getWaterslagDayPlanForGenOrder(@RequestBody(required = false)Map<String,Object> map,
-                                                      @PathVariable("carrierId") Integer carrierId,
-                                                      @RequestParam("pageNum") Integer pageNum,
-                                                      @RequestParam("pageSize") Integer pageSize,
-                                                      @RequestParam("apiId") Integer apiId,
-                                                      @RequestParam("dayPlanId") Integer dayPlanId,
-                                                      @RequestParam("orderType")Integer orderType,
-                                                      @RequestParam("orderStatus") Integer orderStatus,
-                                                      @RequestParam("con") String con
-    );
-
-    @PostMapping("api/v1/oms/omstruckorders/selectSteelSaleForCarrier/{carrierId}")
-    public Map<String,Object> selectSteelSaleForCarrier(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam Integer apiId,
-                                                   @RequestParam Integer pageNum,
-                                                   @RequestParam Integer pageSize,
-                                                   @PathVariable Integer carrierId
-    );
-
-    @PostMapping("api/v1/oms/omstruckorders/selectInfoBySaleOrderId/{saleOrderId}")
-    public Map<String,Object> selectInfoBySaleOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 @RequestParam Integer apiId,
-                                                 @RequestParam Integer pageNum,
-                                                 @RequestParam Integer pageSize,
-                                                 @PathVariable Integer saleOrderId
-
-
-    )  ;
-    @PostMapping("api/v1/oms/omstruckorders/selectCokeRailPlan/{carrierId}")
-     Map<String,Object> selectCokeRailPlan(@RequestBody(required=false) Map<String,Object> mapValue,
-                                      @RequestParam Integer apiId,
-                                      @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize,
-                                       @PathVariable Integer carrierId,
-                                      @RequestParam  Integer orderType
-
-    );
-    @PostMapping("api/v1/oms/omstruckorders/selectInfoByDayPlanId/{dayPlanId}")
-     Map<String,Object> selectInfoByDayPlanId(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam Integer apiId,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize,
-                                               @PathVariable  Integer dayPlanId,
-                                               @RequestParam Integer orderType
-
-
-    );
-
-    @ApiOperation(value="车牌号下拉")
-    @GetMapping(value = "api/v1/oms/omstruckorders/getDriverCapacity")
-    Map<String, Object> getDriverCapacity();
-
-    @ApiOperation(value="派单信息")
-    @PostMapping(value = "api/v1/oms/omstruckorders/getTruckNoDispatchMap")
-    Map<String, Object> getTruckNoDispatchMap(@RequestParam Integer dispatchId);
-
-    @ApiOperation(value="承运商分派运输订单给司机")
-    @PostMapping(value = "api/v1/oms/omstruckorders/addAppTruckOrder")
-    Map<String, Object> addAppTruckOrder(@RequestParam Integer dispatchId,
-                                         @RequestParam Integer orderType,
-                                         @RequestParam String capacityNumber,
-                                         @RequestParam Integer carrierId);
-
-    @ApiOperation(value="根据运单id关闭订单")
-    @PostMapping(value = "api/v1/oms/omstruckorders/closeOmstruckOrder")
-    Map<String, Object> closeOmstruckOrder(@RequestBody Map<String,Object> map);
-
-
-    @ApiOperation(value="根据运单id修改运力")
-    @PostMapping(value = "api/v1/oms/omstruckorders/updateCapacityId")
-    Map<String, Object> updateCapacityId(@RequestBody Map<String,Object> map);
-
-
-    @ApiOperation(value="车牌")
-    @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityAndDriverList")
-    Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 @RequestParam Integer apiId,
-                                                 @RequestParam Integer pageNum,
-                                                 @RequestParam Integer pageSize,
-                                                 @RequestParam String con,
-                                                 @RequestParam String carrierId);
-
-    @GetMapping("api/v1/oms/omstruckorders/getReceivingUnit")
-    public Map<String, Object> getReceivingUnit();
-
-    //查询所有的发货单位
-    @GetMapping("api/v1/oms/omstruckorders/getSupplier")
-    public Map<String, Object> getSupplier();
-
-    @PostMapping("api/v1/oms/omstruckorders/CloseOrder")
-    Map<String,Object> CloseOrder(@RequestBody(required = false)Map<String,Object> map);
-
-    // 分解内转计划
-    @PostMapping("api/v1/oms/omstruckorders/addInwardOrder")
-    Map<String, Object> addInwardOrder(@RequestBody(required = false) Map<String, Object> mapValue);
-
-    // 分解计划查询
-    @PostMapping("api/v1/oms/omstruckorders/getInwardOrderList")
-    Map<String, Object> getInwardOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam Integer apiId,
-                                           @RequestParam Integer pageNum,
-                                           @RequestParam Integer pageSize,
-                                           @RequestParam Integer orderStatus,
-                                           @RequestParam String carrierId,
-                                           @RequestParam String con,
-                                           @RequestParam String startTime,
-                                           @RequestParam String endTime);
-
-    // 分派计划
-    @PostMapping("api/v1/oms/omstruckorders/apportionInwardOrder")
-    Map<String, Object> apportionInwardOrder(@RequestBody List<Map<String, Object>> mapList);
-
-    // 司机APP端查询下发给自己运输订单
-    @PostMapping("api/v1/oms/omstruckorders/sendOrderToApp")
-    List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber);
-
-    //分解异地库计划
-    @PostMapping("api/v1/oms/omstruckorders/apportionInwardOffsetOrder")
-    Map<String, Object> apportionInwardOffsetOrder(@RequestBody Map<String, Object> mapvalue);
-
-    @ApiOperation(value = "查询司机的所有运输订单信息")
-    @PostMapping("api/v1/oms/omstruckorders/getAllOrderMessage")
-    List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber);
-    @PostMapping("api/v1/oms/omstruckorders/driverConfirmation")
-    Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue);
-
-    @PostMapping("api/v1/oms/omstruckorders/getMessageToApp")
-    Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) ;
-
-    @PostMapping("api/v1/oms/omstruckorders/getAllOrderMessagesByCapacityNum")
-    List<Map<String, Object>> getAllOrderMessagesByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue);
-
-    @PostMapping("api/v1/oms/omstruckorders/getReceiveOrderIdListByCapacityNum")
-    List<Integer> getReceiveOrderIdListByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue);
-
-    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
-    @PostMapping("api/v1/oms/omstruckorders/getAllRefuseOrderNumberByCapacity")
-    List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue);
-
-    @ApiOperation(value = "添加退货实绩关闭当前订单")
-    @PostMapping("api/v1/oms/omstruckorderseparates/returnOrderCloseOrder")
-    Map<String, Object> returnOrderCloseOrder(@RequestBody(required = false) Map<String, Object> map);
-
-    @ApiOperation(value = "根据运单id查询实绩位置")
-    @PostMapping("api/v1/oms/omstruckorderseparates/getOrderResult")
-    List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map);
-
-    @ApiOperation(value = "根据运单id查询实绩位置")
-    @PostMapping("api/v1/oms/omstruckorders/addInputOrder")
-    Map<String, Object> addInputOrder(@RequestBody Map<String, Object> mapValue);
-
-    @PostMapping("api/v1/oms/omstruckorderseparates/getOthersOrderMesToSend")
-    Map<String, Object> getOthersOrderMesToSend(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                       @RequestParam("apiId") Integer apiId,
-                                                       @RequestParam("pageNum") Integer pageNum,
-                                                       @RequestParam("pageSize") Integer pageSize,
-                                                       @RequestParam("orderStatus") Integer orderStatus,
-                                                       @RequestParam("carrierId") String carrierId,
-                                                       @RequestParam("type") Integer type,
-                                                       @RequestParam("con") String con,
-                                                       @RequestParam("userId") String userId,
-                                                       @RequestParam("usersId") String usersId,
-                                                       @RequestParam("type1")Integer type1,
-                                                @RequestParam("startTime")String  startTime,
-                                                @RequestParam("endTime") String endTime
-                                                       );
-
-    @ApiOperation(value = "根据运输订单id修改运力id")
-    @PostMapping("api/v1/oms/omstruckorderseparates/updateOmstruckOrder")
-    Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map);
-
-    @ApiOperation(value = "承运商销售分派运输订单给司机")
-    @PostMapping("api/v1/oms/omstruckorderseparates/addSaleTruckOrder")
-    Map<String, Object> addSaleTruckOrder(@RequestBody Map<String, Object> mapValue);
-
-    @ApiOperation(value = "根据运输订单号查询物资")
-    @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderMaterial")
-    Map<String, Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String, Object> map);
-
-    @ApiOperation(value = "根据运输订单号查询卸货点")
-    @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderWarehouseName")
-    Map<String, Object> getUnloadOrderWarehouseName(@RequestBody(required = false)Map<String, Object> map);
-
-    @ApiOperation(value = "根据运输订单id查询物资")
-    @PostMapping("api/v1/oms/omstruckorders/getOrderMaterialList")
-    Map<String, Object> getOrderMaterialList(@RequestParam Integer orderId);
-
-    @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
-    @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityAllOrder")
-    Map<String, Object> getCapacityAllOrder(@RequestParam String capacityNumber,@RequestParam  String date);
-
-    @ApiOperation(value = "该车牌号下的所有物资的综合")
-    @PostMapping("api/v1/oms/omstruckorderseparates/getMatrialWeight")
-    Map<String, Object> getMatrialWeight(@RequestParam String capacityNumber,@RequestParam  String date);
-
-    @ApiOperation(value = "根据运单id关闭运输订单")
-    @PostMapping("api/v1/oms/omstruckorderseparates/closeOrder")
-    Map<String, Object> closeOrder(@RequestParam Integer orderId);
-
-    @ApiOperation(value = "查询订单是否确认")
-    @PostMapping("api/v1/oms/omstruckorders/getDriverConfirmation")
-    Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map);
-
-    @ApiOperation(value = "一键删除多个订单")
-    @PostMapping("api/v1/oms/omstruckorderseparates/deleteOrders")
-    Map<String, Object> deleteOrders(@RequestBody(required = false) Map<String, Object> map);
-
-    @ApiOperation(value = "查询订单是否确认")
-    @PostMapping("api/v1/oms/omstruckorders/addPurInwardOrder")
-    Map<String, Object> addPurInwardOrder(@RequestBody(required = false) Map<String, Object> mapValue);
-
-    //采购内转运输订单
-    @PostMapping("api/v1/oms/omstruckorders/getPurInwardOrderList")
-    Map<String, Object> getPurInwardOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam Integer apiId,
-                                           @RequestParam Integer pageNum,
-                                           @RequestParam Integer pageSize,
-                                           @RequestParam Integer orderStatus,
-                                           @RequestParam String carrierId,
-                                           @RequestParam String con,
-                                              @RequestParam Integer planEnableStatus,
-                                              @RequestParam String userId);
-
-
-    @ApiOperation(value = "装卸工查询自己所有装了货的订单信息")
-    @PostMapping("api/v1/oms/omstruckorderseparates/getAllLoadUnloadResult")
-    Map<String, Object> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> mapValue);
-
-    @ApiOperation(value = "撤销已拒绝")
-    @PostMapping("api/v1/oms/omstruckorders/refuseCtrlZ")
-    Map<String, Object> refuseCtrlZ(Map<String, Object> map);
-
-    @ApiOperation(value = "批量关闭运输订单")
-    @PostMapping("api/v1/oms/omstruckorderseparates/batchCloseOrder")
-    Map<String, Object> batchCloseOrder(@RequestBody List<Map<String, Object>> mapList);
-    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
-    @PostMapping("api/v1/oms/omstruckorderseparates/getOrderMaterial/{orderId}")
-    Map<String, Object> getOrderMaterial(@PathVariable Integer orderId);
-
-
-    @PostMapping("api/v1/oms/omstruckorderseparates/getAllResultLineMes")
-    Map<String, Object> getAllResultLineMes(@RequestParam("orderId") Integer orderId, @RequestParam("orderNumber") String orderNumber);
-
-    @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
-    Map<String, Object> closeInwardOrder(@RequestParam("orderId") Integer orderId);
-
-    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeOrderResult")
-    Map<String, Object> getTimeOrderResult(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeTaskEnd")
-
-
-    Map<String, Object> getTimeTaskEnd(@RequestBody Map<String, Object> mapValue);
-    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeTaskEndDetail")
-    Map<String, Object> getTimeTaskEndDetail(@RequestBody Map<String, Object> mapValue);
-
-    @PostMapping("api/v1/oms/omstruckorderseparates/getPauseTimeTaskDetail")
-    Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId);
-
-
-    @PostMapping("api/v1/oms/omstruckorderseparates/getLoadForLoadCarResult")
-    Map<String,Object> getLoadForLoadCarResult(Map<String, Object> map);
-
-    @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityTypeByUserId")
-    Map<String,Object> getCapacityTypeByUserId(Map<String, Object> map);
-
-
-    @GetMapping("api/v1/oms/omstruckmatetialorders/getSteelOrderNum")
-    public Map<String, Object> getSteelOrderNum(@RequestParam("capacityId") String capacityId);
-
-    @GetMapping("api/v1/oms/omstruckmatetialorders/getMesToSteelDepartment")
-    public Map<String, Object> getMesToSteelDepartment(@RequestParam("orderId")Integer orderId);
-
-    @PostMapping("api/v1/oms/omstruckmatetialorders/updateMaterialMes")
-    public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping("api/v1/oms/omstruckmatetialorders/updateContinueStaus")
-    public Map<String, Object> updateContinueStaus(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping("api/v1/oms/omstruckorders/getDriverInfoForSale2")
-    Map<String, Object> getDriverInfoForSale2(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              @RequestParam Integer apiId,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize,
-                                              @RequestParam BigDecimal saleOrderId,
-                                              @RequestParam String con);
-
-    @PostMapping("api/v1/oms/omstruckorders/getTransportOrder")
-    Map<String, Object> getTransportOrder(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("orderId") Integer orderId,
-                                          @RequestParam("orderStatus") Integer orderStatus);
-
-    @PostMapping("api/v1/oms/omstruckorders/canCapacityEnfactory")
-    Map<String, Object> canCapacityEnfactory(@RequestBody Map<String, Object> mapValue);
-
-    @PostMapping("api/v1/oms/omstruckorders/getWarehouseMes")
-    Map<String, Object> getWarehouseMes(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam(required = false) String startTime,
-                                        @RequestParam(required = false) String endTime,
-                                        @RequestParam(required = false) String con);
-
-    @PostMapping("api/v1/oms/omstruckorders/closeInwardOrderByPlan")
-    Map<String, Object> closeInwardOrderByPlan(@RequestParam Integer planId);
-
-    @GetMapping("api/v1/oms/omstrainorders/getOrderTrainMes")
-    Map<String, Object> getOrderTrainMes(@RequestParam Integer orderId);
-
-    @PostMapping("/api/v1/oms/omstrainorders/getWagonShippingDetails")
-    Map<String, Object> getWagonShippingDetails(@RequestBody(required = false)  Map<String, Object> map,
-                                                @RequestParam(required = false) String startTime,
-                                                @RequestParam(required = false) String endTime,
-                                                @RequestParam(required = false) String sendStation,
-                                                @RequestParam(required = false) String toTheStation,
-                                                @RequestParam(required = false) String consigneeName,
-                                                @RequestParam(required = false) String wagonNo);
 }
 

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

@@ -1,178 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@FeignClient(value = "DAL-OTMS-API-DEV", url = "${openfeign.OTMSFeign.url}")
-public interface OtmsFeign {
-    //在途订单列表
-    @PostMapping("/api/v1/otms/pathDisplay/getInTransitTransportation")
-    public RESTfulResult getInTransitTransportation(@RequestBody Map<String,Object> mapValue,
-                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
-                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
-
-    //在途订单列表
-    @PostMapping("/api/v1/otms/pathDisplay/transportationPerformance")
-    public RESTfulResult transportationPerformance(@RequestBody Map<String,Object> mapValue,
-                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
-                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
-    //已完成订单列表
-    @PostMapping("/api/v1/otms/pathDisplay/getFinishTruckOrderInfo")
-    public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
-                                                 @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                 @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
-                                                 @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
-    );
-    //有异常订单列表
-    @PostMapping("/api/v1/otms/pathDisplay/getHaveAbnormalTruckOrderInfo")
-    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
-                                                       @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                       @RequestParam(required = false,name = "pageNum")Integer pageNum,
-                                                       @RequestParam(required = false,name = "pageSize")Integer pageSize);
-    //车牌号和时间查询路径
-    @PostMapping("/api/v1/otms/pathDisplay/fullPathVisualizationByCarNumber")
-    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue);
-
-    //改变当前报警类型
-    @PostMapping(value = "/api/v1/otms/pathDisplay/inTransitWarn")
-    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio);
-
-
-    //查询当前报警类型
-    @PostMapping(value = "/api/v1/otms/pathDisplay/selectWarnSwitch")
-    public RESTfulResult selectWarnSwitch();
-
-    //通过运输订单号查询全路径
-    @PostMapping("/api/v1/otms/pathDisplay/fullPath")
-    public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception;
-
-    //获得抵达列表
-//    @PostMapping("/api/v1/otms/tmstruckarrivalresults/getArrivalResultInfo")
-//    Map<String, Object> getArrivalResultInfo(@RequestBody(required = false) Map<String, Object> mapValue,
-//                                         @RequestParam Integer apiId,
-//                                         @RequestParam Integer pageNum,
-//                                         @RequestParam Integer pageSize,
-//                                         @RequestParam String con,
-//                                         @RequestParam String startTime,
-//                                         @RequestParam String endTime
-//    );
-
-    //通过运输订单号获得抵达图片
-    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getArrivalPhoto")
-    String getReceiptPhoto(@RequestParam String orderNumber);
-
-    //获取收货作业照片
-    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getReceivingPhotoByUrl")
-    public String getReceivingPhotoByUrl(@RequestParam String orderNumber);
-
-    //获得抵达实集
-    @PostMapping(value = "/api/v1/otms/tmstruckarrivalresults/addtmstruckArrivalResult")
-    public RESTfulResult addtmstruckArrivalResult(@RequestBody Map<String,Object>  map ,@RequestParam("orderNumber")String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestParam("file") String file);
-
-    //添加签收图片
-    @PostMapping(value = "/api/v1/otms/pathDisplay/addTmstruckReceiptResult")
-    public  RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object>  mapValaue  , @RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress);
-
-    //获得异常信息
-    @PostMapping("/api/v1/otms/pathDisplay/getTransportAbnormalInfo")
-    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
-                                                  @RequestParam(name = "pageNum") Integer pageNum,
-                                                  @RequestParam(name = "pageSize") Integer pageSize);
-
-    //抵达信息列表
-    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getArrivalResult")
-    Map<String, Object> getArrivalResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                         @RequestParam Integer apiId,
-                                         @RequestParam Integer pageNum,
-                                         @RequestParam Integer pageSize,
-                                         @RequestParam String con,
-                                         @RequestParam String startTime,
-                                         @RequestParam String endTime);
-
-    //获得抵达图片
-    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getArrivalPhoto")
-    String getArrivalPhoto(@RequestParam String orderNumber);
-
-    //获得签收实绩
-    @PostMapping("/api/v1/otms/pathDisplay/getReceiptResult")
-    Map<String, Object> getReceiptResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                         @RequestParam Integer apiId,
-                                         @RequestParam Integer pageNum,
-                                         @RequestParam Integer pageSize,
-                                         @RequestParam String con,
-                                         @RequestParam String startTime,
-                                         @RequestParam String endTime
-    );
-    @GetMapping("/api/v1/otms/pathDisplay/getCurrentLocation")
-    public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception;
-
-    //获取地图顶点
-    @GetMapping(value = "/api/v1/otms/mapvertexs/findAllAvailableVertex")
-    public RESTfulResult findAllAvailableVertex();
-
-    //获取最佳路径
-    @GetMapping(value = "/api/v1/otms/mapvertexs/getObtainTheOptimalPath")
-    public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) throws Exception;
-
-    //获取当前订单导航路径
-    @GetMapping(value = "/api/v1/otms/mapvertexs/getPathByOrderID")
-    public RESTfulResult getPathByOrderID(@RequestParam("orderId") String orderId,@RequestParam("startStep")  String startStep,@RequestParam("endStep")  String endStep) throws Exception;
-
-    //获取导航可选地点
-    @GetMapping(value = "/api/v1/otms/mapvertexs/findSelections")
-    public RESTfulResult findSelections();
-
-    @PostMapping("/api/v1/otms/mapvertexs/getMapVertex")
-    public RESTfulResult getMapVertex(@RequestBody Map<String,Object> map,
-                                      @RequestParam Integer apiId,
-                                      @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize);
-
-    @PostMapping("/api/v1/otms/mapvertexs/getMapEdge")
-    public RESTfulResult getMapEdge(@RequestBody Map<String,Object> map,
-                                    @RequestParam Integer apiId,
-                                    @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize);
-
-    @PostMapping("/api/v1/otms/mapvertexs/addMapVertex")
-    public RESTfulResult addMapVertex(@RequestBody Map<String,Object> map);
-
-    @PostMapping("/api/v1/otms/mapvertexs/addMapEdge")
-    public RESTfulResult addMapEdge(@RequestBody Map<String,Object> map);
-
-    @PostMapping("/api/v1/otms/mapvertexs/delMapVertex")
-    public RESTfulResult delMapVertex(@RequestBody Map<String,Object> map);
-
-    @PostMapping("/api/v1/otms/mapvertexs/delMapEdge")
-    public RESTfulResult delMapEdge(@RequestBody Map<String,Object> map);
-
-
-    @PostMapping("/api/v1/otms/pathDisplay/offLineWarn")
-    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
-
-    @PostMapping("/api/v1/otms/pathDisplay/parkWarn")
-    public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception;
-
-    @PostMapping("/api/v1/otms/pathDisplay/abnormalLineWarn")
-    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
-
-    //查询地址经纬度
-    @GetMapping("/api/v1/otms/pathDisplay/getLocationForAddress")
-    public RESTfulResult getLocationForAddress(@RequestParam("address") String address);
-
-    /**
-     * @author:zyf
-     * @version:1.0
-     * @Date:2022-10-19
-     * @Description:逆地址解析
-     */
-    @PostMapping("/api/v1/otms/Test/getAddress")
-    public RESTfulResult getAddress(@RequestBody Map<String,Object> map);
-
-}

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

@@ -1,234 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2021/10/1 17:19
- */
-
-@FeignClient(name = "dil-trick-queue-dev", url = "${openfeign.QmsTruckFeign.url}")
-public interface QmsFeign {
-
-    @RequestMapping(value = "/api/v1/queueTruck/qmsqueuegrids/getStackingId",method = RequestMethod.POST)
-    Map<String,Object> getStackingId(@RequestParam BigDecimal warehouseId,
-                                     @RequestParam int size);
-
-    /*
-    QmsQueueResultController /  QmsQueueListController
-     */
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
-     Map<String, Object> addQueueResult( @RequestParam("vno")String vno);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
-     Map<String, Object> addQueueList(@RequestParam("resultId")String resultId);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
-     Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            @RequestParam("apiId") Integer apiId,
-                                            @RequestParam("pageNum") Integer pageNum,
-                                            @RequestParam("pageSize") Integer pageSize,
-                                            @RequestParam("queueType") Integer queueType,
-                                            @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueApply")
-     Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
-                                             @RequestParam("apiId") Integer apiId,
-                                             @RequestParam("pageNum") Integer pageNum,
-                                             @RequestParam("pageSize") Integer pageSize,
-                                             @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueListByQueueUp")
-     Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     @RequestParam("apiId") Integer apiId,
-                                                     @RequestParam("pageNum") Integer pageNum,
-                                                     @RequestParam("pageSize") Integer pageSize,
-                                                     @RequestParam("locationId") Integer locationId,
-                                                     @RequestParam("capacityNumber")String capacityNumber,
-                                                     @RequestParam("isSpelling")Integer isSpelling
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getChangeQueue")
-     Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCancel")
-     Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancel")
-     Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con")String con
-
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateQueueCancel")
-     Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCutInLine")
-     Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueInsert")
-     Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueEndByPDA")
-    Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue);
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueEndResult")
-     Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 @RequestParam("apiId") Integer apiId,
-                                                 @RequestParam("pageNum") Integer pageNum,
-                                                 @RequestParam("pageSize") Integer pageSize,
-                                                 @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/listMonitor")
-     Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("isSpelling")Integer isSpelling
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getOrderReceive/{capacityNumber}")
-     Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/cancelQueue")
-     Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/allowEnFactory")
-    Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue);
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/modifyLoadWarehouse")
-    Map<String, Object> modifyLoadWarehouse(@RequestBody(required=false) Map<String, Object> mapValue);
-
-    @GetMapping("api/v1/queueTruck/qmsqueueresults/getQueueResultByTotalId")
-    Map<String, Object> getQueueResultByTotalId(@RequestParam("resultTotalId") String resultTotalId);
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListMonitorMes")
-    Map<String, Object> getListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/getSpellingListMonitorMes")
-    Map<String, Object> getSpellingListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/isInCircle")
-    Map<String, Object> isInCircle(@RequestParam String longitude,
-                                   @RequestParam String latitude,
-                                   @RequestParam String capacityNo);
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/ctrlZQueueAllow")
-    Map<String, Object> ctrlZQueueAllow(Map<String, Object> map);
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getStoreQueueList")
-    Map<String, Object> getStoreQueueList();
-
-//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
-//     Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                              @RequestParam("apiId") Integer apiId,
-//                                              @RequestParam("pageNum") Integer pageNum,
-//                                              @RequestParam("pageSize") Integer pageSize,
-//                                              @RequestParam("gatepostId") Integer gatepostId,
-//                                              @RequestParam("con")String con
-//    );
-
-    
-//    @PostMapping("api/v1/queueTruck/qmsqueuelists/changeQueue")
-//     Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue);
-//
-    
-
-//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancelByResultId/{resultId}")
-//     Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId);
-
-    
-
-//    @PostMapping("api/v1/queueTruck/qmsqueueresults/capacityMonitor")
-//     Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                               @RequestParam("apiId") Integer apiId,
-//                                               @RequestParam("pageNum") Integer pageNum,
-//                                               @RequestParam("pageSize") Integer pageSize,
-//                                               @RequestParam("gridType") Integer gridType,
-//                                               @RequestParam("con")String con
-//    );
-    
-
-
-//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueStatusList")
-//     Map<String, Object> getQueueStatusList();
-
-
-    
-
-//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllExecutionOrder")
-//     Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                                    @RequestParam("apiId") Integer apiId,
-//                                                    @RequestParam("pageNum") Integer pageNum,
-//                                                    @RequestParam("pageSize") Integer pageSize,
-//                                                    @RequestParam("orderType")Integer orderType,
-//                                                    @RequestParam("status")Integer status,
-//                                                    @RequestParam("con")String con
-//    );
-
-
-//
-//    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListQueueMes")
-//    RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-
-//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueChange")
-//    Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                                @RequestParam("apiId") Integer apiId,
-//                                                @RequestParam("pageNum") Integer pageNum,
-//                                                @RequestParam("pageSize") Integer pageSize,
-//                                                @RequestParam("con")String con
-//    );
-//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueEndMes")
-//    Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                                @RequestParam("apiId") Integer apiId,
-//                                                @RequestParam("pageNum") Integer pageNum,
-//                                                @RequestParam("pageSize") Integer pageSize,
-//                                                @RequestParam("con")String con
-//    );
-    @GetMapping("api/v1/queueTruck/qmsqueueresults/getAllModel")
-    Map<String, Object> getAllModel(@RequestParam String index);
-
-    @GetMapping("api/v1/queueTruck/qmsqueueresults/getAllModelUnrolled")
-    Map<String, Object> getAllModelUnrolled(@RequestParam String index);
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/addModel")
-    Map<String, Object> addModel(@RequestBody(required=false) Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateModel")
-    Map<String, Object> updateModel(@RequestBody(required=false) Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/deleteModel")
-    Map<String, Object> deleteModel(@RequestBody(required=false) Map<String,Object> mapValue);
-}

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

@@ -11,7 +11,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.math.BigDecimal;
 import java.util.Map;
 
-@FeignClient(value = "DIL-RMS-API-DEV", url = "${openfeign.RmsFeign.url}")
+@FeignClient(value = "ANTAI-RMS-API", url = "${openfeign.RmsFeign.url}")
 public interface RmsFeign {
     /**
      * @author huk

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

@@ -19,8 +19,8 @@ import java.util.Map;
  * @ time      :2021/9/28 9:30
  */
 
-@FeignClient(name = "dil-tms-truck-dev", url = "${openfeign.TmsTruckFeign.url}")
-public interface TmsTruckFeign {
+@FeignClient(name = "ANTAI-TMS-API", url = "${openfeign.TmsFeign.url}")
+public interface TmsFeign {
 
     /*
     TmstruckLoadResultController

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

@@ -1,311 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2021/10/1 16:19
- */
-
-@FeignClient(name = "dil-tms-train-dev", url = "${openfeign.TmsTrainFeign.url}")
-public interface TmsTrainFeign {
-
-/*
-    TmstrainLoadingResultController
- */
-
-    @PostMapping("api/v1/trainTms/tmstrainloadingresults/getTmstrainWagonLoad")
-    public Map<String, Object> getTmstrainWagonLoad(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("resultType") Integer resultType,
-                                              @RequestParam("materialId")Integer materialId,
-                                              @RequestParam("supplierId")Integer supplierId,
-                                                    @RequestParam("con") String con,
-                                                    @RequestParam("startTime")String startTime,
-                                                    @RequestParam("endTime")String endTime);
-
-
-    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/insertTmstrainLoadingResult")
-    public Map<String, Object> insertTmstrainLoadingResult(@RequestBody(required = false) Map<String, Object> map);
-
-
-    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getTmstrainLoadingResultByResultId/{resultId}")
-    public Map<String, Object> getTmstrainLoadingResultByResultId(@PathVariable("resultId") BigDecimal resultId);
-
-
-    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/upadteTmstrainLoadingResultByResultId")
-    public Map<String, Object> upadteTmstrainLoadingResultByResultId(@RequestBody(required = false) Map<String, Object> map);
-
-
-    @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")
-    public Map<String, Object> getSendStationName();
-
-
-    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getArrivalStationName")
-    public Map<String, Object> getArrivalStationName();
-
-
-    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getBatchId")
-    public Map<String, Object> getBatchId();
-
-    @ApiOperation(value = "获取已装车还未卸车车皮")
-    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getWagonNo/{resultType}")
-    public Map<String, Object> getWagonNo(@PathVariable("resultType") Integer resultType,
-                                    @RequestBody(required = false) Map<String, Object> mapValue,
-                                    @RequestParam("apiId") Integer apiId,
-                                    @RequestParam("pageNum") Integer pageNum,
-                                    @RequestParam("pageSize") Integer pageSize,
-                                    @RequestParam("wagon") String wagon,
-                                    @RequestParam("purchaseOrderNum") String purchaseOrderNum,
-                                    @RequestParam("materialName")String materialName);
-
-    /*
-        TmstrainWagonUnloadResultController
-     */
-
-    @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainWagonUnLoad")
-    public Map<String, Object> getTmstrainWagonUnLoad(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("resultType") Integer resultType,
-                                                      @RequestParam("con") String con);
-
-
-    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/deleteTmstrainWagonUnLoadResultByUnLoadingId")
-    public Map<String, Object> deleteTmstrainWagonUnLoadResultByUnLoadingId(@RequestParam BigDecimal unloadingId);
-
-
-    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/insertTmstrainWagonUnLoadResult")
-    public Map<String, Object> insertTmstrainWagonUnLoadResult(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult);
-
-
-    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/upadteTmstrainWagonUnLoadResultByUnLoadingId")
-    public Map<String, Object> upadteTmstrainWagonUnLoadResultByUnLoadingId(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult);
-
-
-    @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainresult")
-    public Map<String, Object> getTmstrainresult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
-                                                 @RequestParam("con") String con);
-
-
-    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainWagonUnLoadResultByUnLoadingId/{unloadingId}")
-    public Map<String, Object> getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId);
-
-
-        //下拉框
-    @GetMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getUnloadingPointName")
-    public Map<String, Object> getUnloadingPointName();
-
-
-    @GetMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getUnloadingRouteName")
-    public Map<String, Object> getUnloadingRouteName();
-
-
-
-    /**************************TmstrainPleaseApproveResultController************************************/
-
-    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getAllWagonPlease")
-    public Map<String, Object> getAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("status") Integer status,
-                                           @RequestParam("resultType") Integer resultType,
-                                           @RequestParam("resultId") Integer resultId,
-                                           @RequestParam("con") String con
-                                                 );
-
-    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getWagonPleaseById/{resultId}")
-    public Map<String, Object> getWagonPleaseById(@PathVariable("resultId")Integer resultId);
-
-    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonPlease")
-    public Map<String, Object> addWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
-
-
-    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/updateWagonPlease")
-    public Map<String, Object> updateWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
-
-
-    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/deleteWagonPlease/{resultId}")
-    public Map<String, Object> deleteWagonPlease(@PathVariable("resultId") Integer resultId);
-
-
-    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/sendWagonPlease/{resultId}")
-    public Map<String, Object> sendWagonPlease(@PathVariable("resultId") Integer resultId);
-
-    //下拉框
-    @GetMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getShipper")
-    public Map<String, Object> getShipper();
-
-    @GetMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getRailPlan")
-    Map<String, Object> getRailPlan();
-
-
-    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveAllWagonPlease")
-    public Map<String, Object> getApproveAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                  @RequestParam("apiId") Integer apiId,
-                                                  @RequestParam("pageNum") Integer pageNum,
-                                                  @RequestParam("pageSize") Integer pageSize,
-                                                  @RequestParam("resultType") Integer resultType,
-                                                  @RequestParam("status") Integer status,
-                                                  @RequestParam("con") String con
-    );
-
-    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveWagonPleaseById/{resultId}")
-    public Map<String, Object> getApproveWagonPleaseById(@PathVariable("resultId")Integer resultId);
-
-
-    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/addApproveWagonPlease")
-    public Map<String, Object> addApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
-
-    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/updateApproveWagonPlease")
-    public Map<String, Object> updateApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
-
-    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/deleteApproveWagonPlease/{resultId}")
-    public Map<String, Object> deleteApproveWagonPlease(@PathVariable("resultId") Integer resultId);
-
-    //*****************************************内转物流***************************************************
-
-    @PostMapping("api/v1/trainTms/tmstrainloadingresults/addTrainLoadResultForConverted")
-    Map<String,Object>  addTrainLoadResultForConverted(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
-
-    @PostMapping ("api/v1/trainTms/tmstrainloadingresults/selectLoadByResultId/{resultId}")
-    Map<String,Object> selectLoadByResultId(@PathVariable("resultId")BigDecimal resultId);
-
-    @PostMapping("api/v1/trainTms/tmstrainloadingresults/getTmstrainWagonLoadForConverted")
-    Map<String,Object> getTmstrainWagonLoadForConverted(@RequestBody(required=false)
-                                                        @RequestParam("apiId") Integer apiId,
-                                                        @RequestParam("pageNum") Integer pageNum,
-                                                        @RequestParam("pageSize") Integer pageSize,
-                                                        @RequestParam("con") String con);
-
-    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getPleasePlanByResultId/{resultId}")
-    Map<String,Object> getPleasePlanByResultId(@PathVariable("resultId")BigDecimal resultId);
-
-    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveByResultId/{resultId}")
-    Map<String,Object> getApproveByResultId(@PathVariable("resultId")BigDecimal resultId);
-
-    @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/selectWagonUnLoadResultForConverted")
-    Map<String,Object>  selectWagonUnLoadResultForConverted(
-                                                            @RequestParam("apiId") Integer apiId,
-                                                            @RequestParam("pageNum") Integer pageNum,
-                                                            @RequestParam("pageSize") Integer pageSize,
-                                                            @RequestParam("con") String con);
-
-    @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/selectTrainUnLoadResultForConverted")
-    Map<String,Object>  selectTrainUnLoadResultForConverted(
-                                                            @RequestParam("apiId") Integer apiId,
-                                                            @RequestParam("pageNum") Integer pageNum,
-                                                            @RequestParam("pageSize") Integer pageSize,
-                                                            @RequestParam("con") String con);
-    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonPleaseForNZ")
-    Map<String,Object> addPleaseForNZ(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
-
-    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/addTmsTrainUnloadResultForNZ")
-    Map<String, Object> addTmsTrainUnloadResultForNZ(@RequestBody(required = false)Map<String, Object> map);
-
-    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getMaterialAndCarByLoadingId")
-    Map<String, Object> getMaterialAndCarByLoadingId(
-            @RequestBody(required = false) Map<String, Object> mapValue,
-            @RequestParam("apiId") Integer apiId,
-            @RequestParam("pageNum") Integer pageNum,
-            @RequestParam("pageSize") Integer pageSize,
-            @RequestParam("loadingId")Integer loadingId,
-            @RequestParam("unloadingId")Integer unloadingId);
-
-    @ApiOperation(value = "国产矿导入")
-    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/importDomesticLoadResult")
-    Map<String, Object> importDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
-
-    @ApiOperation(value = "进口矿导入")
-    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/importImportedLoadResult")
-    Map<String, Object> importImportedLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
-
-    @ApiOperation(value = "国产矿物流新增装车")
-    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addDomesticLoadResult")
-    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
-
-    @ApiOperation(value = "国产矿物流补录装车信息")
-    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/updateDomesticLoadResult")
-    Map<String, Object> updateDomesticLoadResult(@RequestBody(required = false) Map<String, Object> map);
-
-    @ApiOperation(value = "添加火车计量委托")
-    @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/addTrainMeasureCommission")
-    Map<String, Object> addTrainMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
-
-
-    @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/getLoadResultToSendMC")
-    Map<String, Object> getLoadResultToSendMC( @RequestBody(required = false) Map<String, Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("resultType") Integer resultType,
-                                               @RequestParam("startTime") String startTime,
-                                               @RequestParam("endTime") String endTime,
-                                               @RequestParam("con") String con
-                                               );
-
-    @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/getWeightResult")
-    Map<String, Object> getWeightResult( @RequestBody(required = false) Map<String, Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("resultType") Integer resultType,
-                                               @RequestParam("startTime") String startTime,
-                                               @RequestParam("endTime") String endTime,
-                                               @RequestParam("con") String con
-    );
-
-    @ApiOperation(value = "批量新增计量委托")
-    @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
-    Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
-
-    @ApiOperation(value = "根据物资名和外轮船名查询采购订单号")
-    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getPurchaseOrderList")
-    Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> map,
-                                                   @RequestParam("apiId")Integer apiId,
-                                                   @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("materialName")String materialName,
-                                                   @RequestParam("resultForeignShipName")String resultForeignShipName,
-                                                   @RequestParam("supplierName")String supplierName);
-
-
-    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addWarehouseOutResult")
-    Map<String, Object> addWarehouseOutResult(@RequestBody(required = false) Map<String,Object> map);
-
-    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/getWareHouseOutresult/{resultId}")
-    Map<String, Object> getWareHouseOutresult(@PathVariable("resultId")BigDecimal resultId);
-
-
-    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/updateWarehouseResult")
-    Map<String, Object> updateWarehouseResult(@RequestBody(required = false) Map<String, Object> map);
-
-
-    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/getResultType")
-    Map<String, Object> getResultType(@RequestBody(required = false)Map<String,Object> map,
-                                      @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("con") String con);
-
-    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/addShipLoadResult")
-    Map<String, Object> addShipLoadResult(@RequestBody(required = false) Map<String, Object> map);
-}

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

@@ -1,878 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:HuJianGuo
- * @GreateTime:2021/9/23 8:46
- * @Version:V2.0
- */
-@FeignClient(value = "DIL-SHIPTMS-API-DEV", url = "${openfeign.TmsshipFeign.url}")
-public interface TmsshipFeign {
-
-    /**
-     * 展示驳船
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/getBargeOperationList")
-    Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam Integer pageNum,
-                                        @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId);
-
-    /**
-     * 查询驳船作业信息
-     *
-     * @param bargeOperationId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/getBargeOperation/{bargeOperationId}")
-    Map<String, Object> getBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
-
-    /**
-     * 查询驳船作业信息
-     *
-     * @param bargeOperationId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/selectBargeOperation/{bargeOperationId}")
-    Map<String, Object> selectBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
-
-    /**
-     * 删除驳船作业信息
-     *
-     * @param bargeOperationId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/deleteBargeOperation/{bargeOperationId}")
-    Map<String, Object> deleteBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
-
-    /**
-     * 修改驳船作业信息
-     *
-     * @param tmsshipBargeOperation
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/updateBargeOperation")
-    Map<String, Object> updateBargeOperation(@RequestBody Map<String, Object> tmsshipBargeOperation);
-
-    /**
-     * 新增驳船作业
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/addBargeOperation")
-    Map<String, Object> addBargeOperation(@RequestBody Map<String, Object> map);
-
-    /**
-     * 新增抵达实绩
-     *
-     * @param mapVal
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipentrywharyresults/addTmsShipEntryWharyResult")
-    Map<String, Object> addTmsShipEntryWharyResult(@RequestBody Map<String, Object> mapVal);
-
-    /**
-     * 新增离港实绩
-     *
-     * @param mapVal
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipoutwharyresults/addTmsShipOutWharyResult")
-    Map<String, Object> addTmsShipOutWharyResult(@RequestBody Map<String, Object> mapVal);
-
-    /**
-     * 展示装船作业信息列表
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/getLoadShipList")
-    Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("status") Integer status,
-                                        @RequestParam(required = false) String con,
-                                        @RequestParam("startTime") String startTime,
-                                        @RequestParam("endTime") String endTime);
-
-    /**
-     * 查询装船作业表单
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/getLoadShip/{resultId}")
-    Map<String, Object> getLoadShip(@PathVariable("resultId") BigDecimal resultId);
-
-    /**
-     * 查询装船作业信息
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/selectLoadShip/{resultId}")
-    Map<String, Object> selectLoadShip(@PathVariable("resultId") BigDecimal resultId);
-
-    /**
-     * 删除装船作业信息
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/deleteLoadShip/{resultId}")
-    Map<String, Object> deleteLoadShip(@PathVariable("resultId") BigDecimal resultId);
-
-    /**
-     * 修改装船作业信息
-     *
-     * @param tmsshipLoadShipResult
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/updateLoadShip")
-    Map<String, Object> updateLoadShip(@RequestBody Map<String, Object> tmsshipLoadShipResult);
-
-    /**
-     * 修改三程船装船信息
-     * @param mapVal
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/updateThreeSectionDetails")
-    Map<String, Object> updateThreeSectionDetails(@RequestBody(required = false)Map<String, Object> mapVal);
-
-    /**
-     * 新增装船作业
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/addLoadShip")
-    Map<String, Object> addLoadShip(@RequestBody Map<String, Object> map);
-
-    /**
-     * 展示位置作业信息列表
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationList")
-    Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                      @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize,
-                                      @RequestParam Integer apiId,
-                                            @RequestParam String con);
-
-    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationList")
-    Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam String con
-                                            );
-
-
-    /**
-     * 查询位置作业信息
-     *
-     * @param locationId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocation/{locationId}")
-    Map<String, Object> getShipLocation(@PathVariable("locationId") BigDecimal locationId);
-
-    /**
-     * 查询位置作业信息
-     *
-     * @param locationId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/selectShipLocation/{locationId}")
-    Map<String, Object> selectShipLocation(@PathVariable("locationId") BigDecimal locationId);
-
-    /**
-     * 删除位置作业信息
-     *
-     * @param locationId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/deleteShipLocation/{locationId}")
-    Map<String, Object> deleteShipLocation(@PathVariable("locationId") BigDecimal locationId);
-
-    /**
-     * 修改位置作业信息
-     *
-     * @param tmsshipShipLocation
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/updateShipLocation")
-    Map<String, Object> updateShipLocation(@RequestBody Map<String, Object> tmsshipShipLocation);
-
-    /**
-     * 新增位置作业
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/addShipLocation")
-    Map<String, Object> addShipLocation(@RequestBody Map<String, Object> map);
-
-    /**
-     * 展示水路货物运单列表
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/listAllOrders")
-    Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
-                                @RequestParam Integer pageNum,
-                                @RequestParam Integer pageSize,
-                                @RequestParam Integer apiId,
-                                      @RequestParam String con);
-
-    /**
-     * 展示船只信息
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getCapacityList")
-    Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam Integer pageNum,
-                                        @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId,
-                                        @RequestParam String con);
-
-    /**
-     * 展示卸船作业信息列表
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/getUnLoadShipList")
-    Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam Integer pageNum,
-                                          @RequestParam Integer pageSize,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam(required = false) String con);
-
-    /**
-     * 查询卸船作业信息
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/getUnloadShip/{resultId}")
-    Map<String, Object> getUnloadShip(@PathVariable("resultId") BigDecimal resultId);
-
-    /**
-     * 查询卸船作业信息
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/selectUnLoadShip/{resultId}")
-    Map<String, Object> selectUnLoadShip(@PathVariable("resultId") BigDecimal resultId);
-
-    /**
-     * 删除卸船作业信息
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/deleteUnLoadShip/{resultId}")
-    Map<String, Object> deleteUnLoadShip(@PathVariable("resultId") BigDecimal resultId);
-
-    /**
-     * 修改卸船作业信息
-     *
-     * @param tmsshipUnloadShipResult
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/updateUnLoadShip")
-    Map<String, Object> updateUnLoadShip(@RequestBody Map<String, Object> tmsshipUnloadShipResult);
-
-    /**
-     * 新增卸船作业
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/addUnLoadShip")
-    Map<String, Object> addUnLoadShip(@RequestBody Map<String, Object> map);
-
-    /**
-     * 展示水分质检信息列表
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/getWaterQualityResultList")
-    Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId,
-                                                  @RequestParam(required = false) String con);
-
-    /**
-     * 查询水分质检信息
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/getWaterQuality/{resultId}")
-    Map<String, Object> getWaterQuality(@PathVariable("resultId") BigDecimal resultId);
-
-    /**
-     * 查询水分质检信息
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/selectWaterQualityResult/{resultId}")
-    Map<String, Object> selectWaterQualityResult(@PathVariable("resultId") BigDecimal resultId);
-
-    /**
-     * 删除水分质检信息
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/deleteWaterQualityResult/{resultId}")
-    Map<String, Object> deleteWaterQualityResult(@PathVariable("resultId") BigDecimal resultId);
-
-    /**
-     * 修改水分质检作业信息
-     *
-     * @param tmsshipWaterQualityResult
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/updateWaterQualityResult")
-    Map<String, Object> updateWaterQualityResult(@RequestBody Map<String, Object> tmsshipWaterQualityResult);
-
-    /**
-     * 新增水分质检作业
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/addWaterQualityResult")
-    Map<String, Object> addWaterQualityResult(@RequestBody Map<String, Object> map);
-
-    /**
-     * 展示船只信息列表
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getCapacities")
-    Map<String, Object> getCapacities(@RequestParam BigDecimal instructionsId,
-                                @RequestBody(required = false) Map<String, Object> mapValue,
-                                @RequestParam Integer pageNum,
-                                @RequestParam Integer pageSize,
-                                @RequestParam Integer apiId);
-
-    /**
-     * 新增船只
-     *
-     * @param omsshipInstructionsCapacity
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/addInstructionsCapacity")
-    Map<String, Object> addInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity);
-
-    /**
-     * 查询船只
-     *
-     * @param instructionsCapacityId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getInstructionsCapacity/{instructionsCapacityId}")
-    Map<String, Object> getInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId);
-
-    /**
-     * 逻辑删除船只
-     *
-     * @param instructionsCapacityId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/deleteInstructionsCapacity/{instructionsCapacityId}")
-    Map<String, Object> deleteInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId);
-
-    /**
-     * 修改船只信息
-     *
-     * @param omsshipInstructionsCapacity
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/updateInstructionsCapacity")
-    Map<String, Object> updateInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity);
-
-    /**
-     * 展示装船指令
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getShipMentInstructionsList")
-    Map<String, Object> getShipMentInstructionsList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize,
-                                              @RequestParam Integer apiId,
-                                                    @RequestParam String status,
-                                                    @RequestParam String con);
-
-    /**
-     * 查询装船指令
-     *
-     * @param instructionsId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getShipmentInstructions/{instructionsId}")
-    Map<String, Object> getShipmentInstructions(@PathVariable("instructionsId") BigDecimal instructionsId);
-
-    /**
-     * 查询装船指令
-     *
-     * @param shipmentInstructionsId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/sendShipmentInstructionsStatus/{shipmentInstructionsId}")
-    Map<String, Object> sendShipmentInstructionsStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId);
-
-    /**
-     * 删除装船指令
-     *
-     * @param instructionsId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/deleteByPrimaryKey/{instructionsId}")
-    Map<String, Object> deleteByPrimaryKey(@PathVariable("instructionsId") BigDecimal instructionsId);
-
-    /**
-     * 修改装船指令
-     *
-     * @param omsshipShipmentInstructions
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/updateShipmentInstructions")
-    Map<String, Object> updateShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions);
-
-    /**
-     * 新增装船指令
-     *
-     * @param omsshipShipmentInstructions
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/addShipmentInstructions")
-    Map<String, Object> addShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions);
-
-    /**
-     * 下拉框
-     * @return
-     */
-    @GetMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getGroupId")
-    Map<String, Object> getGroupId();
-
-    @GetMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getCargoId")
-    Map<String, Object> getCargoId();
-
-    @GetMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/insertBetchId")
-    Map<String, Object> insertBetchId();
-
-    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getAttorneyId")
-    Map<String, Object> getAttorneyId();
-
-    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getNoticeId")
-    Map<String, Object> getNoticeId();
-
-    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getPortName")
-    Map<String, Object> getPortName();
-
-    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getPortId")
-    Map<String, Object> getPortId();
-
-    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getRmRawId")
-    Map<String, Object> getRmRawId();
-
-    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getPierId")
-    Map<String, Object> getPierId();
-
-    @GetMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getResultNumber")
-    Map<String, Object> getResultNumber();
-
-    @GetMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getCarrier")
-    Map<String, Object> getCarrier();
-
-    @GetMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getShipper")
-    Map<String, Object> getShipper();
-
-    @GetMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getOrderId")
-    Map<String, Object> getTask();
-
-    @GetMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getCapacityId")
-    Map<String, Object> getCapacityId();
-
-    @GetMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getBatchId")
-    Map<String, Object> getBatchId();
-
-
-    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchList")
-    Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam Integer pageNum,
-                                     @RequestParam Integer pageSize,
-                                     @RequestParam Integer apiId);
-
-
-
-    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchListForAttorney")
-    Map<String, Object> getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam Integer pageNum,
-                                     @RequestParam Integer pageSize,
-                                     @RequestParam Integer apiId,
-                                     @RequestParam String con);
-
-    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchListForInstruction")
-    Map<String, Object> getBatchListForInstruction(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                @RequestParam Integer pageNum,
-                                                @RequestParam Integer pageSize,
-                                                @RequestParam Integer apiId,
-                                                @RequestParam String con);
-
-    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchIdByForeign")
-    Map<String, Object> getBatchIdByForeign(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId,
-                                            @RequestParam String con);
-
-    //获取船运物资id
-    @GetMapping("/api/v1/shipTms/amsshipcargotransferresults/getMaterialId")
-    Map<String,Object> getMaterialId();
-
-    //船舶动态表
-    @PostMapping("api/v1/shipTms/shipdynamics/selectAllShipDynamaics")
-    Map<String, Object> selectAllShipDynamaics(@RequestBody(required = false) Map<String,Object> map,
-                                               @RequestParam("con") String con);
-
-    //万州港装车数据
-    @PostMapping("api/v1/shipTms/shipdynamics/getLoadData")
-    Map<String, Object> getLoadData(@RequestBody(required = false) Map<String,Object> map);
-
-    //万州港卸船数据
-    @PostMapping("api/v1/shipTms/shipdynamics/getUnloadData")
-    Map<String, Object> getUnloadData(@RequestBody(required = false) Map<String,Object> map);
-
-    //游港口船舶动态表
-    @PostMapping("api/v1/shipTms/shipdynamics/getDownShipDynamaics")
-    Map<String, Object> getDownShipDynamaics(@RequestBody(required = false) Map<String,Object> map);
-
-    @PostMapping(value = "/api/v1/shipTms/shipdynamics/getControlLines")
-    Map<String, Object> getControlLines(@RequestBody Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/shipTms/shipdynamics/updateControlLine")
-    Map<String, Object> updateControlLine(@RequestBody Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/shipTms/shipdynamics/getControlLinesTable")
-    Map<String, Object> getControlLinesTable(@RequestBody Map<String, Object> map);
-    /**
-     * 展示货权转移
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getAmsshipCargoTranferResultList")
-    Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                         @RequestParam Integer pageNum,
-                                                         @RequestParam Integer pageSize,
-                                                         @RequestParam Integer apiId);
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/selectShippeByName")
-    Map<String, Object>   selectShippeByName(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam String con);
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getMaterialList")
-       Map<String, Object>  getMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam String con);
-
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getGroupList")
-      Map<String, Object> getGroupList (@RequestBody(required = false) Map<String, Object> mapValue,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam String con);
-    /**
-     * 新增货权转移
-     *
-     * @param amsshipCargoTransferResult
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/insertamsshipCargoTransferResult")
-    Map<String, Object> insertamsshipCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult);
-
-    /**
-     * 逻辑删除货权转移
-     *
-     * @param cargoTransferResultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/deleteByCargoId/{cargoTransferResultId}")
-    Map<String, Object> deleteByCargoId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId);
-
-    /**
-     * 修改货权转移
-     *
-     * @param amsshipCargoTransferResult
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/editCargoTransferResult")
-    Map<String, Object> editCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult);
-
-    /**
-     * 查询货权转移
-     *
-     * @param cargoTransferResultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/selectByCargoTranferResultId/{cargoTransferResultId}")
-    Map<String, Object> selectByCargoTranferResultId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId);
-
-    /**
-     * 展示提货委托
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getAmsshipDeliveryAttroneyList")
-    Map<String, Object> getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                 @RequestParam Integer pageNum,
-                                                 @RequestParam Integer pageSize,
-                                                 @RequestParam Integer apiId,
-                                                 @RequestParam Integer status,
-                                                       @RequestParam String con);
-
-    /**
-     * 新增提货委托
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/insertshipDeliveryAttorney")
-    Map<String, Object> insertshipDeliveryAttorney(@RequestBody(required = false) Map<String, Object> map);
-
-    /**
-     * 逻辑删除提货委托
-     *
-     * @param attorneyId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/deleteByAttorneyId/{attorneyId}")
-    Map<String, Object> deleteByAttorneyId(@PathVariable("attorneyId") Integer attorneyId);
-
-    /**
-     * 修改提货委托
-     *
-     * @param amsshipDeliveryAttorney
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/editDeliveryAttroney")
-    Map<String, Object> editDeliveryAttroney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
-
-    /**
-     * 查询提货委托
-     *
-     * @param attorneyId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getDeliveryAttorneyId/{attorneyId}")
-    Map<String, Object> getDeliveryAttorneyId(@PathVariable("attorneyId") Integer attorneyId);
-
-    /**
-     * 下发提货委托
-     *
-     * @param attorneyId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/sendDeliveryAttorneyStatus/{attorneyId}")
-    Map<String, Object> sendDeliveryAttorneyStatus(@PathVariable("attorneyId") Integer attorneyId);
-
-    /**
-     * 展示放货通知
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getshipDeliveryNoticeList")
-    Map<String, Object> getshipDeliveryNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId,
-                                            @RequestParam Integer  status,
-                                                  @RequestParam(required = false) String con,
-                                                  @RequestParam String startTime,
-                                                  @RequestParam String endTime);
-
-    /**
-     * 新增放货通知
-     *
-     * @param amsshipDeliveryNotice
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/insertDeliveryNotice")
-    Map<String, Object> insertDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice);
-
-    /**
-     * 逻辑删除放货通知
-     *
-     * @param noticeId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/deleteByNoticeId/{noticeId}")
-    Map<String, Object> deleteByNoticeId(@PathVariable("noticeId") Integer noticeId);
-
-    /**
-     * 修改放货通知
-     *
-     * @param amsshipDeliveryNotice
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/editDeliveryNotice")
-    Map<String, Object> editDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice);
-
-    /**
-     * 查询放货通知
-     *
-     * @param noticeId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/selectByNoticeId/{noticeId}")
-    Map<String, Object> selectByNoticeId(@PathVariable("noticeId") Integer noticeId);
-
-    /**
-     * 下发放货通知
-     *
-     * @param noticeId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/sendDeliveryNotice/{noticeId}")
-    Map<String, Object> sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId);
-
-    //船舶动态表
-    @PostMapping("api/v1/shipTms/shipdynamics/selectAllShipDynamaics")
-    Map<String, Object> selectAllShipDynamaics();
-
-
-    //获取合同水分值，实装吨位，水分吨位
-    @PostMapping("api/v1/shipTms/tmsshipwaterqualityresults/getMoistureAndInstallations")
-    Map<String,Object> getMoistureAndInstallations(Map<String,Object> map);
-
-    //    模糊查询江船名
-    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
-    Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
-
-    //  根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话
-    @PostMapping("/api/v1/shipTms/dilbatchs/getPersonByName")
-    Map<String, Object> getPersonByName(@RequestParam(value ="personName")String personName);
-
-    @ApiOperation("value=查询船舶状态")
-    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationStatus")
-    Map<String, Object> getShipLocationStatus(@RequestParam("shipLocation") String shipLocation);
-
-
-    @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/downLoadDeilveryNotice")
-    Map<String, Object> downLoadDeilveryNotice(@RequestParam("noticeId") Integer noticeId);
-
-    @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/uploadCargoPic" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    String uploadCargoPic(@RequestPart("file") MultipartFile multipartFile);
-
-
-    @PostMapping(value =  "api/v1/shipTms/dilbatchs/getNoticeContactNumberByPerson")
-    Map<String, Object> getNoticeContactNumberByPerson(@RequestParam("personName") String personName);
-
-
-    @PostMapping("/api/v1/shipTms/tmsshiptotalresults/addPleaseResult")
-    Map<String,Object> addPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal);
-
-    @PostMapping("/api/v1/shipTms/tmsshiptotalresults/editPleaseResult")
-    Map<String,Object> editPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal);
-
-    @PostMapping("/api/v1/shipTms/tmsshiptotalresults/getAllPleaseResult")
-    Map<String,Object> getAllPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal,
-                                          @RequestParam Integer pageNum,
-                                          @RequestParam Integer pageSize,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam String con,
-                                          @RequestParam String startTime,
-                                          @RequestParam String endTime);
-
-    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getPleaseResult/{resultId}")
-    Map<String, Object> getPleaseResult(@PathVariable("resultId") BigDecimal resultId);
-
-    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getRealNumber")
-    Map<String, Object> getRealNumber(Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/shipTms/shipdynamics/getWagonWork")
-    Map<String, Object> getWagonWork(Map<String, Object> map);
-
-    @ApiOperation(value = "查询待绑定的批次id")
-    @PostMapping(value = "api/v1/shipTms/dilbatchs/findBatchForBind")
-    Map<String, Object> findBatchForBind(@RequestBody(required = false) Map<String, Object> map,
-                                         @RequestParam("apiId")Integer apiId,
-                                         @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("materialName")String materialName,
-                                         @RequestParam("foreignShipName")String foreignShipName);
-
-    @ApiOperation(value = "绑定批次")
-    @PostMapping(value = "api/v1/shipTms/dilbatchs/bindBatch")
-    Map<String, Object> bindBatch(@RequestBody(required = false) Map<String, Object> map);
-}

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

@@ -13,7 +13,7 @@ import java.util.Map;
  * @author luobang
  * @create 2021-09-17 14:13
  */
-@FeignClient(value = "DAL-DAZHOU-WMS-DEV",url = "${openfeign.WMSFeign.url}")
+@FeignClient(value = "ANTAI-WMS-API",url = "${openfeign.WMSFeign.url}")
 public interface WMSFeign {
     /**
      * 钢材入库实绩

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

@@ -1,162 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:HuJianGuo
- * @GreateTime:2021/10/12 9:54
- * @Version:V2.0
- */
-@FeignClient(value = "dil-wmsh-api", url = "${openfeign.WMSHFeign.url}")
-public interface WMSHFeign {
-
-    /**
-     * 展示下游港口港存库库存列表
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getUnloadPortStockList")
-    RESTfulResult getUnloadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam Integer pageNum,
-                                        @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId);
-
-    /**
-     * 展示万州港港存库库存列表
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getLoadPortStockList")
-    RESTfulResult getLoadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       @RequestParam Integer pageNum,
-                                       @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId,
-                                       @RequestParam String con);
-
-    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getDownPortStockList")
-    RESTfulResult getDownPortStockList(@RequestBody(required = false) Map<String, Object> mapValue);
-
-    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getRunStockList")
-    RESTfulResult getRunStockList(@RequestBody(required = false) Map<String, Object> mapValue);
-
-    /**
-     * 查询所有港存库入库实绩
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/getInBoundResult")
-    RESTfulResult getInBoundResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                               @RequestParam Integer apiId,
-                               @RequestParam Integer pageNum,
-                               @RequestParam Integer pageSize);
-
-    /**
-     * 新增港存库入库实绩
-     *
-     * @param wmshInboundResult
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/addWarehousingResult")
-    RESTfulResult addWarehousingResult(@RequestBody(required = false) Map<String, Object> wmshInboundResult);
-
-    /**
-     * 通过实绩Id查询实绩
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/getResultById/{resultId}")
-    RESTfulResult getResultById(@PathVariable("resultId") Integer resultId);
-
-    /**
-     * 逻辑删除港存库入库实绩
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/deleteWareHosingResult/{resultId}")
-    RESTfulResult deleteWareHosingResult(@PathVariable("resultId") Integer resultId);
-
-    /**
-     * 修改港存库入库实绩
-     *
-     * @param wmshInboundResult
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/updateWareHosingResult")
-    RESTfulResult updateWareHosingResult(@RequestBody Map<String, Object> wmshInboundResult);
-
-    /**
-     * 查询所有港存库出库实绩
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wmsh/wmshoutboundresults/getOutBoundResult")
-    RESTfulResult getOutBoundResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                               @RequestParam Integer apiId,
-                               @RequestParam Integer pageNum,
-                               @RequestParam Integer pageSize);
-
-    /**
-     * 添加港存库出库实绩
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wmsh/wmshoutboundresults/addResult")
-    RESTfulResult addResult(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/findInboundDetail")
-    RESTfulResult findInboundDetail(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/wmsh/wmshoutboundresults/findOutboundDetail")
-    RESTfulResult findOutboundDetail(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/clearWmshGridMaterial")
-    RESTfulResult clearWmshGridMaterial(@RequestBody(required = false) Map<String, Object> wmshInboundResult);
-
-    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getLoadPortStockByMaterialName")
-    RESTfulResult getLoadPortStockByMaterialName(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                 @RequestParam("pageNum") Integer pageNum,
-                                                 @RequestParam("pageSize") Integer pageSize,
-                                                 @RequestParam("apiId") Integer apiId,
-                                                 @RequestParam("con")String con);
-
-    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getUnLockPortStock")
-    RESTfulResult getUnLockPortStock(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("con") String con ,
-                                     @RequestParam("activeName")String activeName,
-                                     @RequestParam("startTime")String startTime,
-                                     @RequestParam("endTime")String endTime);
-
-    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/selectLoadResult")
-    Map<String,Object> selectLoadResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                   @RequestParam("con") String con);
-}

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -15,291 +15,25 @@ import java.util.Map;
 
 @Mapper
 public interface UniversalMapper {
-     int updateLineSqe(Map<String, Object> map);
 
-    //通过运输订单号查询订单信息
-    Map<String, Object> getTiHuoDan(String orderNumber);
-
-    //通过运输订单号查找订单子表物资信息
-    List<Map<String, Object>> getOOMMes(String orderNumber);
-
-    //模糊查询所有物资
-    List<Map<String, Object>> queryAPOMaterialByLike(Map<String, Object> map);
-
-    //模糊查询发货单位
-    List<Map<String, Object>> querySupplierByLike(Map<String, Object> map);
-
-    //模糊查询承运商的运力信息
-    List<Map<String, Object>> getAllCapacityByCarrierLike(Map<String, Object> map);
-
-    //通过运输订单ID查询物资子表（针对多拼）
-    List<Map<String, Object>> getMaterialMesByOrderId(Map<String, Object> map);
-
-    //通过订单ID查询订单下所有物资
-    List<Map<String, Object>> getOrderMaterialMesByOrderId(BigDecimal orderId);
-
-    //通过物资ID查询该物资的发货单位信息
-    List<Map<String, Object>> getSupplierMesByMaterialId(Map<String, Object> map);
-
-    //模糊查询所有的卸货点信息
-    List<Map<String, Object>> getUnloadingMesByLike(Map<String, Object> map);
-
-    //模糊查询所有物资
-    List<Map<String, Object>> queryMaterialByLike(Map<String, Object> map);
-
-    //查询所有的批次及其关联的采购订单号
-    List<Map<String, Object>> getBatchAndOrderMes(Map<String, Object> map);
-
-    //承运商边输边查
-    List<Map<String, Object>> getCarrierMesByLike(String index);
-
-    //边输边查发货单位
-    List<Map<String, Object>> getSupplierMesByLike(String index);
-
-    //边输边查收货单位
-    List<Map<String,Object>> getConsigneeByLike(String index);
-
-    // 收货单位
-    List<Map<String, Object>> queryConsigneeByLike(Map<String, Object> mapValue);
-
-    List<Map<String, Object>> getConsigneeHistory();
-
-    // 所有物资
-    List<Map<String, Object>> selectAllMaterialName(Map<String, Object> mapValue);
-
-    // 所有承运商
-    List<Map<String, Object>> getCarrierListByLike(Map<String, Object> mapValue);
-
-    //查卸货点
-    List<Map<String, Object>> selectUnloadingPoint(String index1);
-
-    // 查询所有门岗
+    //查询所有的门岗（下拉框）
     List<Map<String, Object>> getAllGatepost();
 
-    //获取承运商下拉框
-    List<Map<String,Object>> getAllCarrierIdForSso();
-
-    //根据承运商id获取userId
-    String getUserIdbyCarrierId(Integer carrierId);
-
-    // 模糊查询收货单位
-    List<Map<String, Object>> getConsigneeListByLike(Map<String, Object> mapValue);
-
-    //模糊查询所有发货单位
-    List<Map<String, Object>> queryAllSupplierByLike(Map<String, Object> mapValue);
-
-    // 通过ssoId查询承运商id
-    BigDecimal getCarrierIdBySSO(String carrierSsoId);
-
-    Integer getSaleOrderStatus(BigDecimal orderId);
-
-    //通过运输订单号查询订单类型和ID
-        Map<String, Object> getOrderMesByOrderNumber(String orderNumber);
-
-    //查询所有的门岗（下拉框）
+    //查询所有的汽车衡（下拉框）
     List<Map<String, Object>> getAllCalculateMes();
 
-    //查询所有的焦炭子类
-    List<Map<String, Object>> getAllMaterialCoke();
-
-
-    //边输边查发货单位
-    List<Map<String, Object>> getCapacityByLike(String index);
-
-    //模糊查询批次品名
-    List<Map<String, Object>> getBatchByLike(String index);
-
-    // 根据运力id查询所有承运商
-    List<Map<String, Object>> getCarrierByCapacityId(BigDecimal capacityId);
-
-    // 根据收货客户查询承运商
-    Map<String, Object> getCarrierByConsignee(String consigneeName);
-
-    // 确认车牌号与承运商关系是否存在
-    BigDecimal isInCapacityCarrier(Map<String, Object> mapValue);
-
-    BigDecimal isInCapacity(Map<String, Object> mapValue);
-
-    List<Map<String, Object>> getOilFormula(Map<String, Object> mapValue);
-
-    //边输边查用车单位
-    List<Map<String, Object>> getRequireUnitName(String index);
-
-    //获得港口下拉框
-    List<Map<String, Object>> getPortId();
-
-    //根据车牌号查询正在运输的订单号
-    Map<String, Object> getOrderNumber(String num);
-
-    //查询车牌号
-    List<Map<String, Object>> getCapacityNumber(String num);
-
-    //根据订单Id查询物资
-    List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId);
-
-    //边输边查物资
-    List<Map<String, Object>> getMaterialByLike(String index);
-
-    Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
-
-    //边输边查物资
-    List<Map<String, Object>> getSteelMaterial(Map<String, Object> mapValue);
-
-    // 得到所有省份
-    List<Map<String, Object>> getAllProvince();
-
-    // 通过省份得到省份下面的市
-    List<Map<String, Object>> getDistrictByProvince(String addressProvince);
-
-    // 通过市得到市下面的区和县
-    List<Map<String, Object>> getTownByDistrict(String addressDistrict);
-
-    // 通过省市县得到具体地址
-    List<Map<String, Object>> getPlaceByAllAddress(Map<String, Object> mapValue);
-
-    // 得到销售员下拉
-    List<Map<String, Object>> getSalerList();
-
-    // 获得销售组
-    String getSaleArea(BigDecimal receiveId);
-
-    List<Map<String,Object>> getWarranty(String orderNumber);
-
-    List<Map<String, Object>> getCapacityType(Map<String, Object> mapValue);
-
-    Integer getPlanCount();
-
-    List<Map<String, Object>> getTransRange();
-
-
-    BigDecimal getResultMaterialId(String orderNumber);
-
-    Map<String, Object> selectNum(String orderNumber);
-
-    List<Map<String, Object>> selectOutbound(String orderNumber);
-
-    List<Map<String,Object>> getNoListCarrier();
-    //通过车牌号查询未接收的订单数量（用于APP显示未接收小红点）
-    Integer getNotReceiveOrderQuantity(String capacityNumber);
-
-    List<Map<String,Object>> getXiNanCarrier();
-
-    //边输边查发站到站
-    List<Map<String, Object>> getArrivalByLike(String index);
-
-    //查询已下发订单数量  -->APP小红点
-    Integer getOrderNum(String capacityNumber);
-
-
-    //仓库月台下拉框
-    List<Map<String, Object>> getSteelWarehouse();
-
-    List<Map<String, Object>> getShipNameMesByLike(Map<String, Object> map);
-
-    //查询运力联系方式
-    Map<String, Object> getCapacityTel(BigDecimal capacityId);
-
-    // 边输边查收货客户
-    List<Map<String, Object>> getConsigneeMesByLike(String s);
-
-    Map<String, Object> getConsigneeByuserid(String userId);
-
-    int updateSaleOrderStatusById(BigDecimal saleOrderId);
-    // 修改司机电话
-    int updateDriverTel(Map<String, Object> map);
-    //同步修改到运力
-    int updateCapacityDriverTel(int orderId,String driverTel);
-
-    int getQueueCount();
-    // 下拉下单客户的历史使用过的地址
-    List<Map<String, Object>> getReceiverAllPlaceUsed(Integer receiveId);
-    // 片区边输边查
-    List<Map<String, Object>> getSaleAreaByLike(String index);
-    // 判断收货客户是否绑定片区
-    BigDecimal isReceiveHaveArea(Integer receiveId);
-    // 绑定片区
-    int bandSaleArea(Map<String, Object> map);
-
-    int getSteelOrderNum();
-    // 边输边查收货地址
-    List<Map<String, Object>> getPlaceAndAddress(String index);
-    // 边输边查物资名称
-    List<Map<String, Object>> getMaterialNameLike(String index);
-    // 边输边查仓库名称
-    List<Map<String, Object>> getWareHouseNameLike(String index);
-    // 边输边查物资规格型号
-    List<Map<String, Object>> getSpecificationModelLike(Map<String,Object> map);
-
-    int closePassedOrder();
-
-    List<Map<String,Object>> findPassedOrder();
-
-    List<Map<String, Object>> getInwardWeightMaterial(Map<String, Object> mapValue);
-
-    List<Map<String,Object>> selectPurchaseOrderForShip(Map<String,Object> map);
-
-    List<Map<String,Object>> getBatchOfNotice(Map<String,Object> map);
-
-    List<Map<String,Object>> findBatchHavingLoad(Map<String,Object> map);
-
-    List<Map<String,Object>> getInwardSendStation();
-
-    List<Map<String,Object>> getInwardInboundResult(Map<String, Object> map);
-
-    List<Map<String, Object>> getMaterialList(Map<String, Object> map1);
-
-    List<Map<String, Object>> getLuhaoNum(@Param("orderId") BigDecimal orderId, @Param("materialId") BigDecimal materialId);
-
-
-    //查询多拼数据
-    BigDecimal queueMore(BigDecimal orderId);
-
-    //查询实绩
-    BigDecimal sumNetWeight(BigDecimal orderId);
-
-    //状态设为2
-    int updateStatusTwo(BigDecimal orderId);
-
-    //状态设为7
-    int updateStatusSeven(BigDecimal orderId);
-
-    //查询单拼数据
-    BigDecimal queueSingle(BigDecimal orderId);
-
-    //删除单拼数据
-    int delectQueueS(BigDecimal capacityIdS);
-    //删除多拼数据
-    int delectQueueM(BigDecimal capacityIdM);
-
-    Map<String, Object> getDispachSwitch();
-
-    int updateDispachSwitch(Map<String, Object> map);
-
-    String getReleaseFlag();
-
-    Map<String, Object> getConsigneeInfo(String consigneeName);
+    //查询所有的仓库（下拉框）
+    List<Map<String, Object>> getAllWareHouse();
 
     List<String> getColumnNoRoutList(Map<String, Object> map);
 
-    Map<String, Object> getSteelReportDetailsBySmId(BigDecimal saleOrderMaterialId);
-
     List<String> getColumnHiddenData(Map<String, Object> map);
 
     List<Map<String, Object>> getColumnShowData(Map<String, Object> map);
 
     List<Map<String, Object>> getColumnAllData(Map<String, Object> map);
 
-
-    int updateRemark(Map<String, Object> map);
-
-
     List<Map<String, Object>> getColumnAllScheme(Map<String, Object> map);
 
-
-    int updateRemarkPic(Map<String, Object> map);
-
     String getWlUrl();
-
-    int updateTruckRemark(Map<String, Object> map);
-
 }

src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -10,19 +10,6 @@ import java.util.Map;
 
 public interface UniversalService {
 
-    //打印提货单
-    Map<String, Object> printTiHuoDan(String orderNumber);
-
-    //查询路段顺序及当前路段顺序号
-    Map<String, Object> getNowLineMes(Map<String, Object> map);
-
-   // List<String> getWarrantyAndPrint(String orderNumber);
-
-    List<String> getWarranty(java.lang.String orderNumber);
-
-    List<String> getTest(Map<String, Object> map);
-
-    Map<String, Object> submitSteel(Map<String, Object> map);
 
     Map<String, Object> getColumnShowHidden(Map<String, Object> map);
 

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.steerinfo.dil.feign.AmsFeign;
-import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.DilRoleOrgcodeTableMapper;
 import com.steerinfo.dil.mapper.DilTableColumnRoleMapper;
 import com.steerinfo.dil.mapper.UniversalMapper;
@@ -40,386 +39,11 @@ public class UniversalServiceImpl implements UniversalService {
     @Resource
     private DilTableColumnRoleMapper dilTableColumnRoleMapper;
 
-    @Autowired
-    private JoinFeign joinFeign;
 
-    @Autowired
-    private ESUtil esUtil;
 
     @Autowired
     private AmsFeign amsFeign;
-    /**
-     * 打印提货单
-     * @param orderNumber 运输订单号
-     * @return
-     */
-    @Override
-    public Map<String, Object> printTiHuoDan(String orderNumber) {
-
-        //查询订单信息
-        Map<String, Object> tiHuoDanMap = universalMapper.getTiHuoDan(orderNumber);
-        //查询该订单下的所有装车信息
-        List<Map<String, Object>> oomMes = universalMapper.getOOMMes(orderNumber);
-        tiHuoDanMap.put("loadMes", oomMes);
-        return tiHuoDanMap;
-    }
-
-
-    /**
-     * 查询路段顺序及当前路段顺序号
-     * @param map
-     * @return
-     */
-    @Override
-    public Map<String, Object> getNowLineMes(Map<String, Object> map) {
-
-        return null;
-    }
-
-//    @Override
-//    public  List<String> getWarrantyAndPrint(String orderNumber) {
-//        List<Map<String,Object>> warrantyCode = universalMapper.getWarranty(orderNumber);
-//        List<String> list = new ArrayList<>();
-//        String content = null;
-//        for(Map<String,Object> code:warrantyCode){
-//            Blob blob = (Blob) code.get("warrantyCode");
-//            try {
-//               content = new String(blob.getBytes((long)1, (int)blob.length()));
-//               String string = content.substring(0,content.length()-2);
-//               System.out.println(string);
-//               list.add(string);
-//            } catch (SQLException throwables) {
-//                throwables.printStackTrace();
-//            }
-//        }
-//
-//        return list;
-//    }
-
-    @Override
-    public List<String> getWarranty(String orderNumber) {
-        List<String> list = new ArrayList<>();
-        //回传金蝶
-        //根据orderNumber查询
-        Map<String,Object> map = getWarrantyToES(orderNumber);
-        String string = null;
-        try{
-             string = joinFeign.sendWarranty(map);
-            Map<String,Object> waMap = JSON.parseObject(string);
-            //成功
-            if(waMap.get("kdStatus").equals("1")){
-                List<Map<String,Object>> reportList = (List<Map<String,Object>>) waMap.get("qcReportList");
-                Map<String,Object> map1 = reportList.get(0);
-                Iterator<Map.Entry<String, Object>> it = map1.entrySet().iterator();
-                Map.Entry<String,Object> entry;
-                while(it.hasNext()){
-                    entry =  it.next();
-                    String value = (String) entry.getValue();
-                    list.add(value);
-                }
-            }    //失败
-            else{
-                list.add("-1");
-            }
-        }catch (NullPointerException e){
-            e.printStackTrace();
-            list.add("-2");
-        }
-        return list;
-    }
-
-    @Override
-    public List<String> getTest(Map<String, Object> map) {
-        List<String> list = new ArrayList<>();
-        //成功
-        if(map.get("kdStatus").equals("1")){
-            List<Map<String,Object>> reportList = (List<Map<String,Object>>) map.get("qcReportList");
-            Map<String,Object> map1 = reportList.get(0);
-            Iterator<Map.Entry<String, Object>> it = map1.entrySet().iterator();
-            Map.Entry<String,Object> entry;
-            while(it.hasNext()){
-                entry =  it.next();
-                String value = (String) entry.getValue();
-                list.add(value);
-            }
-        }//失败
-        else{
-            list.add("0");
-        }
-        return list;
-    }
-
-    //出库与金蝶打通接口(获得质保书)
-    public Map<String,Object> getWarrantyToES(String orderNumber) {
-        Map<String, Object> input = new HashMap<>();
-        Map<String, Object> head = universalMapper.selectNum(orderNumber);
-        input.put("head", head);
-        List<Map<String, Object>> mapList = universalMapper.selectOutbound(orderNumber);
-        input.put("entries",mapList);
-        Map<String,Object> totalMap = esUtil.getTotalMap();
-        //组装报文
-        totalMap.put("input",input);
-        return totalMap;
-    }
-
-
-    /**
-     * sha1加密字符串
-     * @param text
-     * @return
-     */
-    public String sha1DigestUtils(String text){
-        return DigestUtils.sha1Hex(text);
-    }
-
-    /**
-     * 根据收货客户查询承运商
-      */
-    public Map<String, Object> getCarrierByConsignee(Map<String, Object> mapValue){
-        String isSelfMention = (String) mapValue.get("isSelfMention");
-        String consigneeName = (String) mapValue.get("consigneeName");
-        Map<String, Object> map = new HashMap<>();
-        if (isSelfMention.equals("是")) {
-            map = universalMapper.getCarrierByConsignee(consigneeName);
-        }
-        else {
-            map.put("carrierId",null);
-            map.put("carrierName",null);
-        }
-        return map;
-    }
-
-    /**
-     *
-     * @param mapValue
-     * @return
-     */
-    public Map<String, Object> isInCapacityCarrier(Map<String, Object> mapValue) {
-        BigDecimal capacityCarrierId = universalMapper.isInCapacityCarrier(mapValue);
-        BigDecimal capacityId = universalMapper.isInCapacity(mapValue);
-        Map<String,Object> map = new HashMap<>();
-        map.put("capacityCarrierId",capacityCarrierId);
-        map.put("capacityId",capacityId);
-        return map;
-    }
-
-    public List<Map<String, Object>> getPortId() {
-        return universalMapper.getPortId();
-    }
-
-    //获取订单号以及订单号下的物资
-    public Map<String, Object> getOrderNumber(String num) {
-        return universalMapper.getOrderNumber(num);
-    }
-
-    public List<Map<String, Object>> getCapacityNumber(String num) {
-        return universalMapper.getCapacityNumber(num);
-    }
-
-
-    public List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId) {
-        return universalMapper.getMaterialIdByOrderId(orderId);
-    }
-
-    public int recordingWeightResult(List<Map<String, Object>> mapList) throws IOException {
-        String URL = "http://172.16.33.166:8066/api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult";
-        String jsonData = null;
-        String jsonString= JSON.toJSONString(mapList);
-        jsonData = HTTPRequestUtils.send(URL, jsonString,"utf-8");
-        if(!"null".equals(jsonData)){
-            System.out.println(jsonData);
-            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
-            String code = (String) hashMap.get("code");
-            System.out.println(hashMap.get("code"));
-            if("SUCCESS".equals(code)){
-                return 1;
-            }else{
-                return 0;
-            }
-        }else{
-            System.out.println("补录委托失败：" + jsonData);
-            return 0;
-        }
-    }
-
-    /**
-     * 关闭过期运输订单
-     * @return
-     */
-    //@Scheduled(cron = "0 0,5 8 * * ?")
-    public void closePassedOrder() {
-        //List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
-        //System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
-        //int result=0;
-        ////int result = universalMapper.closePassedOrder();
-        //try {
-        //    if (passedOrderList.isEmpty()){
-        //
-        //    }else {
-        //        for (Map<String, Object> map : passedOrderList) {
-        //            BigDecimal orderId = (BigDecimal) map.get("orderId");
-        //            //分两种情况关单
-        //            //净重为0状态设为2，不为零设为7
-        //            BigDecimal bigDecimal = universalMapper.sumNetWeight(orderId);
-        //            if (bigDecimal.compareTo(BigDecimal.ZERO)!=0){
-        //                result+=universalMapper.updateStatusTwo(orderId);
-        //            }else {
-        //                result+=universalMapper.updateStatusSeven(orderId);
-        //            }
-        //           /* BigDecimal capacityIdS=universalMapper.queueSingle(orderId);*/
-        //            /*if (capacityIdS !=null){
-        //                //删除单拼
-        //                universalMapper.delectQueueS(capacityIdS);
-        //            }*/
-        //            /*//查询多拼的数据
-        //            BigDecimal capacityIdM =universalMapper.queueMore(orderId);
-        //            if (capacityIdM !=null){
-        //                //删除多拼
-        //                universalMapper.delectQueueM(capacityIdM);
-        //            }
-        //            //查询单拼的数据
-        //            BigDecimal capacityIdS=universalMapper.queueSingle(orderId);
-        //            if (capacityIdS !=null){
-        //                //删除单拼
-        //                universalMapper.delectQueueS(capacityIdS);
-        //            }*/
-        //        }
-        //    }
-        //
-        //}catch (Exception e){
-        //
-        //}
-        //System.out.println("订单关闭数为：" + result);
-        //return 1;
-    }
-
-
-    public int linkageDeleteTransportOrder(List<Map<String, Object>> mapList) throws IOException{
-        String URL = "http://172.16.33.166:8066/api/v1/join/tmstruckweightresult/linkageDeleteTransportOrder";
-        String jsonData = null;
-        String jsonString= JSON.toJSONString(mapList);
-        jsonData = HTTPRequestUtils.send(URL, jsonString,"utf-8");
-        if(!"null".equals(jsonData)){
-            System.out.println(jsonData);
-            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
-            String code = (String) hashMap.get("code");
-            System.out.println(hashMap.get("code"));
-            if("200".equals(code)){
-                return 1;
-            }else{
-                return 0;
-            }
-        }else{
-            System.out.println("补录委托失败：" + jsonData);
-            return 0;
-        }
-    }
 
-    @Override
-    public Map<String, Object> submitSteel(Map<String, Object> map) {
-        List<String> responseMapList = new ArrayList<>();
-        List<String> responseMapFailedList = new ArrayList<>();
-        BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(map.get("saleOrderMaterialId"));
-        //根据车序号ID获取内容
-        Map<String,Object> oldMes = universalMapper.getSteelReportDetailsBySmId(saleOrderMaterialId);
-        //修改车辆备注
-        if(map.get("truckRemark") != null && !map.get("truckRemark").equals(oldMes.get("truckRemark"))) {
-            universalMapper.updateTruckRemark(map);
-            responseMapList.add("修改车辆备注成功");
-        }
-        //修改收货客户电话
-        if(map.get("consigneeTel") != null && !map.get("consigneeTel").equals(oldMes.get("consigneeTel"))) {
-            Map<String, Object> updateConsigneeTelMap = new HashMap<>();
-            updateConsigneeTelMap.put("saleOrderNo",map.get("saleOrderNo"));
-            updateConsigneeTelMap.put("saleOrderMaterialId",map.get("saleOrderMaterialId"));
-            updateConsigneeTelMap.put("consigneeTel",map.get("consigneeTel"));
-            Map<String,Object> updateConsigneeMap = amsFeign.updateConsigneeTel(updateConsigneeTelMap);
-            if(updateConsigneeMap.get("code").toString().equals("200")) {
-                responseMapList.add("修改收货客户电话号码成功");
-            }else{
-                responseMapFailedList.add("修改收货客户电话号码失败");
-            }
-        }
-        //修改备注
-        if(map.get("orderId") != null && map.get("remark") != null && !map.get("remark").equals(oldMes.get("remark"))) {
-            universalMapper.updateRemark(map);
-            responseMapList.add("修改备注成功");
-        }
-        if(map.get("orderId") != null && map.get("urls") != null && !map.get("urls").equals(oldMes.get("urls"))) {
-            universalMapper.updateRemarkPic(map);
-            responseMapList.add("修改备注图片成功");
-        }
-        //修改司机电话号码
-        if(map.get("capacityTel") != null && !map.get("capacityTel").equals(oldMes.get("capacityTel"))) {
-            Map<String, Object> updateDriverTelMap = new HashMap<>();
-            updateDriverTelMap.put("orderId",map.get("orderId"));
-            updateDriverTelMap.put("saleOrderMaterialId",map.get("saleOrderMaterialId"));
-            updateDriverTelMap.put("driverTel",map.get("capacityTel"));
-            universalMapper.updateCapacityDriverTel(DataChange.dataToBigDecimal(map.get("orderId")).intValue(),map.get("capacityTel").toString());
-            universalMapper.updateDriverTel(updateDriverTelMap);
-            responseMapList.add("修改司机电话号码成功");
-
-        }
-        //修改承运商授权
-        if(map.get("carrierName") != null && !"".equals(map.get("carrierName")) && !map.get("carrierName").equals(oldMes.get("carrierName"))){
-            if(oldMes.get("carrierName") == null) {
-                List<Map<String,Object>> list = new ArrayList<>();
-                list.add(map);
-                Map<String,Object> updateCarrierMap = (Map<String, Object>) amsFeign.dispatchToCarrier(list);
-                if (updateCarrierMap.get("code").toString().equals("0")) {
-                    responseMapList.add("授权承运商成功");
-                }else {
-                    responseMapFailedList.add("授权承运商失败,请联系管理员");
-                }
-            }else{
-                Map<String,Object> updateCarrierMap = amsFeign.updateTruckNoCarrier(map);
-                if (updateCarrierMap.get("code").toString().equals("200")) {
-                    responseMapList.add("修改承运商授权成功");
-                }else {
-                    responseMapFailedList.add("修改承运商授权失败,请联系管理员");
-                }
-            }
-        }
-        //修改收货地址
-        if (map.get("place") != null && !"".equals(map.get("place")) && (!map.get("place").equals(oldMes.get("place"))) || DataChange.dataToBigDecimal(map.get("shipperAddressId")).compareTo(DataChange.dataToBigDecimal(oldMes.get("shipperAddressId"))) != 0){
-            map.put("isCloseEas",1);
-            map.put("isNewCar",1);
-            Map<String,Object> updateCarAddress = amsFeign.updateCarAddress(map);
-            if (updateCarAddress.get("code").toString().equals("200")) {
-                responseMapList.add("修改收货地址成功");
-            }else{
-                responseMapFailedList.add("修改收货地址失败,请联系管理员");
-            }
-
-        }
-        //修改运力
-        if (map.get("capacityNo") != null && !"".equals(map.get("capacityNo")) && !map.get("capacityNo").equals(oldMes.get("capacityNo"))) {
-            if(oldMes.get("capacityId") != null) {
-                //修改运力
-                Map<String,Object> updateCapacityMap = amsFeign.updateCapacityNumberInFactory(map);
-                if (updateCapacityMap.get("code").toString().equals("200")) {
-                    responseMapList.add("修改车牌号成功");
-                }else{
-                    responseMapFailedList.add("修改车牌号失败,失败理由:" + updateCapacityMap.get("data"));
-                }
-                System.out.println(updateCapacityMap);
-
-            }else{
-                List<Map<String,Object>> list = new ArrayList<>();
-                list.add(map);
-                Map<String,Object> updateCapacityMap = amsFeign.dispatchSteelOrder(list);
-                if (updateCapacityMap.get("code").toString().equals("200")) {
-                    responseMapList.add("派发车牌号成功");
-                }else{
-                    responseMapFailedList.add("派发车牌号失败,失败理由:" + updateCapacityMap.get("data"));
-                }
-            }
-        }
-        Map<String, Object> resMap = new HashMap<>();
-        resMap.put("response",responseMapList);
-        resMap.put("responseMapFailed",responseMapFailedList);
-        return resMap;
-    }
 
     @Override
     public Map<String, Object> getColumnShowHidden(Map<String, Object> map) {

src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    url: jdbc:oracle:thin:@175.6.82.29:1521:STEER
     password: Dil123789
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
@@ -10,41 +10,31 @@ spring:
     async:
       request-timeout: 15000
 
+server:
+  port: 8080
+  tomcat:
+    max-threads: 1000
+    accept-count: 800
+
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
-  BmsshipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
-  BmstrainFeign:
-    url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
-  BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
-  QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
-  TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-  TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
-  WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.166:8070}
+    url: ${AMSFEIGN_URL:localhost:8079}
+  BmsFeign:
+    url: ${BMSFEIGN_URL:localhost:8078}
+  TmsFeign:
+    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+    url: ${WMSFEIGN_URL:localhost:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.33.166:8060}
-  JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.166:8066}
+    url: ${RMSFEIGN_URL:localhost:8060}
+  IntegrationFeign:
+    url: ${INTEGRATIONFEIGN_URL:localhost:8066}
   OTMSFeign:
-    url: ${OTMSFEIGN_URL:172.16.33.166:8038}
-piction:
+    url: ${OTMSFEIGN_URL:localhost:8038}
+
+picture:
   path: /shared
-server:
-  port: 8080
-  tomcat:
-    max-threads: 1000
-    accept-count: 800

src/main/resources/bootstrap.yml

@@ -12,17 +12,6 @@ spring:
   mvc:
     static-path-pattern:
 
-#eureka设置
-eureka:
-  client:
-    service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
-    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
-    fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
-  instance:
-    prefer-ip-address: false
-    status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
-    instance-id: ${spring.cloud.client.ip-address}:${server.port}
 
 genxml:
   pth: com/agit