diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java index 000304481..3c94a79b5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java @@ -90,7 +90,17 @@ public class DistributionStockListController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStockList") public R> listOwn(@ApiIgnore @RequestParam Map distributionStockList, Query query) { + IPage pages = distributionStockListService.pageOwn(Condition.getPage(query), distributionStockList); + return R.data(pages); + } + /** + * 库存品管理 商城客户查询列表 + */ + @GetMapping("/listclinet") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionStockList") + public R> listClinet(@ApiIgnore @RequestParam Map distributionStockList, Query query) { IPage pages = distributionStockListService.pageOwn(Condition.getPage(query), distributionStockList); return R.data(pages); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index de1d4cc34..d04040bbb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -513,8 +513,8 @@ join logpm_distribution_stock_article ldsa on ldsa.id =ldrs.stock_article_id ldr.is_deleted = 0 - - and ldsa.state = #{param.state} + + and ldsa.orderStatus = #{param.orderStatus} and ldsa.order_code = #{param.orderCode}