zouzhd пре 3 година
родитељ
комит
0da0097193

+ 7 - 7
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -509,16 +509,16 @@ public class AMScontroller{
         }
         return amsFeign.getSaleOrderDetail(saleOrderId,mapValue, pageNum, pageSize, apiId);
     }
-    @PostMapping("uploadSaleOrder/{saleOrderId}")
-    Map<String, Object> uploadSaleOrder(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
+    @PostMapping("uploadSaleOrder")
+    Map<String, Object> uploadSaleOrder(@RequestParam BigDecimal saleOrderId) {
         return amsFeign.uploadSaleOrder(saleOrderId);
     }
     @PostMapping("/addAmsSaleOrder")
     Map<String, Object> addAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.addAmsSaleOrder(mapVal);
     }
-    @PostMapping("getAmsSaleOrderBySaleOrderId/{saleOrderId}")
-    Map<String, Object> getAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
+    @PostMapping("getAmsSaleOrderBySaleOrderId")
+    Map<String, Object> getAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId) {
         return amsFeign.getAmsSaleOrderBySaleOrderId(saleOrderId);
     }
     @PostMapping("/updateAmsSaleOrder")
@@ -531,14 +531,14 @@ public class AMScontroller{
     }
     @PostMapping("getSaleOrderUpdateLog")
     @ApiOperation(value = "查询汽运单价信息")
-    public Map<String, Object> getSaleOrderUpdateLog(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getSaleOrderUpdateLog(BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
                                             Integer pageNum,
                                             Integer pageSize,
                                             Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderUpdateLog(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getSaleOrderUpdateLog(saleOrderId,mapValue, pageNum, pageSize, apiId);
     }
 
     @GetMapping(value = "getSalePlanName")
@@ -571,7 +571,7 @@ public class AMScontroller{
     Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(BigDecimal saleOrderMaterialId) {
         return amsFeign.deleteAmsSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
     }
-    @PostMapping("getAddress/{saleOrderMaterialId}")
+    @PostMapping("getAddress")
     Map<String, Object> getAddress(BigDecimal saleOrderMaterialId) {
         return amsFeign.getAddress(saleOrderMaterialId);
     }

+ 6 - 6
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -491,8 +491,8 @@ public interface AmsFeign {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "saleOrderId", value = "销售订单ID", required = false, dataType = "java.math.BigDecimal")
     })
-    @PostMapping(value = "/api/v1/ams/amssaleorders/uploadSaleOrder/{saleOrderId}")
-    Map<String, Object> uploadSaleOrder(@PathVariable("saleOrderId") BigDecimal saleOrderId);
+    @PostMapping(value = "/api/v1/ams/amssaleorders/uploadSaleOrder")
+    Map<String, Object> uploadSaleOrder(@RequestParam BigDecimal saleOrderId);
     /**
      * 新增销售订单
      */
@@ -512,8 +512,8 @@ public interface AmsFeign {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "saleOrderId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
-    @PostMapping(value = "/api/v1/ams/amssaleorders/getAmsSaleOrderBySaleOrderId/{saleOrderId}")
-    Map<String, Object> getAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId);
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getAmsSaleOrderBySaleOrderId")
+    Map<String, Object> getAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId);
     /**
      * 通过主键修改销售订单
      * @param map
@@ -541,7 +541,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleOrderUpdateLog")
-    Map<String, Object> getSaleOrderUpdateLog(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getSaleOrderUpdateLog(@RequestParam BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
                                      @RequestParam Integer apiId);
@@ -629,7 +629,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
-    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAddress/{saleOrderMaterialId}")
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAddress")
     Map<String, Object> getAddress(@RequestParam BigDecimal saleOrderMaterialId);