油品名称 货物类型

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

@@ -456,8 +456,8 @@ public class AMScontroller{
      */
     @PostMapping("batchUpdateTransportPriceByOilPrice1")
     @ApiOperation(value = "油价联动导致运价变动，批量修改运价")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice1() {
-        return amsFeign.batchUpdateTransportPriceByOilPrice1();
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1(@RequestBody Map<String,Object> map) {
+        return amsFeign.batchUpdateTransportPriceByOilPrice1(map);
     }
     @GetMapping("getLineNo")
     @ApiOperation(value = "得到线路编号下拉")
@@ -475,6 +475,18 @@ public class AMScontroller{
         return amsFeign.getDeliveryAddress();
     }
 
+    @GetMapping("getCargoName")
+    @ApiOperation(value = "获取货物类型")
+    public Map<String, Object> getCargoName(){
+        return amsFeign.getCargoName();
+    }
+
+    @GetMapping("getOilTypeName")
+    @ApiOperation(value = "获取油品名称")
+    public Map<String, Object> getOilTypeName(){
+        return amsFeign.getOilTypeName();
+    }
+
     @PostMapping("/addAmsDispatchSaleOrder")
     Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.addAmsDispatchSaleOrder(mapVal);

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

@@ -366,7 +366,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/batchUpdateTransportPriceByOilPrice1")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice1();
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1(@RequestBody Map<String,Object> map);
     /**
      * 获取线路编号
      * @param
@@ -397,6 +397,27 @@ public interface AmsFeign {
     })
     @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getDeliveryAddress")
     Map<String, Object> getDeliveryAddress();
+    /**
+     * 获取货物类型
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取货物类型")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getCargoName")
+    Map<String, Object> getCargoName();
+    /**
+     * 获取油品名称
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取油品名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getOilTypeName")
+    Map<String, Object> getOilTypeName();
+
     /**
      * 新增(固定派单/公开抢单)
      * @param mapVal