商场端库存品仓库信息

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -269,9 +269,7 @@ public class DistributionStockArticleController extends BladeController {
 //			.map(BasicdataWarehouseEntity::getId)
 //			.collect(Collectors.toList());
 //		distributionStockArticle.setWarehouseIdList(collect);
-		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.selectClientListPage(Condition.getPage(query), distributionStockArticle);
-
-
+ 		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.selectClientListPage(Condition.getPage(query), distributionStockArticle);
 		return R.data(DistributionStockArticleWrapper.build().pageVO(pages));
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -35,7 +35,7 @@
     </resultMap>
 
     <sql id="stockList">
-        select DISTINCT ldsi.service_number serviceNumber,ldsi.service_type serviceType,ldsi.description_goods descriptionGoods,ldsi.cargo_number cargoNumber,ldsi.despatch ,ldsi.incoming_batch incomingBatch,
+        select DISTINCT ldsi.service_number serviceNumber,ldsi.service_type serviceType,ldsi.description_goods descriptionGoods,ldsi.cargo_number cargoNumber,ldsi.despatch ,ldsi.incoming_batch incomingBatch,ldsi.warehouse_id warehouseId,
         CASE  WHEN ldsi.pid is null THEN
         (select  sum(l.quantity_stock)
         from logpm_distribution_stock_list l