asdasd

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

@@ -1,10 +1,6 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.AmsFeign;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.PageListAdd;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,7 +19,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("${api.version}/ams")
-public class AMScontroller extends BaseRESTfulController {
+public class AMScontroller{
 
     @Autowired
     AmsFeign amsFeign;
@@ -37,7 +33,7 @@ public class AMScontroller extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getAllPurPlan")
-    public RESTfulResult getAllPurPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getAllPurPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                        Integer apiId,
                                        Integer pageNum,
                                        Integer pageSize,
@@ -52,7 +48,7 @@ public class AMScontroller extends BaseRESTfulController {
 
      */
     @PostMapping("/getAllPurPlan/{apiId}")
-    public RESTfulResult getDetailListByCon(@PathVariable("apiId") Integer apiId,
+    public Map<String, Object> getDetailListByCon(@PathVariable("apiId") Integer apiId,
                                             @RequestBody(required = false) Map<String, Object> mapValue,
                                             Integer pageNum,
                                             Integer pageSize,
@@ -65,7 +61,7 @@ public class AMScontroller extends BaseRESTfulController {
 
     @ApiOperation(value = "通过Id查询请车作业")
     @PostMapping("/getPurPlanById/{planId}")
-    public RESTfulResult getPurPlanById(@PathVariable("planId") Integer planId) {
+    public Map<String, Object> getPurPlanById(@PathVariable("planId") Integer planId) {
         return amsFeign.getPurPlanById(planId);
     }
 
@@ -74,16 +70,25 @@ public class AMScontroller extends BaseRESTfulController {
             @ApiImplicitParam(name = "amstruckPurplan", value = "运输计划实绩对象", required = false, dataType = "AmstruckPurplan"),
     })
     @PostMapping("/addPurPlan")
-    public RESTfulResult addPurPlan(@RequestBody Map<String, Object> map) {
+    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 RESTfulResult sendPurPlan(@PathVariable("planId") Integer planId) {
+    public Map<String, Object> sendPurPlan(@PathVariable("planId") Integer planId) {
         return amsFeign.sendPurPlan(planId);
     }
 
@@ -92,7 +97,7 @@ public class AMScontroller extends BaseRESTfulController {
             @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
     })
     @PostMapping("/receptionPurPlan/{planId}")
-    public RESTfulResult receptionPurPlan(@PathVariable("planId") Integer planId) {
+    public Map<String, Object> receptionPurPlan(@PathVariable("planId") Integer planId) {
         return amsFeign.receptionPurPlan(planId);
     }
 
@@ -101,7 +106,7 @@ public class AMScontroller extends BaseRESTfulController {
             @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
     })
     @PostMapping("/deletePurPlan/{planId}")
-    public RESTfulResult deletePurPlan(@PathVariable("planId") Integer planId) {
+    public Map<String, Object> deletePurPlan(@PathVariable("planId") Integer planId) {
         return amsFeign.deletePurPlan(planId);
     }
 
@@ -115,7 +120,7 @@ public class AMScontroller extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getDecomposedPlan")
-    public RESTfulResult getDecomposedPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getDecomposedPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
@@ -136,7 +141,7 @@ public class AMScontroller extends BaseRESTfulController {
      */
     @PostMapping("getBreachList")
     @ApiOperation(value = "展示违约列表")
-    public RESTfulResult getBreachList(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getBreachList(@RequestBody(required = false) Map<String, Object> mapValue,
                                        Integer pageNum,
                                        Integer pageSize,
                                        Integer apiId) {
@@ -148,25 +153,25 @@ public class AMScontroller extends BaseRESTfulController {
 
     @PostMapping("addContractBreach")
     @ApiOperation(value = "新增违约规则")
-    RESTfulResult addContractBreach(@RequestBody Map<String, Object> amsContractBreach) {
+    Map<String, Object> addContractBreach(@RequestBody Map<String, Object> amsContractBreach) {
         return amsFeign.addContractBreach(amsContractBreach);
     }
 
     @PostMapping("deleteContractBreach/{breachId}")
     @ApiOperation(value = "逻辑删除违约规则")
-    RESTfulResult deleteContractBreach(@PathVariable("breachId") BigDecimal breachId) {
+    Map<String, Object> deleteContractBreach(@PathVariable("breachId") BigDecimal breachId) {
         return amsFeign.deleteContractBreach(breachId);
     }
 
     @PostMapping("updateContractBreach")
     @ApiOperation(value = "修改违约规则")
-    RESTfulResult updateContractBreach(@RequestBody Map<String, Object> amsContractBreach) {
+    Map<String, Object> updateContractBreach(@RequestBody Map<String, Object> amsContractBreach) {
         return amsFeign.updateContractBreach(amsContractBreach);
     }
 
     @PostMapping("selectBreachToUpdate/{breachId}")
     @ApiOperation(value = "查询违约规则")
-    RESTfulResult selectBreachToUpdate(@PathVariable("breachId") BigDecimal breachId) {
+    Map<String, Object> selectBreachToUpdate(@PathVariable("breachId") BigDecimal breachId) {
         return amsFeign.selectBreachToUpdate(breachId);
     }
 
@@ -182,7 +187,7 @@ public class AMScontroller extends BaseRESTfulController {
      */
     @PostMapping("getLoadUnloadPriceList")
     @ApiOperation(value = "展示港口装卸单价列表")
-    public RESTfulResult getLoadUnloadPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getLoadUnloadPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                 Integer pageNum,
                                                 Integer pageSize,
                                                 Integer apiId) {
@@ -194,25 +199,25 @@ public class AMScontroller extends BaseRESTfulController {
 
     @PostMapping("addLoadUnloadPrice")
     @ApiOperation(value = "新增港口装卸单价")
-    RESTfulResult addLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice) {
+    Map<String, Object> addLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice) {
         return amsFeign.addLoadUnloadPrice(amsContractOtherPrice);
     }
 
     @PostMapping("deleteLoadUnloadPrice/{priceId}")
     @ApiOperation(value = "逻辑删除港口装卸单价")
-    RESTfulResult deleteLoadUnloadPrice(@PathVariable("priceId") BigDecimal priceId) {
+    Map<String, Object> deleteLoadUnloadPrice(@PathVariable("priceId") BigDecimal priceId) {
         return amsFeign.deleteLoadUnloadPrice(priceId);
     }
 
     @PostMapping("updateLoadUnloadPrice")
     @ApiOperation(value = "修改港口装卸单价")
-    RESTfulResult updateLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice) {
+    Map<String, Object> updateLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice) {
         return amsFeign.updateLoadUnloadPrice(amsContractOtherPrice);
     }
 
     @PostMapping("selectLoadUnloadPriceToUpdate/{priceId}")
     @ApiOperation(value = "查询港口装卸单价")
-    RESTfulResult selectLoadUnloadPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
+    Map<String, Object> selectLoadUnloadPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
         return amsFeign.selectLoadUnloadPriceToUpdate(priceId);
     }
 
@@ -228,7 +233,7 @@ public class AMScontroller extends BaseRESTfulController {
      */
     @PostMapping("getTrainPriceList")
     @ApiOperation(value = "展示火运单价列表")
-    public RESTfulResult getTrainPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getTrainPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer pageNum,
                                            Integer pageSize,
                                            Integer apiId) {
@@ -240,25 +245,25 @@ public class AMScontroller extends BaseRESTfulController {
 
     @PostMapping("addTrainPrice")
     @ApiOperation(value = "新增火运单价")
-    RESTfulResult addTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice) {
+    Map<String, Object> addTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice) {
         return amsFeign.addTrainPrice(amsContractTrainPrice);
     }
 
     @PostMapping("deleteTrainPrice/{priceId}")
     @ApiOperation(value = "逻辑删除火运单价")
-    RESTfulResult deleteTrainPrice(@PathVariable("priceId") BigDecimal priceId) {
+    Map<String, Object> deleteTrainPrice(@PathVariable("priceId") BigDecimal priceId) {
         return amsFeign.deleteTrainPrice(priceId);
     }
 
     @PostMapping("updateTrainPrice")
     @ApiOperation(value = "修改火运单价")
-    RESTfulResult updateTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice) {
+    Map<String, Object> updateTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice) {
         return amsFeign.updateTrainPrice(amsContractTrainPrice);
     }
 
     @PostMapping("selectTrainPriceToUpdate/{priceId}")
     @ApiOperation(value = "通过id查询火运单价")
-    RESTfulResult selectTrainPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
+    Map<String, Object> selectTrainPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
         return amsFeign.selectTrainPriceToUpdate(priceId);
     }
 
@@ -273,7 +278,7 @@ public class AMScontroller extends BaseRESTfulController {
      */
     @PostMapping("getShipPriceList")
     @ApiOperation(value = "展示水运单价列表")
-    public RESTfulResult getShipPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getShipPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {
@@ -285,31 +290,31 @@ public class AMScontroller extends BaseRESTfulController {
 
     @PostMapping("addShipPrice")
     @ApiOperation(value = "新增水运单价")
-    RESTfulResult addShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
+    Map<String, Object> addShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
         return amsFeign.addShipPrice(amsContractTransportPrice);
     }
 
     @PostMapping("deleteShipPrice/{priceId}")
     @ApiOperation(value = "逻辑删除运费单价")
-    RESTfulResult deleteShipPrice(@PathVariable("priceId") BigDecimal priceId) {
+    Map<String, Object> deleteShipPrice(@PathVariable("priceId") BigDecimal priceId) {
         return amsFeign.deleteShipPrice(priceId);
     }
 
     @PostMapping("updateShipPrice")
     @ApiOperation(value = "修改水运单价")
-    RESTfulResult updateShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
+    Map<String, Object> updateShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
         return amsFeign.updateShipPrice(amsContractTransportPrice);
     }
 
     @PostMapping("selectPriceToUpdate/{priceId}")
     @ApiOperation(value = "通过id查询运费单价")
-    RESTfulResult selectPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
+    Map<String, Object> selectPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
         return amsFeign.selectPriceToUpdate(priceId);
     }
 
     @PostMapping("getTruckPriceList")
     @ApiOperation(value = "展示汽运单价列表")
-    public RESTfulResult getTruckPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getTruckPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer pageNum,
                                            Integer pageSize,
                                            Integer apiId) {
@@ -321,20 +326,20 @@ public class AMScontroller extends BaseRESTfulController {
 
     @PostMapping("addAmsContractTransportPrice")
     @ApiOperation(value = "新增汽运单价")
-    RESTfulResult addAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
+    Map<String, Object> addAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
         return amsFeign.addAmsContractTransportPrice(amsContractTransportPrice);
     }
 
     @PostMapping("updateAmsContractTransportPrice")
     @ApiOperation(value = "修改汽运单价")
-    RESTfulResult updateAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
+    Map<String, Object> updateAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
         return amsFeign.updateAmsContractTransportPrice(amsContractTransportPrice);
     }
 
 
     @PostMapping("getPurchaseOrderList")
     @ApiOperation(value = "展示采购订单列表")
-    public RESTfulResult getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer apiId) {
@@ -350,43 +355,43 @@ public class AMScontroller extends BaseRESTfulController {
      */
     @GetMapping("getAddressDeliveryAddress")
     @ApiOperation(value = "得到地址下拉")
-    public RESTfulResult getAddressDeliveryAddress(){
+    public Map<String, Object> getAddressDeliveryAddress(){
         return amsFeign.getAddressDeliveryAddress();
     }
 
     @GetMapping("getShipperId")
     @ApiOperation(value = "得到托运人下拉")
-    public RESTfulResult getShipperId(){
+    public Map<String, Object> getShipperId(){
         return amsFeign.getShipperId();
     }
 
     @GetMapping("getCarrierId")
     @ApiOperation(value = "得到承运商下拉")
-    public RESTfulResult getCarrierId(){
+    public Map<String, Object> getCarrierId(){
         return amsFeign.getCarrierId();
     }
 
     @GetMapping("getCapacityId")
     @ApiOperation(value = "获取船id下拉列表")
-    public RESTfulResult getCapacityId(){
+    public Map<String, Object> getCapacityId(){
         return amsFeign.getCapacityId();
     }
 
     @GetMapping("getMaterialId")
     @ApiOperation(value = "得到物资下拉")
-    public RESTfulResult getMaterialId(){
+    public Map<String, Object> getMaterialId(){
         return amsFeign.getMaterialId();
     }
 
     @GetMapping("getTruckCapacityId")
     @ApiOperation(value = "得到车牌号下拉")
-    public RESTfulResult getTruckCapacityId(){
+    public Map<String, Object> getTruckCapacityId(){
         return amsFeign.getTruckCapacityId();
     }
 
     @GetMapping("getLineId")
     @ApiOperation(value = "获取运输线路下拉列表")
-    public RESTfulResult getLineId(){
+    public Map<String, Object> getLineId(){
         return amsFeign.getLineId();
     }
 // ----------------------------------销售合同-------------------------------------------
@@ -401,7 +406,7 @@ public class AMScontroller extends BaseRESTfulController {
      */
     @PostMapping("/amscontracttransportprices")
     @ApiOperation(value = "查询汽运单价信息")
-    public RESTfulResult amscontracttransportprices(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> amscontracttransportprices(@RequestBody(required = false) Map<String, Object> mapValue,
                                        Integer pageNum,
                                        Integer pageSize,
                                        Integer apiId) {
@@ -418,12 +423,12 @@ public class AMScontroller extends BaseRESTfulController {
      */
     @PostMapping("addAmsContractTransportUnitPrice")
     @ApiOperation(value = "新增汽运单价")
-    RESTfulResult addAmsContractTransportUnitPrice(@RequestBody Map<String, Object> mapVal) {
+    Map<String, Object> addAmsContractTransportUnitPrice(@RequestBody Map<String, Object> mapVal) {
         return amsFeign.addAmsContractTransportUnitPrice(mapVal);
     }
     @PostMapping("deleteAmsContractTransportPrice")
     @ApiOperation(value = "通过主键id删除汽运单价")
-    RESTfulResult deleteAmsContractTransportPrice(BigDecimal priceId) {
+    Map<String, Object> deleteAmsContractTransportPrice(BigDecimal priceId) {
         return amsFeign.deleteAmsContractTransportPrice(priceId);
     }
 
@@ -432,7 +437,7 @@ public class AMScontroller extends BaseRESTfulController {
      */
     @PostMapping("updateAmsContractTransportUnitPrice")
     @ApiOperation(value = "通过主键id修改汽运单价")
-    RESTfulResult updateAmsContractTransportUnitPrice(@RequestBody(required = false) Map<String, Object> mapVal) {
+    Map<String, Object> updateAmsContractTransportUnitPrice(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.updateAmsContractTransportUnitPrice(mapVal);
     }
     /**
@@ -440,36 +445,36 @@ public class AMScontroller extends BaseRESTfulController {
      */
     @PostMapping("batchUpdateTransportPriceByOilPrice")
     @ApiOperation(value = "油价联动导致运价变动，批量修改运价")
-    RESTfulResult batchUpdateTransportPriceByOilPrice(@RequestBody(required = false) Map<String, Object> mapVal) {
+    Map<String, Object> batchUpdateTransportPriceByOilPrice(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.batchUpdateTransportPriceByOilPrice(mapVal);
     }
     @GetMapping("getLineNo")
     @ApiOperation(value = "得到线路编号下拉")
-    public RESTfulResult getLineNo(){
+    public Map<String, Object> getLineNo(){
         return amsFeign.getLineNo();
     }
     @GetMapping("getCapacityNumber")
     @ApiOperation(value = "得到运力编号下拉")
-    public RESTfulResult getCapacityNumber(){
+    public Map<String, Object> getCapacityNumber(){
         return amsFeign.getCapacityNumber();
     }
     @GetMapping("getDeliveryAddress")
     @ApiOperation(value = "得到收货地址下拉")
-    public RESTfulResult getDeliveryAddress(){
+    public Map<String, Object> getDeliveryAddress(){
         return amsFeign.getDeliveryAddress();
     }
     @PostMapping("/addAmsDispatchSaleOrder")
-    RESTfulResult addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
+    Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.addAmsDispatchSaleOrder(mapVal);
     }
     @GetMapping("getCarrierName")
     @ApiOperation(value = "得到承运商名称")
-    public RESTfulResult getCarrierName(){
+    public Map<String, Object> getCarrierName(){
         return amsFeign.getCarrierName();
     }
     @PostMapping("getSaleOrderInfo")
     @ApiOperation(value = "查询汽运单价信息")
-    public RESTfulResult getSaleOrderInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getSaleOrderInfo(@RequestBody(required = false) Map<String, Object> mapValue,
                                                     Integer pageNum,
                                                     Integer pageSize,
                                                     Integer apiId) {
@@ -480,7 +485,7 @@ public class AMScontroller extends BaseRESTfulController {
     }
     @PostMapping("getAmsSaleOrderApproved")
     @ApiOperation(value = "查询汽运单价信息")
-    public RESTfulResult getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {
@@ -491,7 +496,7 @@ public class AMScontroller extends BaseRESTfulController {
     }
     @PostMapping("getSaleOrderDetail")
     @ApiOperation(value = "查询汽运单价信息")
-    public RESTfulResult getSaleOrderDetail(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getSaleOrderDetail(@RequestBody(required = false) Map<String, Object> mapValue,
                                                  Integer pageNum,
                                                  Integer pageSize,
                                                  Integer apiId) {
@@ -501,28 +506,28 @@ public class AMScontroller extends BaseRESTfulController {
         return amsFeign.getSaleOrderDetail(mapValue, pageNum, pageSize, apiId);
     }
     @PostMapping("uploadSaleOrder/{saleOrderId}")
-    RESTfulResult uploadSaleOrder(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
+    Map<String, Object> uploadSaleOrder(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
         return amsFeign.uploadSaleOrder(saleOrderId);
     }
     @PostMapping("/addAmsSaleOrder")
-    RESTfulResult addAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
+    Map<String, Object> addAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.addAmsSaleOrder(mapVal);
     }
     @PostMapping("getAmsSaleOrderBySaleOrderId/{saleOrderId}")
-    RESTfulResult getAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
+    Map<String, Object> getAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
         return amsFeign.getAmsSaleOrderBySaleOrderId(saleOrderId);
     }
     @PostMapping("/updateAmsSaleOrder")
-    RESTfulResult updateAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
+    Map<String, Object> updateAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.updateAmsSaleOrder(mapVal);
     }
     @PostMapping("deleteAmsSaleOrderBySaleOrderId/{saleOrderId}")
-    RESTfulResult deleteAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
+    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
         return amsFeign.deleteAmsSaleOrderBySaleOrderId(saleOrderId);
     }
     @PostMapping("getSaleOrderUpdateLog")
     @ApiOperation(value = "查询汽运单价信息")
-    public RESTfulResult getSaleOrderUpdateLog(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getSaleOrderUpdateLog(@RequestBody(required = false) Map<String, Object> mapValue,
                                             Integer pageNum,
                                             Integer pageSize,
                                             Integer apiId) {
@@ -533,37 +538,37 @@ public class AMScontroller extends BaseRESTfulController {
     }
     @GetMapping("getShipperName")
     @ApiOperation(value = "得到发货单位下拉")
-    public RESTfulResult getShipperName(){
+    public Map<String, Object> getShipperName(){
         return amsFeign.getShipperName();
     }
     @GetMapping("getConsigneeCompanyName")
     @ApiOperation(value = "得到收货单位下拉")
-    public RESTfulResult getConsigneeCompanyName(){
+    public Map<String, Object> getConsigneeCompanyName(){
         return amsFeign.getConsigneeCompanyName();
     }
     @PostMapping("addAmsSaleOrderMaterial")
-    RESTfulResult addAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map) {
+    Map<String, Object> addAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map) {
         return amsFeign.addAmsSaleOrderMaterial(map);
     }
     @PostMapping("getAmsSaleOrderMaterialBySaleOrderMaterialId/{saleOrderMaterialId}")
-    RESTfulResult getAmsSaleOrderMaterialBySaleOrderMaterialId(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderMaterialId) {
+    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderMaterialId) {
         return amsFeign.getAmsSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
     }
     @PostMapping("deleteAmsSaleOrderMaterialBySaleOrderMaterialId")
-    RESTfulResult deleteAmsSaleOrderMaterialBySaleOrderMaterialId(BigDecimal saleOrderMaterialId) {
+    Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(BigDecimal saleOrderMaterialId) {
         return amsFeign.deleteAmsSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
     }
     @PostMapping("getAddress/{saleOrderMaterialId}")
-    RESTfulResult getAddress(BigDecimal saleOrderMaterialId) {
+    Map<String, Object> getAddress(BigDecimal saleOrderMaterialId) {
         return amsFeign.getAddress(saleOrderMaterialId);
     }
     @PostMapping("updateAddress")
-    RESTfulResult updateAddress(@RequestBody(required = false)Map<String,Object> map) {
+    Map<String, Object> updateAddress(@RequestBody(required = false)Map<String,Object> map) {
         return amsFeign.updateAddress(map);
     }
     @PostMapping("getSalePlanInfo")
     @ApiOperation(value = "查询汽运单价信息")
-    public RESTfulResult getSalePlanInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getSalePlanInfo(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
                                                Integer apiId) {
@@ -573,29 +578,29 @@ public class AMScontroller extends BaseRESTfulController {
         return amsFeign.getSalePlanInfo(mapValue, pageNum, pageSize, apiId);
     }
     @PostMapping("addAmsSalePlan")
-    RESTfulResult addAmsSalePlan(@RequestBody(required = false)Map<String,Object> map) {
+    Map<String, Object> addAmsSalePlan(@RequestBody(required = false)Map<String,Object> map) {
         return amsFeign.addAmsSalePlan(map);
     }
     @PostMapping("getAmsSalePlanByPlanId/{planId}")
-    RESTfulResult getAmsSalePlanByPlanId(BigDecimal planId) {
+    Map<String, Object> getAmsSalePlanByPlanId(BigDecimal planId) {
         return amsFeign.getAmsSalePlanByPlanId(planId);
     }
     @PostMapping("upadteAmsSalePlanByPlanId")
-    RESTfulResult upadteAmsSalePlanByPlanId(@RequestBody(required = false)Map<String,Object> map) {
+    Map<String, Object> upadteAmsSalePlanByPlanId(@RequestBody(required = false)Map<String,Object> map) {
         return amsFeign.upadteAmsSalePlanByPlanId(map);
     }
     @PostMapping("deleteAmsSalePlanByPlanId")
-    RESTfulResult deleteAmsSalePlanByPlanId(@RequestParam BigDecimal planId) {
+    Map<String, Object> deleteAmsSalePlanByPlanId(@RequestParam BigDecimal planId) {
         return amsFeign.deleteAmsSalePlanByPlanId(planId);
     }
     @GetMapping("getMaterialName")
     @ApiOperation(value = "得到收货单位下拉")
-    public RESTfulResult getMaterialName(){
+    public Map<String, Object> getMaterialName(){
         return amsFeign.getMaterialName();
     }
     @GetMapping("getAreaName")
     @ApiOperation(value = "得到收货单位下拉")
-    public RESTfulResult getAreaName(){
+    public Map<String, Object> getAreaName(){
         return amsFeign.getAreaName();
     }
     //************************************内转物流***************************************************
@@ -627,7 +632,7 @@ public class AMScontroller extends BaseRESTfulController {
     //展示销售公司已审核销售订单的车序号列表
     @PostMapping("/getSaleOrderList")
     @ApiOperation(value = "查询汽运单价信息")
-    public RESTfulResult amsSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String,Object> amsSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {
@@ -647,7 +652,7 @@ public class AMScontroller extends BaseRESTfulController {
     //查询未分派车辆的销售订单的车序号
     @PostMapping("/getAmsSaleOrderMaterial")
     @ApiOperation(value = "展示车序号列表")
-    public RESTfulResult getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String,Object> getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
                                                  Integer pageNum,
                                                  Integer pageSize,
                                                  Integer apiId) {
@@ -672,7 +677,7 @@ public class AMScontroller extends BaseRESTfulController {
     //展示公开派单
     @PostMapping("/getOpenDispatchSaleOrder")
     @ApiOperation(value = "公开派单")
-    public RESTfulResult getOpenDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String,Object> getOpenDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapValue,
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId) {
@@ -707,7 +712,7 @@ public class AMScontroller extends BaseRESTfulController {
     //展示日计划
     @PostMapping("/getTruckRailDayPlanList")
     @ApiOperation(value = "焦炭日计划")
-    public RESTfulResult getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
                                              Integer apiId) {
@@ -719,7 +724,7 @@ public class AMScontroller extends BaseRESTfulController {
     //展示日计划
     @PostMapping("/getSzTruckRailDayPlanList")
     @ApiOperation(value = "水渣日计划")
-    public RESTfulResult getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
                                                Integer apiId) {
@@ -748,7 +753,7 @@ public class AMScontroller extends BaseRESTfulController {
     //展示钢材发往异地库计划
     @PostMapping("/getRailOffsetDayplan")
     @ApiOperation(value = "展示钢材发往异地库计划")
-    public RESTfulResult getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer apiId) {
@@ -793,7 +798,7 @@ public class AMScontroller extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "还未知", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getTruckPlanList")
-    public RESTfulResult getTruckPlanList(@RequestBody(required = false) Map<String,Object> mapValue,
+    public Map<String, Object> getTruckPlanList(@RequestBody(required = false) Map<String,Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {
@@ -838,7 +843,7 @@ public class AMScontroller extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "还未知", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getTruckRequirementList")
-    public RESTfulResult getTruckRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
+    public Map<String, Object> getTruckRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {

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

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.OmsFeign;
-import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -34,7 +33,7 @@ public class OMSController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getAllTruckOrder")
-    public RESTfulResult getAllTruckOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getAllTruckOrder(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
@@ -49,7 +48,7 @@ public class OMSController {
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
     })
     @PostMapping("/getAllTruckOrderReturnListMap")
-    public RESTfulResult getAllTruckOrder(Integer orderStatus, Integer planId, Integer orderType) {
+    public Map<String, Object> getAllTruckOrder(Integer orderStatus, Integer planId, Integer orderType) {
         return omsFeign.getAllTruckOrder(orderStatus, planId, orderType);
     }
 
@@ -61,7 +60,7 @@ public class OMSController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping("/getAllCapacity")
-    public RESTfulResult getAllCapacity(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getAllCapacity(@RequestBody(required = false) Map<String, Object> mapValue,
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
@@ -78,7 +77,7 @@ public class OMSController {
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
     })
     @PostMapping("/addPurOrder")
-    public RESTfulResult addPurOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
+    public Map<String, Object> addPurOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
         return omsFeign.addPurOrder(mapValue);
     }
     // == null ? new HashMap<>() : mapValue
@@ -86,14 +85,14 @@ public class OMSController {
 
     @ApiOperation(value = "修改分派计划")
     @PostMapping("/updateOrder")
-    public RESTfulResult updateOrder(@RequestBody Map<String, Object> map) {
+    public Map<String, Object> updateOrder(@RequestBody Map<String, Object> map) {
         return omsFeign.updateOrder(map);
     }
 
 
     @ApiOperation(value = "派单")
     @PostMapping("/dispatchOrder/{orderId}")
-    public RESTfulResult dispatchOrder(@PathVariable("orderId") Integer orderId) {
+    public Map<String, Object> dispatchOrder(@PathVariable("orderId") Integer orderId) {
         return omsFeign.dispatchOrder(orderId);
     }
 
@@ -102,7 +101,7 @@ public class OMSController {
             @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
     })
     @PostMapping("/deleteOrder")
-    public RESTfulResult deleteOrder(@RequestBody(required = false) Map<String, Object> map,
+    public Map<String, Object> deleteOrder(@RequestBody(required = false) Map<String, Object> map,
                                      Integer planId) {
         return omsFeign.deleteOrder(map, planId);
     }
@@ -112,7 +111,7 @@ public class OMSController {
             @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
     })
     @PostMapping("/driverReceiveOrRefuse/{orderId}")
-    public RESTfulResult driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId, Integer orderReceiveStatus) {
+    public Map<String, Object> driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId, Integer orderReceiveStatus) {
         return omsFeign.driverReceiveOrRefuse(orderId, orderReceiveStatus);
     }
 
@@ -125,7 +124,7 @@ public class OMSController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping("/getReceiveRefuseOrder/{orderReceiveStatus}")
-    public RESTfulResult getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
@@ -143,7 +142,7 @@ public class OMSController {
             @ApiImplicitParam(name = "capacityNumber", value = "车牌号", required = false, dataType = "String"),
     })
     @PostMapping("/sendMesToDriver")
-    public RESTfulResult sendMesToDriver(String capacityNumber, Integer orderStatus){
+    public Map<String, Object> sendMesToDriver(String capacityNumber, Integer orderStatus){
         return omsFeign.sendMesToDriver(capacityNumber, orderStatus);
     }
 
@@ -152,7 +151,7 @@ public class OMSController {
             @ApiImplicitParam(name = "capacityNumber", value = "车牌号", required = false, dataType = "String"),
     })
     @PostMapping("/getRefuseOrderByCapacityNum")
-    public RESTfulResult sendMesToDriver(String capacityNumber){
+    public Map<String, Object> sendMesToDriver(String capacityNumber){
         return omsFeign.sendMesToDriver(capacityNumber);
     }
 
@@ -161,7 +160,7 @@ public class OMSController {
             @ApiImplicitParam(name = "orderId", value = "订单Id", required = false, dataType = "Integer"),
     })
     @PostMapping("/getOrderMesByOrderNum/{orderId}")
-    public RESTfulResult getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId){
+    public Map<String, Object> getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId){
         return omsFeign.getOrderMesByOrderNum(orderId);
     }
 
@@ -170,13 +169,13 @@ public class OMSController {
             @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
     })
     @PostMapping("/selectPlaceAndTime/{orderId}")
-    public RESTfulResult selectPlaceAndTime(@PathVariable("orderId") Integer orderId){
+    public Map<String, Object> selectPlaceAndTime(@PathVariable("orderId") Integer orderId){
         return omsFeign.selectPlaceAndTime(orderId);
     }
 
     @ApiOperation(value="通过运输订单ID查询运单信息")
     @PostMapping("/selectOrderByOrderId/{orderId}")
-    public RESTfulResult selectOrderByOrderId(@PathVariable("orderId") Integer orderId){
+    public Map<String, Object> selectOrderByOrderId(@PathVariable("orderId") Integer orderId){
         return omsFeign.selectOrderByOrderId(orderId);
     }
 
@@ -188,7 +187,7 @@ public class OMSController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping("/getTransportDispatch/{orderReceiveStatus}")
-    public RESTfulResult getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,

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

@@ -28,8 +28,8 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
     @PostMapping("/addQueueResult")
-    public RESTfulResult addQueueResult(String orderNumber){
-        return qmsTruckFeign.addQueueResult(orderNumber);
+    public Map<String, Object> addQueueResult(@RequestBody(required = false) Map<String, Object> map){
+        return qmsTruckFeign.addQueueResult(map);
     }
 
 
@@ -38,7 +38,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
     @PostMapping("/addQueueList")
-    public RESTfulResult addQueueList(@RequestBody(required = false) Map<String, Object> mapValue){
+    public Map<String, Object> addQueueList(@RequestBody(required = false) Map<String, Object> mapValue){
         return qmsTruckFeign.addQueueList(mapValue);
     }
 
@@ -51,7 +51,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/orderReceive")
-    public RESTfulResult orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
                                       Integer apiId,
                                       Integer pageNum,
                                       Integer pageSize,
@@ -70,7 +70,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getQueueApply")
-    public RESTfulResult getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
                                        Integer apiId,
                                        Integer pageNum,
                                        Integer pageSize
@@ -88,7 +88,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getQueueListByQueueUp")
-    public RESTfulResult getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
@@ -98,9 +98,26 @@ public class QMSController extends BaseRESTfulController {
     }
 
 
+    @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
+    ){
+        return qmsTruckFeign.getAllQueueMes(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, gatepostId);
+    }
+
     @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗名称、转移原因")
     @PostMapping("/changeQueue")
-    public RESTfulResult changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
+    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
         return qmsTruckFeign.changeQueue(mapValue);
     }
 
@@ -114,7 +131,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getChangeQueue")
-    public RESTfulResult getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize
@@ -128,7 +145,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
     @PostMapping("/queueCancel")
-    public RESTfulResult queueCancel(@RequestBody(required=false) Map<String, Object> mapValue){
+    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue){
         return qmsTruckFeign.queueCancel(mapValue);
     }
 
@@ -141,7 +158,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getQueueCancel")
-    public RESTfulResult getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize
@@ -154,7 +171,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
     @PostMapping("/getQueueCancelByResultId/{resultId}")
-    public RESTfulResult getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
+    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
         return qmsTruckFeign.getQueueCancelByResultId(resultId);
     }
 
@@ -164,7 +181,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
     @PostMapping("/updateQueueCancel")
-    public RESTfulResult updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue){
+    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue){
         return qmsTruckFeign.updateQueueCancel(mapValue);
     }
 
@@ -174,7 +191,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
     @PostMapping("/queueCutInLine")
-    public RESTfulResult queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue){
+    public Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue){
         return qmsTruckFeign.queueCutInLine(mapValue);
     }
 
@@ -188,7 +205,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getQueueInsert")
-    public RESTfulResult getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize
@@ -201,7 +218,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
     @PostMapping("/queueEndByPDA")
-    public RESTfulResult queueEnd(@RequestBody(required=false) Map<String, Object> mapValue){
+    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue){
         return qmsTruckFeign.queueEnd(mapValue);
     }
 
@@ -214,7 +231,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getQueueEndResult")
-    public RESTfulResult getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize
@@ -231,12 +248,13 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/capacityMonitor")
-    public RESTfulResult capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
                                          Integer apiId,
                                          Integer pageNum,
-                                         Integer pageSize
+                                         Integer pageSize,
+                                               Integer gridType
     ){
-        return qmsTruckFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize);
+        return qmsTruckFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize, gridType);
     }
 
 
@@ -249,7 +267,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/listMonitor")
-    public RESTfulResult listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
                                      Integer apiId,
                                      Integer pageNum,
                                      Integer pageSize
@@ -258,19 +276,19 @@ public class QMSController extends BaseRESTfulController {
 
     @ApiOperation(value="查询各仓库，门岗的排队状态列表")
     @PostMapping("/getQueueStatusList")
-    public RESTfulResult getQueueStatusList(){
+    public Map<String, Object> getQueueStatusList(){
         return qmsTruckFeign.getQueueStatusList();
     }
 
     @ApiOperation(value="通过车牌号查询司机接单")
     @PostMapping("/getOrderReceive/{capacityNumber}")
-    public RESTfulResult getOrderReceive(@PathVariable("capacityNumber") String capacityNumber){
+    public Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber){
         return qmsTruckFeign.getOrderReceive(capacityNumber);
     }
 
     @ApiOperation(value="通过车牌号取消排队")
     @PostMapping("/cancelQueue")
-    public RESTfulResult cancelQueue(@RequestBody Map<String,Object> mapValue){
+    public Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue){
         return qmsTruckFeign.cancelQueue(mapValue);
     }
 
@@ -283,7 +301,7 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getAllExecutionOrder")
-    public RESTfulResult getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,

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

@@ -1,6 +1,4 @@
 package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -30,7 +28,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontractbreach/getBreachList")
-    RESTfulResult getBreachList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getBreachList(@RequestBody(required = false) Map<String, Object> mapValue,
                                 @RequestParam("pageNum") Integer pageNum,
                                 @RequestParam("pageSize") Integer pageSize,
                                 @RequestParam("apiId") Integer apiId);
@@ -42,7 +40,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontractbreach/addContractBreach")
-    RESTfulResult addContractBreach(@RequestBody Map<String, Object> amsContractBreach);
+    Map<String, Object> addContractBreach(@RequestBody Map<String, Object> amsContractBreach);
 
     /**
      * 逻辑删除违约规则
@@ -51,7 +49,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontractbreach/deleteContractBreach/{breachId}")
-    RESTfulResult deleteContractBreach(@PathVariable("breachId") BigDecimal breachId);
+    Map<String, Object> deleteContractBreach(@PathVariable("breachId") BigDecimal breachId);
 
     /**
      * 通过违约id查询
@@ -60,7 +58,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontractbreach/selectBreachToUpdate/{breachId}")
-    RESTfulResult selectBreachToUpdate(@PathVariable("breachId") BigDecimal breachId);
+    Map<String, Object> selectBreachToUpdate(@PathVariable("breachId") BigDecimal breachId);
 
     /**
      * 修改违约规则
@@ -69,7 +67,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontractbreach/updateContractBreach")
-    RESTfulResult updateContractBreach(@RequestBody Map<String, Object> amsContractBreach);
+    Map<String, Object> updateContractBreach(@RequestBody Map<String, Object> amsContractBreach);
 
     /**
      * 展示港口装卸单价列表
@@ -81,7 +79,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontractotherprices/getLoadUnloadPriceList")
-    RESTfulResult getLoadUnloadPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getLoadUnloadPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
                                          @RequestParam Integer pageNum,
                                          @RequestParam Integer pageSize,
                                          @RequestParam Integer apiId);
@@ -93,7 +91,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontractotherprices/addLoadUnloadPrice")
-    RESTfulResult addLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice);
+    Map<String, Object> addLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice);
 
     /**
      * 逻辑删除港口装卸单价
@@ -102,7 +100,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontractotherprices/deleteLoadUnloadPrice/{priceId}")
-    RESTfulResult deleteLoadUnloadPrice(@PathVariable("priceId") BigDecimal priceId);
+    Map<String, Object> deleteLoadUnloadPrice(@PathVariable("priceId") BigDecimal priceId);
 
     /**
      * 通过单价id查询
@@ -111,7 +109,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontractotherprices/selectLoadUnloadPriceToUpdate/{priceId}")
-    RESTfulResult selectLoadUnloadPriceToUpdate(@PathVariable("priceId") BigDecimal priceId);
+    Map<String, Object> selectLoadUnloadPriceToUpdate(@PathVariable("priceId") BigDecimal priceId);
 
     /**
      * 修改港口装卸单价
@@ -120,7 +118,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontractotherprices/updateLoadUnloadPrice")
-    RESTfulResult updateLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice);
+    Map<String, Object> updateLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice);
 
 
     /**
@@ -133,7 +131,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttrainprices/getTrainPriceList")
-    RESTfulResult getTrainPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getTrainPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
                                     @RequestParam Integer apiId);
@@ -145,7 +143,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttrainprices/addTrainPrice")
-    RESTfulResult addTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice);
+    Map<String, Object> addTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice);
 
     /**
      * 逻辑删除火运单价
@@ -154,7 +152,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttrainprices/deleteTrainPrice/{priceId}")
-    RESTfulResult deleteTrainPrice(@PathVariable("priceId") BigDecimal priceId);
+    Map<String, Object> deleteTrainPrice(@PathVariable("priceId") BigDecimal priceId);
 
     /**
      * 通过单价id查询
@@ -163,7 +161,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttrainprices/selectTrainPriceToUpdate/{priceId}")
-    RESTfulResult selectTrainPriceToUpdate(@PathVariable("priceId") BigDecimal priceId);
+    Map<String, Object> selectTrainPriceToUpdate(@PathVariable("priceId") BigDecimal priceId);
 
     /**
      * 修改火运单价
@@ -172,7 +170,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttrainprices/updateTrainPrice")
-    RESTfulResult updateTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice);
+    Map<String, Object> updateTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice);
 
 
     /**
@@ -185,7 +183,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/getShipPriceList")
-    RESTfulResult getShipPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getShipPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
                                    @RequestParam Integer pageNum,
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId);
@@ -197,7 +195,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/addShipPrice")
-    RESTfulResult addShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
+    Map<String, Object> addShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
 
     /**
      * 逻辑删除运费单价
@@ -206,7 +204,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/deleteShipPrice/{priceId}")
-    RESTfulResult deleteShipPrice(@PathVariable("priceId") BigDecimal priceId);
+    Map<String, Object> deleteShipPrice(@PathVariable("priceId") BigDecimal priceId);
 
     /**
      * 修改水运单价
@@ -215,7 +213,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/updateShipPrice")
-    RESTfulResult updateShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
+    Map<String, Object> updateShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
 
     /**
      * 通过单价id查询
@@ -224,7 +222,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/selectPriceToUpdate/{priceId}")
-    RESTfulResult selectPriceToUpdate(@PathVariable("priceId") BigDecimal priceId);
+    Map<String, Object> selectPriceToUpdate(@PathVariable("priceId") BigDecimal priceId);
 
     /**
      * 展示汽运单价
@@ -236,7 +234,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/getTruckPriceList")
-    RESTfulResult getTruckPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getTruckPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
                                     @RequestParam Integer apiId);
@@ -248,7 +246,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/addAmsContractTransportPrice")
-    RESTfulResult addAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
+    Map<String, Object> addAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
 
     /**
      * 修改汽运单价
@@ -257,7 +255,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/updateAmsContractTransportPrice")
-    RESTfulResult updateAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
+    Map<String, Object> updateAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
 
     /**
 //     * 油价联动导致运价变动，批量修改运价
@@ -265,7 +263,7 @@ public interface AmsFeign {
 //     * @return
 //     */
 //    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/batchUpdateTransportPriceByOilPrice")
-//    RESTfulResult batchUpdateTransportPriceByOilPrice();
+//    Map<String, Object> batchUpdateTransportPriceByOilPrice();
 
     /**
      * 展示采购订单列表
@@ -277,7 +275,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amspurchaseorders/getPurchaseOrderList")
-    RESTfulResult getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
@@ -287,25 +285,25 @@ public interface AmsFeign {
      * @return
      */
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getAddressDeliveryAddress")
-    RESTfulResult getAddressDeliveryAddress();
+    Map<String, Object> getAddressDeliveryAddress();
 
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getShipperId")
-    RESTfulResult getShipperId();
+    Map<String, Object> getShipperId();
 
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getCarrierId")
-    RESTfulResult getCarrierId();
+    Map<String, Object> getCarrierId();
 
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getCapacityId")
-    RESTfulResult getCapacityId();
+    Map<String, Object> getCapacityId();
 
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getMaterialId")
-    RESTfulResult getMaterialId();
+    Map<String, Object> getMaterialId();
 
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getTruckCapacityId")
-    RESTfulResult getTruckCapacityId();
+    Map<String, Object> getTruckCapacityId();
 
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getLineId")
-    RESTfulResult getLineId();
+    Map<String, Object> getLineId();
 // ----------------------------------------------销售合同-------------------------------------
     /**
      * 销售合同查询汽运单价
@@ -320,7 +318,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(109)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/saleContract/amscontracttransportprices/getAmsContractTransportPrice")
-    RESTfulResult amscontracttransportprices(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> amscontracttransportprices(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
@@ -328,7 +326,7 @@ public interface AmsFeign {
      *销售合同新增汽运单价
      */
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/addAmsContractTransportUnitPrice")
-    RESTfulResult addAmsContractTransportUnitPrice(@RequestBody(required = false) Map<String, Object> mapVal);
+    Map<String, Object> addAmsContractTransportUnitPrice(@RequestBody(required = false) Map<String, Object> mapVal);
 
     /**
      *通过主键id删除汽运单价
@@ -336,17 +334,17 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/deleteAmsContractTransportPrice")
-    RESTfulResult deleteAmsContractTransportPrice(BigDecimal priceId);
+    Map<String, Object> deleteAmsContractTransportPrice(BigDecimal priceId);
     /**
      *通过主键渲染信息
      */
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/getAmsContractTransportPriceByPriceId/{priceId}")
-    RESTfulResult getAmsContractTransportPriceByPriceId(@PathVariable("priceId") BigDecimal priceId);
+    Map<String, Object> getAmsContractTransportPriceByPriceId(@PathVariable("priceId") BigDecimal priceId);
     /**
      * 通过主键修改汽运单价
      */
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/updateAmsContractTransportUnitPrice")
-    RESTfulResult updateAmsContractTransportUnitPrice(@RequestBody(required = false) Map<String, Object> mapVal);
+    Map<String, Object> updateAmsContractTransportUnitPrice(@RequestBody(required = false) Map<String, Object> mapVal);
     /**
      * 油价联动导致运价变动，批量修改运价
      * @param
@@ -356,7 +354,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @PostMapping(value = "/api/v1/ams/amscontracttransportprice/batchUpdateTransportPriceByOilPrice")
-    RESTfulResult batchUpdateTransportPriceByOilPrice(@RequestBody(required = false) Map<String, Object> mapVal);
+    Map<String, Object> batchUpdateTransportPriceByOilPrice(@RequestBody(required = false) Map<String, Object> mapVal);
     /**
      * 获取线路编号
      * @param
@@ -366,7 +364,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getLineNo")
-    RESTfulResult getLineNo();
+    Map<String, Object> getLineNo();
     /**
      * 获取线路编号
      * @param
@@ -376,7 +374,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getCapacityNumber")
-    RESTfulResult getCapacityNumber();
+    Map<String, Object> getCapacityNumber();
     /**
      * 获取收货地址
      * @param
@@ -386,7 +384,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getDeliveryAddress")
-    RESTfulResult getDeliveryAddress();
+    Map<String, Object> getDeliveryAddress();
     /**
      * 新增(固定派单/公开抢单)
      * @param mapVal
@@ -397,7 +395,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "amsDispatchSaleOrder", value = "(固定派单/公开抢单)对象", required = false, dataType = "AmsDispatchSaleOrder")
     })
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/addAmsDispatchSaleOrder")
-    RESTfulResult addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal);
+    Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal);
     /**
      * 获取收货地址
      * @param
@@ -407,7 +405,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @GetMapping(value = "/api/v1/ams/amsdispatchsaleorders/getCarrierName")
-    RESTfulResult getCarrierName();
+    Map<String, Object> getCarrierName();
 
     /**
      * 查询未上报销售订单信息
@@ -422,7 +420,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(98)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderInfo")
-    RESTfulResult getSaleOrderInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getSaleOrderInfo(@RequestBody(required = false) Map<String, Object> mapValue,
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize,
                                              @RequestParam Integer apiId);
@@ -439,7 +437,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(98)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderReported")
-    RESTfulResult getSaleOrderReported(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getSaleOrderReported(@RequestBody(required = false) Map<String, Object> mapValue,
                                    @RequestParam Integer pageNum,
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId);
@@ -457,7 +455,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(105)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping("/api/v1/ams/amssaleorders/getAmsSaleOrderApproved")
-    RESTfulResult getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
@@ -476,7 +474,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderDetail")
-    RESTfulResult getSaleOrderDetail(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getSaleOrderDetail(@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam Integer pageNum,
                                           @RequestParam Integer pageSize,
                                           @RequestParam Integer apiId);
@@ -490,7 +488,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "saleOrderId", value = "销售订单ID", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/uploadSaleOrder/{saleOrderId}")
-    RESTfulResult uploadSaleOrder(@PathVariable("saleOrderId") BigDecimal saleOrderId);
+    Map<String, Object> uploadSaleOrder(@PathVariable("saleOrderId") BigDecimal saleOrderId);
     /**
      * 新增销售订单
      */
@@ -499,7 +497,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "amsSaleOrder", value = "销售订单对象", required = false, dataType = "AmsSaleOrder")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/addAmsSaleOrder")
-    RESTfulResult addAmsSaleOrder(@RequestBody(required = false) Map<String,Object> map);
+    Map<String, Object> addAmsSaleOrder(@RequestBody(required = false) Map<String,Object> map);
 
     /**
      * 通过主键渲染销售订单信息
@@ -511,7 +509,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "saleOrderId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/getAmsSaleOrderBySaleOrderId/{saleOrderId}")
-    RESTfulResult getAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId);
+    Map<String, Object> getAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId);
     /**
      * 通过主键修改销售订单
      * @param map
@@ -522,7 +520,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "amsSaleOrder", value = "销售订单对象", required = false, dataType = "AmsSaleOrder")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/updateAmsSaleOrder")
-    RESTfulResult updateAmsSaleOrder(@RequestBody(required = false) Map<String,Object> map);
+    Map<String, Object> updateAmsSaleOrder(@RequestBody(required = false) Map<String,Object> map);
     /**
      * 通过主键删除销售订单
      * @param saleOrderId
@@ -533,13 +531,13 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "saleOrderId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/deleteAmsSaleOrderBySaleOrderId")
-    RESTfulResult deleteAmsSaleOrderBySaleOrderId(BigDecimal saleOrderId);
+    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(BigDecimal saleOrderId);
     @ApiOperation(value="根据销售订单号查询销售订单修改日志")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleOrderUpdateLog")
-    RESTfulResult getSaleOrderUpdateLog(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getSaleOrderUpdateLog(@RequestBody(required = false) Map<String, Object> mapValue,
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
                                      @RequestParam Integer apiId);
@@ -550,7 +548,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @GetMapping(value = "/api/v1/ams/amssaleorders/getShipperName")
-    RESTfulResult getShipperName();
+    Map<String, Object> getShipperName();
     /**
      * 获取收货单位
      */
@@ -558,7 +556,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @GetMapping(value = "/api/v1/ams/amssaleorders/getConsigneeCompanyName")
-    RESTfulResult getConsigneeCompanyName();
+    Map<String, Object> getConsigneeCompanyName();
     /**
      * 新增销售订单物资信息
      * @param map
@@ -569,7 +567,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "amsSaleOrderMaterial", value = "销售订单物资信息对象", required = false, dataType = "AmsSaleOrderMaterial")
     })
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/addAmsSaleOrderMaterial")
-    RESTfulResult addAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map);
+    Map<String, Object> addAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map);
 
     /**
      *通过主键渲染销售订单物资信息
@@ -581,7 +579,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "amsSaleOrderMaterial", value = "销售订单物资信息对象", required = false, dataType = "AmsSaleOrderMaterial")
     })
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAmsSaleOrderMaterialBySaleOrderMaterialId/{saleOrderMaterialId}")
-    RESTfulResult getAmsSaleOrderMaterialBySaleOrderMaterialId(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderMaterialId);
+    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderMaterialId);
     /**
      * 通过主键删除销售订单物资信息
      * @param saleOrderMaterialId
@@ -592,7 +590,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/deleteAmsSaleOrderMaterialBySaleOrderMaterialId")
-    RESTfulResult deleteAmsSaleOrderMaterialBySaleOrderMaterialId(BigDecimal saleOrderMaterialId);
+    Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(BigDecimal saleOrderMaterialId);
 
     /**
      * 通过主键获取收货地址
@@ -604,7 +602,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAddress/{saleOrderMaterialId}")
-    RESTfulResult getAddress(BigDecimal saleOrderMaterialId);
+    Map<String, Object> getAddress(BigDecimal saleOrderMaterialId);
 
 
     /**
@@ -617,7 +615,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "amsSaleOrderMaterial", value = "销售订单物资信息对象", required = false, dataType = "AmsSaleOrderMaterial")
     })
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/updateAddress")
-    RESTfulResult updateAddress(@RequestBody(required = false)Map<String,Object> map);
+    Map<String, Object> updateAddress(@RequestBody(required = false)Map<String,Object> map);
 
     /**
      * 查询销售计划信息
@@ -632,7 +630,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(92)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/ams/amssaleplans/getSalePlanInfo")
-    RESTfulResult getSalePlanInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getSalePlanInfo(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
                                         @RequestParam Integer apiId);
@@ -647,7 +645,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "amssaleplans", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleplans/addAmsSalePlan")
-    RESTfulResult addAmsSalePlan(@RequestBody(required = false)Map<String,Object> map);
+    Map<String, Object> addAmsSalePlan(@RequestBody(required = false)Map<String,Object> map);
 
     /**
      * 通过主键查询销售计划信息
@@ -659,7 +657,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "planId", value = "销售计划主键", required = false, dataType = "BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleplans/getAmsSalePlanByPlanId/{planId}")
-    RESTfulResult getAmsSalePlanByPlanId(@PathVariable("planId") BigDecimal planId);
+    Map<String, Object> getAmsSalePlanByPlanId(@PathVariable("planId") BigDecimal planId);
     /**
      * 通过主键修改销售计划
      * @param map
@@ -670,7 +668,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "amsSalePlan", value = "修改车皮装车map", required = false, dataType = "AmsSalePlan")
     })
     @PostMapping(value = "/api/v1/ams/amssaleplans/upadteAmsSalePlanByPlanId")
-    RESTfulResult upadteAmsSalePlanByPlanId(@RequestBody(required = false)Map<String,Object> map);
+    Map<String, Object> upadteAmsSalePlanByPlanId(@RequestBody(required = false)Map<String,Object> map);
     /**
      * 通过主键删除销售计划
      * @param planId
@@ -681,7 +679,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "planId", value = "主键ID", required = false, dataType = "BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleplans/deleteAmsSalePlanByPlanId")
-    RESTfulResult deleteAmsSalePlanByPlanId(@RequestParam BigDecimal planId);
+    Map<String, Object> deleteAmsSalePlanByPlanId(@RequestParam BigDecimal planId);
 
     /**
      * 获取规格型号
@@ -692,7 +690,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @GetMapping(value = "/api/v1/ams/amssaleplans/getMaterialName")
-    RESTfulResult getMaterialName();
+    Map<String, Object> getMaterialName();
 
     /**
      * 获取销售片区名称
@@ -703,44 +701,45 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @GetMapping(value = "/api/v1/ams/amssaleplans/getAreaName")
-    RESTfulResult getAreaName();
+    Map<String, Object> getAreaName();
 
     /*
        AmstruckPurplanController中所有接口
     */
     @PostMapping("api/v1/ams/amstruckpurplans/getAllPurPlan")
-    RESTfulResult getAllPurPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+    Map<String, Object> getAllPurPlan(@RequestBody(required=false) Map<String,Object> mapValue,
                                 @RequestParam("apiId") Integer apiId,
                                 @RequestParam("pageNum") Integer pageNum,
                                 @RequestParam("pageSize") Integer pageSize,
                                 @RequestParam("status") Integer status);
 
     @PostMapping("api/v1/ams/amstruckpurplans/getAllPurPlan/{apiId}")
-    public RESTfulResult getDetailListByCon(@PathVariable("apiId") Integer apiId,
+    public Map<String, Object> getDetailListByCon(@PathVariable("apiId") Integer apiId,
                                             @RequestBody(required=false) Map<String,Object> mapValue,
                                             @RequestParam("pageNum")Integer pageNum,
                                             @RequestParam("pageSize")Integer pageSize,
                                             @RequestParam("con")String con);
 
     @PostMapping ("api/v1/ams/amstruckpurplans/getPurPlanById/{planId}")
-    public RESTfulResult getPurPlanById(@PathVariable("planId")Integer planId);
+    public Map<String, Object> getPurPlanById(@PathVariable("planId")Integer planId);
 
     @PostMapping("api/v1/ams/amstruckpurplans/addPurPlan")
-    public RESTfulResult addPurPlan(@RequestBody Map<String, Object> map);
+    public Map<String, Object> addPurPlan(@RequestBody Map<String, Object> map);
 
     @PostMapping("api/v1/ams/amstruckpurplans/sendPurPlan/{planId}")
-    public RESTfulResult sendPurPlan(@PathVariable("planId")Integer planId);
+    public Map<String, Object> sendPurPlan(@PathVariable("planId")Integer planId);
 
     @PostMapping("api/v1/ams/amstruckpurplans/receptionPurPlan/{planId}")
-    public RESTfulResult receptionPurPlan(@PathVariable("planId")Integer planId);
-
-
+    public Map<String, Object> receptionPurPlan(@PathVariable("planId")Integer planId);
+    
+    @PostMapping("api/v1/ams/amstruckpurplans/updatePurPlan")
+    public Map<String, Object> updatePurPlan(@RequestBody Map<String, Object> amstruckPurplan);
 
     @PostMapping("api/v1/ams/amstruckpurplans/deletePurPlan/{planId}")
-    public RESTfulResult deletePurPlan(@PathVariable("planId")Integer planId);
+    public Map<String, Object> deletePurPlan(@PathVariable("planId")Integer planId);
 
     @PostMapping("api/v1/ams/amstruckpurplans/getDecomposedPlan")
-    public RESTfulResult getDecomposedPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getDecomposedPlan(@RequestBody(required=false) Map<String,Object> mapValue,
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
@@ -772,7 +771,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(181)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleOrderList")
-    RESTfulResult amsSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String,Object> amsSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                    @RequestParam Integer pageNum,
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId);
@@ -788,7 +787,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(182)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/getAmsSaleOrderMaterial")
-    RESTfulResult getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String,Object> getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam Integer pageNum,
                                           @RequestParam Integer pageSize,
                                           @RequestParam Integer apiId);
@@ -805,7 +804,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(181)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/getOpenDispatchSaleOrder")
-    RESTfulResult getOpenDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String,Object> getOpenDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapValue,
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer apiId);
@@ -828,7 +827,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(183)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/getTruckRailDayPlanList")
-    RESTfulResult getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize,
                                       @RequestParam Integer apiId);
@@ -838,7 +837,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(183)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/getSzTruckRailDayPlanList")
-    RESTfulResult getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
                                         @RequestParam Integer apiId);
@@ -861,7 +860,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(183)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/getRailOffsetDayplan")
-    RESTfulResult getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
@@ -885,7 +884,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(还没有设置表头)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/ams/amstruckinwardplan/getTruckPlanList")
-    RESTfulResult getTruckPlanList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getTruckPlanList(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
@@ -908,7 +907,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(还没有设置表头)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/getTruckRequirementList")
-    RESTfulResult getTruckRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getTruckRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                    @RequestParam Integer pageNum,
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId);

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

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.feign;
 
-import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,8 +17,8 @@ public interface OmsFeign {
     OmstruckOrderController
      */
 
-    @PostMapping("api/v1/truckTms/omstruckorders/getAllTruckOrder")
-    public RESTfulResult getAllTruckOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+    @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,
@@ -27,38 +26,38 @@ public interface OmsFeign {
                                           @RequestParam("planId") Integer planId,
                                           @RequestParam("orderType") Integer orderType);
 
-    @PostMapping("api/v1/truckTms/omstruckorders/getAllTruckOrderReturnListMap")
-    public RESTfulResult getAllTruckOrder(
+    @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrderReturnListMap")
+    public Map<String, Object> getAllTruckOrder(
             @RequestParam("orderStatus") Integer orderStatus,
             @RequestParam("planId") Integer planId,
             @RequestParam("orderType") Integer orderType);
 
-    @PostMapping("api/v1/truckTms/omstruckorders/getAllCapacity")
-    public RESTfulResult getAllCapacity(@RequestBody(required=false) Map<String,Object> mapValue,
+    @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/truckTms/omstruckorders/addPurOrder")
-    public RESTfulResult addPurOrder(@RequestBody(required=false) Map<String,Object> mapValue);
+    @PostMapping("api/v1/oms/omstruckorders/addPurOrder")
+    public Map<String, Object> addPurOrder(@RequestBody(required=false) Map<String,Object> mapValue);
 
-    @PostMapping("api/v1/truckTms/omstruckorders/updateOrder")
-    public RESTfulResult updateOrder(@RequestBody Map<String, Object> map);
+    @PostMapping("api/v1/oms/omstruckorders/updateOrder")
+    public Map<String, Object> updateOrder(@RequestBody Map<String, Object> map);
 
-    @PostMapping("api/v1/truckTms/omstruckorders/dispatchOrder/{orderId}")
-    public RESTfulResult dispatchOrder(@PathVariable("orderId") Integer orderId);
+    @PostMapping("api/v1/oms/omstruckorders/dispatchOrder/{orderId}")
+    public Map<String, Object> dispatchOrder(@PathVariable("orderId") Integer orderId);
 
-    @PostMapping("api/v1/truckTms/omstruckorders/deleteOrder")
-    public RESTfulResult deleteOrder(@RequestBody(required = false) Map<String, Object> map,
+    @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/truckTms/omstruckorders/driverReceiveOrRefuse/{orderId}")
-    public RESTfulResult driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId,
+    @PostMapping("api/v1/oms/omstruckorders/driverReceiveOrRefuse/{orderId}")
+    public Map<String, Object> driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId,
                                                @RequestParam("orderReceiveStatus") Integer orderReceiveStatus);
 
-    @PostMapping("api/v1/truckTms/omstruckorders/getReceiveRefuseOrder/{orderReceiveStatus}")
-    public RESTfulResult getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+    @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,
@@ -66,26 +65,26 @@ public interface OmsFeign {
                                                @RequestParam("orderType") Integer orderType,
                                                @RequestParam("orderStatus") Integer orderStatus);
 
-    @PostMapping("api/v1/truckTms/omstruckorders/sendMesToDriver")
-    public RESTfulResult sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber,
+    @PostMapping("api/v1/oms/omstruckorders/sendMesToDriver")
+    public Map<String, Object> sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber,
                                          @RequestParam("orderStatus") Integer orderStatus);
 
 
-    @PostMapping("api/v1/truckTms/omstruckorders/getRefuseOrderByCapacityNum")
-    public RESTfulResult sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber);
+    @PostMapping("api/v1/oms/omstruckorders/getRefuseOrderByCapacityNum")
+    public Map<String, Object> sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber);
 
 
-    @PostMapping("api/v1/truckTms/omstruckorders/getOrderMesByOrderNum/{orderId}")
-    public RESTfulResult getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId);
+    @PostMapping("api/v1/oms/omstruckorders/getOrderMesByOrderNum/{orderId}")
+    public Map<String, Object> getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId);
 
-    @PostMapping("api/v1/truckTms/omstruckorders/selectPlaceAndTime/{orderId}")
-    public RESTfulResult selectPlaceAndTime(@PathVariable("orderId") Integer orderId);
+    @PostMapping("api/v1/oms/omstruckorders/selectPlaceAndTime/{orderId}")
+    public Map<String, Object> selectPlaceAndTime(@PathVariable("orderId") Integer orderId);
 
-    @PostMapping("api/v1/truckTms/omstruckorders/selectOrderByOrderId/{orderId}")
-    public RESTfulResult selectOrderByOrderId(@PathVariable("orderId") Integer orderId);
+    @PostMapping("api/v1/oms/omstruckorders/selectOrderByOrderId/{orderId}")
+    public Map<String, Object> selectOrderByOrderId(@PathVariable("orderId") Integer orderId);
 
-    @PostMapping("api/v1/truckTms/omstruckorders/getTransportDispatch/{orderReceiveStatus}")
-    public RESTfulResult getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
+    @PostMapping("api/v1/oms/omstruckorders/getTransportDispatch/{orderReceiveStatus}")
+    public Map<String, Object> getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,

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

@@ -23,15 +23,15 @@ public interface QmsTruckFeign {
      */
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
-    public RESTfulResult addQueueResult(String orderNumber);
+    public Map<String, Object> addQueueResult(@RequestBody(required = false) Map<String, Object> mapValue);
 
 
     @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
-    public RESTfulResult addQueueList(@RequestBody(required = false) Map<String, Object> mapValue);
+    public Map<String, Object> addQueueList(@RequestBody(required = false) Map<String, Object> mapValue);
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
-    public RESTfulResult orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
                                       @RequestParam("apiId") Integer apiId,
                                       @RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,
@@ -39,15 +39,22 @@ public interface QmsTruckFeign {
     );
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueApply")
-    public RESTfulResult getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
                                        @RequestParam("apiId") Integer apiId,
                                        @RequestParam("pageNum") Integer pageNum,
                                        @RequestParam("pageSize") Integer pageSize
     );
 
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
+    public 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
+    );
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueListByQueueUp")
-    public RESTfulResult getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
                                                @RequestParam("apiId") Integer apiId,
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
@@ -56,11 +63,11 @@ public interface QmsTruckFeign {
 
 
     @PostMapping("api/v1/queueTruck/qmsqueuelists/changeQueue")
-    public RESTfulResult changeQueue(@RequestBody(required=false) Map<String, Object> mapValue);
+    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue);
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getChangeQueue")
-    public RESTfulResult getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
                                                @RequestParam("apiId") Integer apiId,
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize
@@ -68,12 +75,12 @@ public interface QmsTruckFeign {
 
 
     @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCancel")
-    public RESTfulResult queueCancel(@RequestBody(required=false) Map<String, Object> mapValue);
+    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue);
 
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancel")
-    public RESTfulResult getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
                                         @RequestParam("apiId") Integer apiId,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize
@@ -81,19 +88,19 @@ public interface QmsTruckFeign {
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancelByResultId/{resultId}")
-    public RESTfulResult getQueueCancelByResultId(@PathVariable("resultId") Integer resultId);
+    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId);
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/updateQueueCancel")
-    public RESTfulResult updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue);
+    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue);
 
 
     @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCutInLine")
-    public RESTfulResult queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue);
+    public Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue);
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueInsert")
-    public RESTfulResult getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize
@@ -101,11 +108,11 @@ public interface QmsTruckFeign {
 
 
     @PostMapping("api/v1/queueTruck/qmsqueuelists/queueEndByPDA")
-    public RESTfulResult queueEnd(@RequestBody(required=false) Map<String, Object> mapValue);
+    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue);
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueEndResult")
-    public RESTfulResult getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize
@@ -113,15 +120,16 @@ public interface QmsTruckFeign {
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/capacityMonitor")
-    public RESTfulResult capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
                                          @RequestParam("apiId") Integer apiId,
                                          @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize
+                                         @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("gridType") Integer gridType
     );
 
 
     @PostMapping("api/v1/queueTruck/qmsqueuelists/listMonitor")
-    public RESTfulResult listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
                                      @RequestParam("apiId") Integer apiId,
                                      @RequestParam("pageNum") Integer pageNum,
                                      @RequestParam("pageSize") Integer pageSize
@@ -130,18 +138,18 @@ public interface QmsTruckFeign {
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueStatusList")
-    public RESTfulResult getQueueStatusList();
+    public Map<String, Object> getQueueStatusList();
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getOrderReceive/{capacityNumber}")
-    public RESTfulResult getOrderReceive(@PathVariable("capacityNumber") String capacityNumber);
+    public Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber);
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/cancelQueue")
-    public RESTfulResult cancelQueue(@RequestBody Map<String,Object> mapValue);
+    public Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue);
 
     @PostMapping("/getAllExecutionOrder")
-    public RESTfulResult getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,

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

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.feign;
 
 import com.steerinfo.dil.util.PageListAdd;
-import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -26,43 +25,43 @@ public interface TmsTrainFeign {
  */
 
     @PostMapping("api/v1/trainTms/tmstrainloadingresults/getTmstrainWagonLoad")
-    public RESTfulResult getTmstrainWagonLoad(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getTmstrainWagonLoad(@RequestBody(required = false) Map<String, Object> mapValue,
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/insertTmstrainLoadingResult")
-    public RESTfulResult insertTmstrainLoadingResult(@RequestBody(required = false) Map<String, Object> map);
+    public Map<String, Object> insertTmstrainLoadingResult(@RequestBody(required = false) Map<String, Object> map);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getTmstrainLoadingResultByResultId/{resultId}")
-    public RESTfulResult getTmstrainLoadingResultByResultId(@PathVariable("resultId") BigDecimal resultId);
+    public Map<String, Object> getTmstrainLoadingResultByResultId(@PathVariable("resultId") BigDecimal resultId);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/upadteTmstrainLoadingResultByResultId")
-    public RESTfulResult upadteTmstrainLoadingResultByResultId(@RequestBody(required = false) Map<String, Object> map);
+    public Map<String, Object> upadteTmstrainLoadingResultByResultId(@RequestBody(required = false) Map<String, Object> map);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/deleteTmstrainLoadingResultByResultId")
-    public RESTfulResult deleteTmstrainLoadingResultByResultId(@RequestParam BigDecimal resultId);
+    public Map<String, Object> deleteTmstrainLoadingResultByResultId(@RequestParam BigDecimal resultId);
 
     //下拉框
 
     @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getSendStationName")
-    public RESTfulResult getSendStationName();
+    public Map<String, Object> getSendStationName();
 
 
     @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getArrivalStationName")
-    public RESTfulResult getArrivalStationName();
+    public Map<String, Object> getArrivalStationName();
 
 
     @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getBatchId")
-    public RESTfulResult getBatchId();
+    public Map<String, Object> getBatchId();
 
 
     @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getWagonNo")
-    public RESTfulResult getWagonNo();
+    public Map<String, Object> getWagonNo();
 
 
     /*
@@ -70,98 +69,98 @@ public interface TmsTrainFeign {
      */
 
     @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainWagonUnLoad")
-    public RESTfulResult getTmstrainWagonUnLoad(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getTmstrainWagonUnLoad(@RequestBody(required=false) Map<String,Object> mapValue,
                                                 @RequestParam("apiId") Integer apiId,
                                                 @RequestParam("pageNum") Integer pageNum,
                                                 @RequestParam("pageSize") Integer pageSize);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/deleteTmstrainWagonUnLoadResultByUnLoadingId")
-    public RESTfulResult deleteTmstrainWagonUnLoadResultByUnLoadingId(@RequestParam BigDecimal unloadingId);
+    public Map<String, Object> deleteTmstrainWagonUnLoadResultByUnLoadingId(@RequestParam BigDecimal unloadingId);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/insertTmstrainWagonUnLoadResult")
-    public RESTfulResult insertTmstrainWagonUnLoadResult(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult);
+    public Map<String, Object> insertTmstrainWagonUnLoadResult(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/upadteTmstrainWagonUnLoadResultByUnLoadingId")
-    public RESTfulResult upadteTmstrainWagonUnLoadResultByUnLoadingId(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult);
+    public Map<String, Object> upadteTmstrainWagonUnLoadResultByUnLoadingId(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult);
 
 
     @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainresult")
-    public RESTfulResult getTmstrainresult(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getTmstrainresult(@RequestBody(required=false) Map<String,Object> mapValue,
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainWagonUnLoadResultByUnLoadingId/{unloadingId}")
-    public RESTfulResult getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId);
+    public Map<String, Object> getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId);
 
 
         //下拉框
     @GetMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getUnloadingPointName")
-    public RESTfulResult getUnloadingPointName();
+    public Map<String, Object> getUnloadingPointName();
 
 
     @GetMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getUnloadingRouteName")
-    public RESTfulResult getUnloadingRouteName();
+    public Map<String, Object> getUnloadingRouteName();
 
 
 
     /**************************TmstrainPleaseApproveResultController************************************/
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getAllWagonPlease")
-    public RESTfulResult getAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
+    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);
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getWagonPleaseById/{resultId}")
-    public RESTfulResult getWagonPleaseById(@PathVariable("resultId")Integer resultId);
+    public Map<String, Object> getWagonPleaseById(@PathVariable("resultId")Integer resultId);
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonPlease")
-    public RESTfulResult addWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+    public Map<String, Object> addWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
 
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/updateWagonPlease")
-    public RESTfulResult updateWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+    public Map<String, Object> updateWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
 
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/deleteWagonPlease/{resultId}")
-    public RESTfulResult deleteWagonPlease(@PathVariable("resultId") Integer resultId);
+    public Map<String, Object> deleteWagonPlease(@PathVariable("resultId") Integer resultId);
 
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/sendWagonPlease/{resultId}")
-    public RESTfulResult sendWagonPlease(@PathVariable("resultId") Integer resultId);
+    public Map<String, Object> sendWagonPlease(@PathVariable("resultId") Integer resultId);
 
     //下拉框
     @GetMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getShipper")
-    public RESTfulResult getShipper();
+    public Map<String, Object> getShipper();
 
     @GetMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getRailPlan")
-    RESTfulResult getRailPlan();
+    Map<String, Object> getRailPlan();
 
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveAllWagonPlease")
-    public RESTfulResult getApproveAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getApproveAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
                                                   @RequestParam("apiId") Integer apiId,
                                                   @RequestParam("pageNum") Integer pageNum,
                                                   @RequestParam("pageSize") Integer pageSize);
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveWagonPleaseById/{resultId}")
-    public RESTfulResult getApproveWagonPleaseById(@PathVariable("resultId")Integer resultId);
+    public Map<String, Object> getApproveWagonPleaseById(@PathVariable("resultId")Integer resultId);
 
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/addApproveWagonPlease")
-    public RESTfulResult addApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+    public Map<String, Object> addApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/updateApproveWagonPlease")
-    public RESTfulResult updateApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+    public Map<String, Object> updateApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/deleteApproveWagonPlease/{resultId}")
-    public RESTfulResult deleteApproveWagonPlease(@PathVariable("resultId") Integer 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);

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

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.feign;
 
-import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -23,33 +22,36 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addLoadResultForConverted")
     Map<String,Object> addLoadResultForConverted(@RequestBody(required=false) Map<String,Object> map);
     @PostMapping("api/v1/truckTms/tmstruckloadresults/getAllLoadResult")
-    public RESTfulResult getAllLoadResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getAllLoadResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("status") Integer status );
+                                                @RequestParam("status") Integer status ,
+                                                @RequestParam("orderType") Integer orderType);
+
     @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadResultForConverted")
     public Map<String,Object> selectLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize);
+
     @PostMapping("api/v1/truckTms/tmstruckloadresults/getLoadResultByResultId/{resultId}")
     public Map<String,Object> getLoadResultByResultId(@PathVariable("resultId") Integer resultId);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addUnLoadResultForconverted")
     public Map<String,Object> addUnLoadResultForconverted(@RequestBody(required = false) Map<String,Object> map);
 
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addLoadResult")
-    public RESTfulResult addLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/addCGLoadResult")
+    public Map<String, Object> addCGLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadResult")
-    public RESTfulResult updateLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
+    public Map<String, Object> updateLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/getLoadResultById/{resultId}")
-    public RESTfulResult getLoadResultById(@PathVariable("resultId") Integer resultId);
+    public Map<String, Object> getLoadResultById(@PathVariable("resultId") Integer resultId);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/deleteLoadResult/{resultId}")
-    public RESTfulResult deleteLoadResult(@PathVariable("resultId")Integer resultId);
+    public Map<String, Object> deleteLoadResult(@PathVariable("resultId")Integer resultId);
     /*
         TmstruckEnfactoryResultController
      */
@@ -63,10 +65,11 @@ public interface TmsTruckFeign {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getAllEnFactoryResult")
-    public RESTfulResult getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                                @RequestParam("apiId") Integer apiId,
                                                @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("orderType")Integer orderType
     );
 
 
@@ -75,15 +78,15 @@ public interface TmsTruckFeign {
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
     })
     @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/addEnFactoryResult")
-    public RESTfulResult addEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
+    public Map<String, Object> addEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
 
 
     @ApiOperation(value="PDA扫描更新进厂作业实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
     })
-    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/updateEnactoryResult")
-    public RESTfulResult updateEnactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/enFactoryResultByPDA")
+    public Map<String, Object> enFactoryResultByPDA(@RequestBody(required=false) Map<String,Object> mapValue);
 
 
     /*
@@ -91,22 +94,24 @@ public interface TmsTruckFeign {
      */
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiMaoResult")
-    public RESTfulResult getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize);
+                                           @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("orderType") Integer orderType
+                                                 );
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
-    public RESTfulResult getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize);
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
-    public RESTfulResult addJiMaoResult(@RequestBody Map<String, Object> mapValue);
+    public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue);
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiPiResult")
-    public RESTfulResult addJiPiResult(@RequestBody Map<String, Object> mapValue);
+    public Map<String, Object> addJiPiResult(@RequestBody Map<String, Object> mapValue);
 
 
     /*
@@ -114,13 +119,15 @@ public interface TmsTruckFeign {
      */
 
     @PostMapping("api/v1/truckTms/tmstruckunloadresult/getUnloadResult")
-    public RESTfulResult getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                          @RequestParam("apiId") Integer apiId,
                                          @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize);
+                                         @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("orderType") Integer orderType
+    );
 
     @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
-    public RESTfulResult addUnloadResult(@RequestBody Map<String, Object> mapValue);
+    public Map<String, Object> addUnloadResult(@RequestBody Map<String, Object> mapValue);
 
 
     /*
@@ -129,7 +136,7 @@ public interface TmsTruckFeign {
 
 
     @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiveResult")
-    public RESTfulResult getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize);
@@ -140,13 +147,13 @@ public interface TmsTruckFeign {
 
 
     @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/getLeaveFactoryResult")
-    public RESTfulResult getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                                @RequestParam("apiId") Integer apiId,
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize);
 
     @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")
-    public RESTfulResult addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
+    public Map<String, Object> addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
 
 
     /*
@@ -154,25 +161,25 @@ public interface TmsTruckFeign {
      */
 
     @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/getAllMeasureCommission/{type}")
-    public RESTfulResult getAllMeasureCommission(@PathVariable("type") Integer type);
+    public Map<String, Object> getAllMeasureCommission(@PathVariable("type") Integer type);
 
 
     /*
     TmstruckQualityResultController
      */
     @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResult")
-    public RESTfulResult getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize);
 
 
     @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResultById/{resultId}")
-    public RESTfulResult getQualityResultById(@PathVariable("resultId") Integer resultId);
+    public Map<String, Object> getQualityResultById(@PathVariable("resultId") Integer resultId);
 
 
     @PostMapping("api/v1/truckTms/tmstruckqualityresults/updateQualityResult")
-    public RESTfulResult updateQualityResult(@RequestBody(required=false) Map<String,Object> mapValue);
+    public Map<String, Object> updateQualityResult(@RequestBody(required=false) Map<String,Object> mapValue);
 
     @PostMapping("api/v1/truckTms/tmstruckqualityresults/selectQualityResultForConverted")
     Map<String,Object> selectQualityResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -192,28 +199,28 @@ public interface TmsTruckFeign {
      * 下拉框
      */
     @GetMapping("api/v1/truckTms/dropDown/getDilBatch")
-    RESTfulResult getDilBatch();
+    Map<String, Object> getDilBatch();
 
     @GetMapping("api/v1/truckTms/dropDown/getCarrier")
-    RESTfulResult getCarrier();
+    Map<String, Object> getCarrier();
 
     @GetMapping("api/v1/truckTms/dropDown/getLine")
-    RESTfulResult getLine();
+    Map<String, Object> getLine();
 
     @GetMapping("api/v1/truckTms/dropDown/getWarehouse")
-    RESTfulResult getWarehouse();
+    Map<String, Object> getWarehouse();
 
     @GetMapping("api/v1/truckTms/dropDown/getGatepost")
-    RESTfulResult getGatepost();
+    Map<String, Object> getGatepost();
 
     @GetMapping("api/v1/truckTms/dropDown/getAPO")
-    RESTfulResult getAPO();
+    Map<String, Object> getAPO();
 
     @GetMapping("api/v1/truckTms/dropDown/getFuCapacityId")
-    RESTfulResult getFuCapacityId();
+    Map<String, Object> getFuCapacityId();
 
     @GetMapping("api/v1/truckTms/dropDown/getPort")
-    RESTfulResult getPort();
+    Map<String, Object> getPort();
 }
 
 

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

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.feign;
 
-import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,7 +25,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/getBargeOperationList")
-    RESTfulResult getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
                                         @RequestParam Integer apiId);
@@ -38,7 +37,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/getBargeOperation/{bargeOperationId}")
-    RESTfulResult getBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
+    Map<String, Object> getBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
 
     /**
      * 查询驳船作业信息
@@ -47,7 +46,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/selectBargeOperation/{bargeOperationId}")
-    RESTfulResult selectBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
+    Map<String, Object> selectBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
 
     /**
      * 删除驳船作业信息
@@ -56,7 +55,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/deleteBargeOperation/{bargeOperationId}")
-    RESTfulResult deleteBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
+    Map<String, Object> deleteBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
 
     /**
      * 修改驳船作业信息
@@ -65,7 +64,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/updateBargeOperation")
-    RESTfulResult updateBargeOperation(@RequestBody Map<String, Object> tmsshipBargeOperation);
+    Map<String, Object> updateBargeOperation(@RequestBody Map<String, Object> tmsshipBargeOperation);
 
     /**
      * 新增驳船作业
@@ -74,7 +73,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/addBargeOperation")
-    RESTfulResult addBargeOperation(@RequestBody Map<String, Object> map);
+    Map<String, Object> addBargeOperation(@RequestBody Map<String, Object> map);
 
     /**
      * 新增抵达实绩
@@ -83,7 +82,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipentrywharyresults/addTmsShipEntryWharyResult")
-    RESTfulResult addTmsShipEntryWharyResult(@RequestBody Map<String, Object> mapVal);
+    Map<String, Object> addTmsShipEntryWharyResult(@RequestBody Map<String, Object> mapVal);
 
     /**
      * 新增离港实绩
@@ -92,7 +91,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipoutwharyresults/addTmsShipOutWharyResult")
-    RESTfulResult addTmsShipOutWharyResult(@RequestBody Map<String, Object> mapVal);
+    Map<String, Object> addTmsShipOutWharyResult(@RequestBody Map<String, Object> mapVal);
 
     /**
      * 展示装船作业信息列表
@@ -104,7 +103,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/getLoadShipList")
-    RESTfulResult getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                   @RequestParam Integer pageNum,
                                   @RequestParam Integer pageSize,
                                   @RequestParam Integer apiId);
@@ -116,7 +115,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/getLoadShip/{resultId}")
-    RESTfulResult getLoadShip(@PathVariable("resultId") BigDecimal resultId);
+    Map<String, Object> getLoadShip(@PathVariable("resultId") BigDecimal resultId);
 
     /**
      * 查询装船作业信息
@@ -125,7 +124,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/selectLoadShip/{resultId}")
-    RESTfulResult selectLoadShip(@PathVariable("resultId") BigDecimal resultId);
+    Map<String, Object> selectLoadShip(@PathVariable("resultId") BigDecimal resultId);
 
     /**
      * 删除装船作业信息
@@ -134,7 +133,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/deleteLoadShip/{resultId}")
-    RESTfulResult deleteLoadShip(@PathVariable("resultId") BigDecimal resultId);
+    Map<String, Object> deleteLoadShip(@PathVariable("resultId") BigDecimal resultId);
 
     /**
      * 修改装船作业信息
@@ -143,7 +142,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/updateLoadShip")
-    RESTfulResult updateLoadShip(@RequestBody Map<String, Object> tmsshipLoadShipResult);
+    Map<String, Object> updateLoadShip(@RequestBody Map<String, Object> tmsshipLoadShipResult);
 
     /**
      * 新增装船作业
@@ -152,7 +151,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/addLoadShip")
-    RESTfulResult addLoadShip(@RequestBody Map<String, Object> map);
+    Map<String, Object> addLoadShip(@RequestBody Map<String, Object> map);
 
     /**
      * 展示位置作业信息列表
@@ -164,7 +163,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationList")
-    RESTfulResult getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize,
                                       @RequestParam Integer apiId);
@@ -176,7 +175,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocation/{locationId}")
-    RESTfulResult getShipLocation(@PathVariable("locationId") BigDecimal locationId);
+    Map<String, Object> getShipLocation(@PathVariable("locationId") BigDecimal locationId);
 
     /**
      * 查询位置作业信息
@@ -185,7 +184,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/selectShipLocation/{locationId}")
-    RESTfulResult selectShipLocation(@PathVariable("locationId") BigDecimal locationId);
+    Map<String, Object> selectShipLocation(@PathVariable("locationId") BigDecimal locationId);
 
     /**
      * 删除位置作业信息
@@ -194,7 +193,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/deleteShipLocation/{locationId}")
-    RESTfulResult deleteShipLocation(@PathVariable("locationId") BigDecimal locationId);
+    Map<String, Object> deleteShipLocation(@PathVariable("locationId") BigDecimal locationId);
 
     /**
      * 修改位置作业信息
@@ -203,7 +202,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/updateShipLocation")
-    RESTfulResult updateShipLocation(@RequestBody Map<String, Object> tmsshipShipLocation);
+    Map<String, Object> updateShipLocation(@RequestBody Map<String, Object> tmsshipShipLocation);
 
     /**
      * 新增位置作业
@@ -212,7 +211,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/addShipLocation")
-    RESTfulResult addShipLocation(@RequestBody Map<String, Object> map);
+    Map<String, Object> addShipLocation(@RequestBody Map<String, Object> map);
 
     /**
      * 展示水路货物运单列表
@@ -224,7 +223,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/listAllOrders")
-    RESTfulResult listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                 @RequestParam Integer pageNum,
                                 @RequestParam Integer pageSize,
                                 @RequestParam Integer apiId);
@@ -239,7 +238,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getCapacityList")
-    RESTfulResult getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                   @RequestParam Integer pageNum,
                                   @RequestParam Integer pageSize,
                                   @RequestParam Integer apiId);
@@ -254,7 +253,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/getUnLoadShipList")
-    RESTfulResult getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
                                     @RequestParam Integer apiId);
@@ -266,7 +265,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/getUnloadShip/{resultId}")
-    RESTfulResult getUnloadShip(@PathVariable("resultId") BigDecimal resultId);
+    Map<String, Object> getUnloadShip(@PathVariable("resultId") BigDecimal resultId);
 
     /**
      * 查询卸船作业信息
@@ -275,7 +274,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/selectUnLoadShip/{resultId}")
-    RESTfulResult selectUnLoadShip(@PathVariable("resultId") BigDecimal resultId);
+    Map<String, Object> selectUnLoadShip(@PathVariable("resultId") BigDecimal resultId);
 
     /**
      * 删除卸船作业信息
@@ -284,7 +283,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/deleteUnLoadShip/{resultId}")
-    RESTfulResult deleteUnLoadShip(@PathVariable("resultId") BigDecimal resultId);
+    Map<String, Object> deleteUnLoadShip(@PathVariable("resultId") BigDecimal resultId);
 
     /**
      * 修改卸船作业信息
@@ -293,7 +292,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/updateUnLoadShip")
-    RESTfulResult updateUnLoadShip(@RequestBody Map<String, Object> tmsshipUnloadShipResult);
+    Map<String, Object> updateUnLoadShip(@RequestBody Map<String, Object> tmsshipUnloadShipResult);
 
     /**
      * 新增卸船作业
@@ -302,7 +301,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/addUnLoadShip")
-    RESTfulResult addUnLoadShip(@RequestBody Map<String, Object> map);
+    Map<String, Object> addUnLoadShip(@RequestBody Map<String, Object> map);
 
     /**
      * 展示水分质检信息列表
@@ -314,7 +313,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/getWaterQualityResultList")
-    RESTfulResult getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId);
@@ -326,7 +325,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/getWaterQuality/{resultId}")
-    RESTfulResult getWaterQuality(@PathVariable("resultId") BigDecimal resultId);
+    Map<String, Object> getWaterQuality(@PathVariable("resultId") BigDecimal resultId);
 
     /**
      * 查询水分质检信息
@@ -335,7 +334,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/selectWaterQualityResult/{resultId}")
-    RESTfulResult selectWaterQualityResult(@PathVariable("resultId") BigDecimal resultId);
+    Map<String, Object> selectWaterQualityResult(@PathVariable("resultId") BigDecimal resultId);
 
     /**
      * 删除水分质检信息
@@ -344,7 +343,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/deleteWaterQualityResult/{resultId}")
-    RESTfulResult deleteWaterQualityResult(@PathVariable("resultId") BigDecimal resultId);
+    Map<String, Object> deleteWaterQualityResult(@PathVariable("resultId") BigDecimal resultId);
 
     /**
      * 修改水分质检作业信息
@@ -353,7 +352,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/updateWaterQualityResult")
-    RESTfulResult updateWaterQualityResult(@RequestBody Map<String, Object> tmsshipWaterQualityResult);
+    Map<String, Object> updateWaterQualityResult(@RequestBody Map<String, Object> tmsshipWaterQualityResult);
 
     /**
      * 新增水分质检作业
@@ -362,7 +361,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/addWaterQualityResult")
-    RESTfulResult addWaterQualityResult(@RequestBody Map<String, Object> map);
+    Map<String, Object> addWaterQualityResult(@RequestBody Map<String, Object> map);
 
     /**
      * 展示船只信息列表
@@ -374,7 +373,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getCapacities")
-    RESTfulResult getCapacities(@RequestParam BigDecimal instructionsId,
+    Map<String, Object> getCapacities(@RequestParam BigDecimal instructionsId,
                                 @RequestBody(required = false) Map<String, Object> mapValue,
                                 @RequestParam Integer pageNum,
                                 @RequestParam Integer pageSize,
@@ -387,7 +386,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/addInstructionsCapacity")
-    RESTfulResult addInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity);
+    Map<String, Object> addInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity);
 
     /**
      * 查询船只
@@ -396,7 +395,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getInstructionsCapacity/{instructionsCapacityId}")
-    RESTfulResult getInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId);
+    Map<String, Object> getInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId);
 
     /**
      * 逻辑删除船只
@@ -405,7 +404,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/deleteInstructionsCapacity/{instructionsCapacityId}")
-    RESTfulResult deleteInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId);
+    Map<String, Object> deleteInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId);
 
     /**
      * 修改船只信息
@@ -414,7 +413,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/updateInstructionsCapacity")
-    RESTfulResult updateInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity);
+    Map<String, Object> updateInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity);
 
     /**
      * 展示装船指令
@@ -426,7 +425,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getShipMentInstructionsList")
-    RESTfulResult getShipMentInstructionsList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getShipMentInstructionsList(@RequestBody(required = false) Map<String, Object> mapValue,
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
                                               @RequestParam Integer apiId);
@@ -438,7 +437,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getShipmentInstructions/{instructionsId}")
-    RESTfulResult getShipmentInstructions(@PathVariable("instructionsId") BigDecimal instructionsId);
+    Map<String, Object> getShipmentInstructions(@PathVariable("instructionsId") BigDecimal instructionsId);
 
     /**
      * 查询装船指令
@@ -447,7 +446,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/updateIssueStatus/{shipmentInstructionsId}")
-    RESTfulResult updateIssueStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId);
+    Map<String, Object> updateIssueStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId);
 
     /**
      * 删除装船指令
@@ -456,7 +455,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/deleteByPrimaryKey/{instructionsId}")
-    RESTfulResult deleteByPrimaryKey(@PathVariable("instructionsId") BigDecimal instructionsId);
+    Map<String, Object> deleteByPrimaryKey(@PathVariable("instructionsId") BigDecimal instructionsId);
 
     /**
      * 修改装船指令
@@ -465,7 +464,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/updateShipmentInstructions")
-    RESTfulResult updateShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions);
+    Map<String, Object> updateShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions);
 
     /**
      * 新增装船指令
@@ -474,56 +473,56 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/addShipmentInstructions")
-    RESTfulResult addShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions);
+    Map<String, Object> addShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions);
 
     /**
      * 下拉框
      * @return
      */
     @GetMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getGroupId")
-    RESTfulResult getGroupId();
+    Map<String, Object> getGroupId();
 
     @GetMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getCargoId")
-    RESTfulResult getCargoId();
+    Map<String, Object> getCargoId();
 
     @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/insertBetchId")
-    RESTfulResult insertBetchId();
+    Map<String, Object> insertBetchId();
 
     @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getAttorneyId")
-    RESTfulResult getAttorneyId();
+    Map<String, Object> getAttorneyId();
 
     @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getNoticeId")
-    RESTfulResult getNoticeId();
+    Map<String, Object> getNoticeId();
 
     @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getPortName")
-    RESTfulResult getPortName();
+    Map<String, Object> getPortName();
 
     @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getPortId")
-    RESTfulResult getPortId();
+    Map<String, Object> getPortId();
 
     @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getRmRawId")
-    RESTfulResult getRmRawId();
+    Map<String, Object> getRmRawId();
 
     @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getPierId")
-    RESTfulResult getPierId();
+    Map<String, Object> getPierId();
 
     @GetMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getResultNumber")
-    RESTfulResult getResultNumber();
+    Map<String, Object> getResultNumber();
 
     @GetMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getCarrier")
-    RESTfulResult getCarrier();
+    Map<String, Object> getCarrier();
 
     @GetMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getShipper")
-    RESTfulResult getShipper();
+    Map<String, Object> getShipper();
 
     @GetMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getOrderId")
-    RESTfulResult getTask();
+    Map<String, Object> getTask();
 
     @GetMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getCapacityId")
-    RESTfulResult getCapacityId();
+    Map<String, Object> getCapacityId();
 
     @GetMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getBatchId")
-    RESTfulResult getBatchId();
+    Map<String, Object> getBatchId();
 
     /**
      * 展示货权转移
@@ -535,7 +534,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getAmsshipCargoTranferResultList")
-    RESTfulResult getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize,
                                                    @RequestParam Integer apiId);
@@ -547,7 +546,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/insertamsshipCargoTransferResult")
-    RESTfulResult insertamsshipCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult);
+    Map<String, Object> insertamsshipCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult);
 
     /**
      * 逻辑删除货权转移
@@ -556,7 +555,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/deleteByCargoId/{cargoTransferResultId}")
-    RESTfulResult deleteByCargoId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId);
+    Map<String, Object> deleteByCargoId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId);
 
     /**
      * 修改货权转移
@@ -565,7 +564,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/editCargoTransferResult")
-    RESTfulResult editCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult);
+    Map<String, Object> editCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult);
 
     /**
      * 查询货权转移
@@ -574,7 +573,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/selectByCargoTranferResultId/{cargoTransferResultId}")
-    RESTfulResult selectByCargoTranferResultId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId);
+    Map<String, Object> selectByCargoTranferResultId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId);
 
     /**
      * 展示提货委托
@@ -586,7 +585,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getAmsshipDeliveryAttroneyList")
-    RESTfulResult getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
                                                  @RequestParam Integer apiId);
@@ -598,7 +597,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/insertshipDeliveryAttorney")
-    RESTfulResult insertshipDeliveryAttorney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
+    Map<String, Object> insertshipDeliveryAttorney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
 
     /**
      * 逻辑删除提货委托
@@ -607,7 +606,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/deleteByAttorneyId/{attorneyId}")
-    RESTfulResult deleteByAttorneyId(@PathVariable("attorneyId") Integer attorneyId);
+    Map<String, Object> deleteByAttorneyId(@PathVariable("attorneyId") Integer attorneyId);
 
     /**
      * 修改提货委托
@@ -616,7 +615,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/editDeliveryAttroney")
-    RESTfulResult editDeliveryAttroney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
+    Map<String, Object> editDeliveryAttroney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
 
     /**
      * 查询提货委托
@@ -625,7 +624,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getDeliveryAttorneyId/{attorneyId}")
-    RESTfulResult getDeliveryAttorneyId(@PathVariable("attorneyId") Integer attorneyId);
+    Map<String, Object> getDeliveryAttorneyId(@PathVariable("attorneyId") Integer attorneyId);
 
     /**
      * 下发提货委托
@@ -634,7 +633,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/sendDeliveryAttorneyStatus/{attorneyId}")
-    RESTfulResult sendDeliveryAttorneyStatus(@PathVariable("attorneyId") Integer attorneyId);
+    Map<String, Object> sendDeliveryAttorneyStatus(@PathVariable("attorneyId") Integer attorneyId);
 
     /**
      * 展示放货通知
@@ -646,7 +645,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getshipDeliveryNoticeList")
-    RESTfulResult getshipDeliveryNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getshipDeliveryNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId);
@@ -658,7 +657,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/insertDeliveryNotice")
-    RESTfulResult insertDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice);
+    Map<String, Object> insertDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice);
 
     /**
      * 逻辑删除放货通知
@@ -667,7 +666,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/deleteByNoticeId/{noticeId}")
-    RESTfulResult deleteByNoticeId(@PathVariable("noticeId") Integer noticeId);
+    Map<String, Object> deleteByNoticeId(@PathVariable("noticeId") Integer noticeId);
 
     /**
      * 修改放货通知
@@ -676,7 +675,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/editDeliveryNotice")
-    RESTfulResult editDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice);
+    Map<String, Object> editDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice);
 
     /**
      * 查询放货通知
@@ -685,7 +684,7 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/selectByNoticeId/{noticeId}")
-    RESTfulResult selectByNoticeId(@PathVariable("noticeId") Integer noticeId);
+    Map<String, Object> selectByNoticeId(@PathVariable("noticeId") Integer noticeId);
 
     /**
      * 下发放货通知
@@ -694,5 +693,5 @@ public interface TmsshipFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/sendDeliveryNotice/{noticeId}")
-    RESTfulResult sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId);
+    Map<String, Object> sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId);
 }

src/main/resources/bootstrap.yml

@@ -45,7 +45,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:localhost:8084}
   WMSFeign:
-   url: ${WMSFEIGN_URL:localhost:8093}
+    url: ${WMSFEIGN_URL:localhost:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}