1.数量统计

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java

@@ -136,6 +136,11 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity {
 	 */
 	@ApiModelProperty(value = "备货数量")
 	private String stockupNumber;
+	/**
+	 * ids
+	 */
+	@ApiModelProperty(value = "ids")
+	private List<Long> warehouseIdList;
 
 
 

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

@@ -252,7 +252,12 @@ public class DistributionStockArticleController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入distributionStockArticle")
 	public R<IPage<DistributionStockArticleVO>> clientList(@ApiIgnore  DistributionStockArticleVO distributionStockArticle, Query query) {
 
-
+		//获取当前登录人仓库
+//		List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
+//		List<Long> collect = myWatchWarehouse.stream()
+//			.map(BasicdataWarehouseEntity::getId)
+//			.collect(Collectors.toList());
+//		distributionStockArticle.setWarehouseIdList(collect);
 		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.selectClientListPage(Condition.getPage(query), distributionStockArticle);
 
 		DistributionStockArticleWrapper.build().pageVO(pages);

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

@@ -270,6 +270,12 @@
             <if test="param.trainNumber != null and param.trainNumber!=''">
                 and lddl.train_number like concat('%',#{param.trainNumber},'%')
             </if>
+            <if test="param.warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(param.warehouseIdList)">
+                and lddl.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="param.warehouseName != null and param.warehouseName!=''">
                 and lddl.warehouse_name like concat('%',#{param.warehouseName},'%')
             </if>
@@ -312,6 +318,12 @@
             <if test="param.warehouseName != null and param.warehouseName!=''">
                 and lddl.warehouse_name like concat('%',#{param.warehouseName},'%')
             </if>
+            <if test="param.warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(param.warehouseIdList)">
+                and ldr.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="param.vehicleName != null and param.vehicleName!=''">
                 and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
             </if>
@@ -348,6 +360,12 @@
             <if test="param.warehouseName != null and param.warehouseName!=''">
                 and lddl.warehouse_name like concat('%',#{param.warehouseName},'%')
             </if>
+            <if test="param.warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(param.warehouseIdList)">
+                and lddl.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="param.vehicleName != null and param.vehicleName!=''">
                 and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
             </if>
@@ -391,6 +409,12 @@
             <if test="param.vehicleName != null and param.vehicleName!=''">
                 and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
             </if>
+            <if test="param.warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(param.warehouseIdList)">
+                and lddl.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="param.driverName != null and param.driverName!=''">
                 and lddl.driver_name like concat('%',#{param.driverName},'%')
             </if>
@@ -755,6 +779,12 @@
             <if test="param.warehouseName != null and param.warehouseName!=''">
                 and lddl.warehouse_name like concat('%',#{param.warehouseName},'%')
             </if>
+            <if test="param.warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(param.warehouseIdList)">
+                and ldr.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="param.vehicleName != null and param.vehicleName!=''">
                 and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
             </if>
@@ -797,6 +827,12 @@
             <if test="param.vehicleName != null and param.vehicleName!=''">
                 and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
             </if>
+            <if test="param.warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(param.warehouseIdList)">
+                and ldr.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="param.driverName != null and param.driverName!=''">
                 and lddl.driver_name like concat('%',#{param.driverName},'%')
             </if>

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

@@ -91,6 +91,12 @@
         <if test="distributionStockArticleVO.reservationStatus != null and distributionStockArticleVO.reservationStatus != ''">
             and ldsa.reservation_status = #{distributionStockArticleVO.reservationStatus}
         </if>
+<!--        <if test="distributionStockArticleVO.warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(distributionStockArticleVO.warehouseIdList)">-->
+<!--            and ldsa.warehouse_id in-->
+<!--            <foreach collection="distributionStockArticleVO.warehouseIdList" item="item" open="(" close=")" separator=",">-->
+<!--                #{item}-->
+<!--            </foreach>-->
+<!--        </if>-->
         <if test="distributionStockArticleVO.orderStatus != null and distributionStockArticleVO.orderStatus != ''">
             and ldsa.order_status = #{distributionStockArticleVO.orderStatus}
         </if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -225,7 +225,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			distributionDeliveryList.setCreateTime_query(sdf.format(distributionDeliveryList.getCreateTime()));
 		}
-
+		//获取当前登录人仓库
+		List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
+		//取出id
+		List<Long> collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
+		distributionDeliveryList.setWarehouseIdList(collect);
 		DistributionstatisticsnmbVO distributionstatisticsnmbVO = new DistributionstatisticsnmbVO();
 		//商配车次
 		Integer a = baseMapper.selectBycommercialNub(distributionDeliveryList);