Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -429,11 +429,12 @@ public class AMScontroller{
                                                              Integer pageNum,
                                                              Integer pageSize,
                                                              Integer apiId,
-                                                             Integer deleted) {
+                                                             Integer deleted,
+                                                             String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getInwardContractPrice(mapValue, pageNum, pageSize, apiId, deleted);
+        return amsFeign.getInwardContractPrice(mapValue, pageNum, pageSize, apiId, deleted,con);
     }
 
 
@@ -2065,4 +2066,12 @@ public class AMScontroller{
         return amsFeign.addSteelSaleOrderList(mapList);
     }
 
+    @PostMapping("/updateTransPrice")
+    @ApiOperation(value = "修改内转汽运单价")
+    public Map<String, Object> updateTransPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.updateTransPrice(mapValue);
+    }
 }

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

@@ -1649,7 +1649,8 @@ public interface AmsFeign {
                                                       @RequestParam("pageNum") Integer pageNum,
                                                       @RequestParam("pageSize") Integer pageSize,
                                                       @RequestParam("apiId") Integer apiId,
-                                                      @RequestParam("deleted") Integer deleted);
+                                                      @RequestParam("deleted") Integer deleted,
+                                                      @RequestParam("con") String con);
     //根据物资查询运输物资单价
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardPriceBy")
     Map<String, Object> getInwardPriceBy(@RequestBody(required = false)Map<String, Object> mapvalue);
@@ -1780,4 +1781,6 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amssaleorders/addSteelSaleOrderList")
     Map<String, Object> addSteelSaleOrderList(@RequestBody List<Map<String, Object>> mapList);
 
+    @PostMapping("/api/v1/ams/amscontracttruckprices/updateTransPrice")
+    Map<String, Object> updateTransPrice(@RequestBody Map<String, Object> mapList);
 }