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