1.增加客户库存品列表

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<IPage<DistributionStockListVO>> listOwn(@ApiIgnore @RequestParam Map<String, Object> distributionStockList, Query query) {
+		IPage<DistributionStockListVO> pages = distributionStockListService.pageOwn(Condition.getPage(query), distributionStockList);
+		return R.data(pages);
+	}
 
+	/**
+	 * 库存品管理 商城客户查询列表
+	 */
+	@GetMapping("/listclinet")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionStockList")
+	public R<IPage<DistributionStockListVO>> listClinet(@ApiIgnore @RequestParam Map<String, Object> distributionStockList, Query query) {
 		IPage<DistributionStockListVO> pages = distributionStockListService.pageOwn(Condition.getPage(query), distributionStockList);
 		return R.data(pages);
 	}

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
         <where>
             ldr.is_deleted = 0
-            <if test="param.state != null and param.state!=''">
-                and ldsa.state = #{param.state}
+            <if test="param.orderStatus != null and param.orderStatus!=''">
+                and ldsa.orderStatus = #{param.orderStatus}
             </if>
             <if test="param.orderCode != null and param.orderCode!=''">
                 and ldsa.order_code = #{param.orderCode}