1.仓库权限

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java

@@ -21,6 +21,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.vo.BasicdataWarehouseVO;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -102,6 +103,22 @@ public interface IBasicdataWarehouseClient {
 	BasicdataWarehouseEntity getMyCurrentWarehouse();
 
 
+	/**
+	 * 获取当前登录人的能查看的仓库
+	 * @return
+	 */
+	@GetMapping(API_PREFIX+"/getMyWatchWarehouse")
+	List<BasicdataWarehouseEntity> getMyWatchWarehouse();
+
+
+	/**
+	 * 清除当前登录人仓库缓存
+	 * @return
+	 */
+	@GetMapping(API_PREFIX+"/clearWarehouseCache")
+	R clearWarehouseCache();
+
+
 
 
 	@GetMapping(API_PREFIX+"/getEntityWarehouseId")

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java

@@ -17,7 +17,9 @@
 package com.logpm.basicdata.controller;
 
 import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.basicdata.service.IBasicdataGoodsAreaService;
 import com.logpm.basicdata.vo.BasicdataGoodsAreaVO;
 import com.logpm.basicdata.vo.BasicdataNodeVO;
@@ -46,6 +48,7 @@ import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
 import java.util.Map;
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -63,6 +66,8 @@ public class BasicdataGoodsAreaController extends BladeController {
 
 	private final IBasicdataGoodsAreaService basicdataGoodsAreaService;
 
+	private final IBasicdataWarehouseClient basicdataWarehouseClient;
+
 	/**
 	 * 货区 详情
 	 */
@@ -116,6 +121,12 @@ public class BasicdataGoodsAreaController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入warehouseGoodsArea")
 	public R save(@Valid @RequestBody BasicdataGoodsAreaEntity basicdataGoodsAreaEntity) {
+		//获取当前登录人仓库
+		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if (Objects.isNull(basicdataWarehouseEntity)){
+			return R.fail("无选择仓库,无法新增");
+		}
+		basicdataGoodsAreaEntity.setWarehouseId(basicdataWarehouseEntity.getId());
 		return R.status(basicdataGoodsAreaService.save(basicdataGoodsAreaEntity));
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java

@@ -18,7 +18,9 @@ package com.logpm.basicdata.controller;
 
 import com.logpm.basicdata.dto.BasicdataGoodsShelfDTO;
 import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsShelfExcel;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.basicdata.service.IBasicdataGoodsShelfService;
 import com.logpm.basicdata.vo.BasicdataGoodsShelfVO;
 import io.swagger.annotations.Api;
@@ -45,6 +47,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Map;
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -61,6 +64,8 @@ public class BasicdataGoodsShelfController extends BladeController {
 
 	private final IBasicdataGoodsShelfService basicdataGoodsShelfService;
 
+	private final IBasicdataWarehouseClient basicdataWarehouseClient;
+
 	/**
 	 * 货架 详情
 	 */
@@ -102,6 +107,12 @@ public class BasicdataGoodsShelfController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入BasicdataGoodsShelf")
 	public R save(@Valid @RequestBody BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) {
+		//获取当前登录人仓库
+		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if (Objects.isNull(basicdataWarehouseEntity)){
+			return R.fail("无选择仓库,无法新增");
+		}
+		basicdataGoodsShelfDTO.setWarehouseId(basicdataWarehouseEntity.getId());
 		return R.status(basicdataGoodsShelfService.insertGoodsshelf(basicdataGoodsShelfDTO));
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@@ -109,17 +109,16 @@ public class BasicdataWarehouseController extends BladeController {
 		if (Objects.isNull(myCurrentWarehouse)){
 			 myWarehouseList = basicdataWarehouseClient.getMyWarehouseList();
 		}else {myWarehouseList.add(myCurrentWarehouse);}
-
-		if (myWarehouseList.size()==0){
-			return R.data(null);
-		}
+//		if (myWarehouseList.size()==0){
+//			return R.data(null);
+//		}
 		List<Long> collect = myWarehouseList.stream()
 			.map(BasicdataWarehouseEntity::getId)
 			.collect(Collectors.toList());
 		QueryWrapper<BasicdataWarehouseEntity> qw = Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class);
 		qw.lambda().apply(startDate != null, "date_format (start_date,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", startDate)
 			.apply(endDate != null, "date_format (end_date,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", endDate)
-			.in(BasicdataWarehouseEntity::getId,collect
+			.in(collect.size()>0,BasicdataWarehouseEntity::getId,collect
 			);
 //		qw.lambda().eq(BasicdataWarehouseEntity::getTenantId, AuthUtil.getTenantId());
 //		qw.lambda().eq(BasicdataWarehouseEntity::getDepartment, deptId);
@@ -247,8 +246,8 @@ public class BasicdataWarehouseController extends BladeController {
 	@GetMapping("/warehouseList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入BasicdataGoodsShelf")
-	public R<List<BasicdataWarehouseVO>> getWarehouseList() {
-		List<BasicdataWarehouseVO> basicdataGoodsShelfVOList = warehouseService.getWarehouseList();
+	public R<List<BasicdataWarehouseEntity>> getWarehouseList() {
+		List<BasicdataWarehouseEntity> basicdataGoodsShelfVOList = warehouseService.getWarehouseList();
 		return R.data(basicdataGoodsShelfVOList);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java

@@ -27,6 +27,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -147,6 +148,18 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
 		return warehouseEntity;
 	}
 
+	@Override
+	@GetMapping(API_PREFIX+"/getMyWatchWarehouse")
+	public List<BasicdataWarehouseEntity> getMyWatchWarehouse() {
+		return warehouseWarehouseService.getMyWatchWarehouse();
+	}
+
+	@Override
+	@GetMapping(API_PREFIX+"/clearWarehouseCache")
+	public R clearWarehouseCache() {
+		return warehouseWarehouseService.clearWarehouseCache();
+	}
+
 	@Override
 	public BasicdataWarehouseEntity getWarehouseByDepartment(String deptId) {
 		QueryWrapper<BasicdataWarehouseEntity> queryWrapper = new QueryWrapper<>();

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml

@@ -103,6 +103,12 @@
             <if test="po.goodsAreaId!=null and po.goodsAreaId!=''">
                 AND  goods_allocation.goods_area_id=#{po.goodsAreaId}
             </if>
+            <if test="po.warehouseList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(po.warehouseList)">
+                and goods_allocation.warehouse_id in
+                <foreach collection="po.warehouseList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="po.warehouseName != null and po.warehouseName!= ''">
                 and warehouse.name  like concat('%', #{po.warehouseName},'%')
             </if>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -74,6 +74,12 @@
            <if test="po.warehouseId != null and po.warehouseId!=''">
               and goods_area.warehouse_id = #{po.warehouseId}
            </if>
+           <if test="po.warehouseList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(po.warehouseList)">
+               and goods_area.warehouse_id in
+               <foreach collection="po.warehouseList" item="item" open="(" close=")" separator=",">
+                   #{item}
+               </foreach>
+           </if>
            <if test="po.enableStatus != null and po.enableStatus!=''">
                and goods_area.enable_status = #{po.enableStatus}
            </if>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml

@@ -87,6 +87,12 @@
             goods_shelf.is_deleted=0
             <if test="po.goodsAreaId != null and po.goodsAreaId!= ''">
                 and goods_shelf.goods_area_id = #{po.goodsAreaId}
+            </if>
+            <if test="po.warehouseList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(po.warehouseList)">
+                and goods_shelf.warehouse_id in
+                <foreach collection="po.warehouseList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
             </if>
              <if test="po.warehouseName != null and po.warehouseName!= ''">
                 and warehouse.name  like concat('%', #{po.warehouseName},'%')

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@@ -69,6 +69,12 @@
             <if test="po.warehouseId !=null and po.warehouseId != ''">
                 and warehouse.id = #{po.warehouseId}
             </if>
+            <if test="po.warehouseList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(po.warehouseList)">
+                and tray.warehouse_id in
+                <foreach collection="po.warehouseList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="po.trayStatus !=null and po.trayStatus != ''">
                 and tray.tray_status = #{po.trayStatus}
             </if>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java

@@ -63,7 +63,7 @@ public interface BasicdataWarehouseMapper extends BaseMapper<BasicdataWarehouseE
 	 * 获取所有仓库列表
 	 * @return
 	 */
-	List<BasicdataWarehouseVO> getWarehouseList();
+	List<BasicdataWarehouseEntity> getWarehouseList();
 
 
 	/**

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml

@@ -77,7 +77,7 @@
         SELECT a.id,a.name,b.headline FROM logpm_warehouse_warehouse AS a left JOIN logpm_warehouse_goods_area AS b ON a.id=b.warehouse_id
     </select>
 
-    <select id="getWarehouseList" resultType="com.logpm.basicdata.vo.BasicdataWarehouseVO">
+    <select id="getWarehouseList" resultType="com.logpm.basicdata.entity.BasicdataWarehouseEntity">
         SELECT
             tenant_id,
             create_user,

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java

@@ -63,7 +63,7 @@ public interface IBasicdataWarehouseService extends BaseService<BasicdataWarehou
 	 * 仓库列表信息
 	 * @return
 	 */
-	List<BasicdataWarehouseVO> getWarehouseList();
+	List<BasicdataWarehouseEntity> getWarehouseList();
 
 
 	/**
@@ -106,4 +106,12 @@ public interface IBasicdataWarehouseService extends BaseService<BasicdataWarehou
 	BasicdataWarehouseEntity getMyCurrentWarehouse();
 
     BasicdataWarehouseEntity getWarehouseEntityByWarehouseCode(String warehouseCode);
+	/**
+	 * 根据当前登录用户查询能看到的仓库
+	 */
+    List<BasicdataWarehouseEntity> getMyWatchWarehouse();
+	/**
+	 * 根据当前登录用户查询能看到的仓库
+	 */
+    R clearWarehouseCache();
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java

@@ -27,9 +27,11 @@ import com.logpm.basicdata.dto.BasicdataGoodsAllocationDTO;
 import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.basicdata.mapper.BasicdataGoodsAllocationMapper;
 import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper;
 import com.logpm.basicdata.service.IBasicdataGoodsAllocationService;
+import com.logpm.basicdata.service.IBasicdataWarehouseService;
 import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO;
 import com.logpm.basicdata.vo.BasicdataNodeVO;
 import com.logpm.basicdata.vo.FreightSpaceVO;
@@ -59,6 +61,7 @@ import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 货位 服务实现类
@@ -78,6 +81,10 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 
 	private final IBasicPrintTemplateClient printTemplateClient;
 
+	private final IBasicdataWarehouseClient basicdataWarehouseClient;
+
+	private final IBasicdataWarehouseService basicdataWarehouseService;
+
 
 	@Override
 	public IPage<BasicdataGoodsAllocationVO> selectBasicdataGoodsAllocationPage(IPage<BasicdataGoodsAllocationVO> page, BasicdataGoodsAllocationVO BasicdataGoodsAllocation) {
@@ -96,6 +103,30 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 
 	@Override
 	public List<BasicdataNodeVO> getNode() {
+//		List<BasicdataWarehouseEntity> myWarehouseList = basicdataWarehouseService.getMyWarehouseList();
+//		ArrayList<BasicdataNodeVO> basicdataNodeVOS = new ArrayList<>();
+//		for (BasicdataWarehouseEntity basicdataWarehouseEntity : myWarehouseList) {
+//			BasicdataNodeVO basicdataNodeVO = new BasicdataNodeVO();
+//			basicdataNodeVO.setLabel(String.valueOf(basicdataWarehouseEntity.getId()));
+//			basicdataNodeVO.setValue(basicdataWarehouseEntity.getName());
+//			List<BasicdataNodeVO> goodeAreaNodes = goodsAllocationMapper.selectSecondNode(basicdataNodeVO.getValue());
+//			//判断仓库下是否存在货区节点，存在则添加，不存在则设置没有下级节点
+//			if (!Func.isEmpty(goodeAreaNodes)) {
+//				basicdataNodeVO.setChildren(goodeAreaNodes);
+//				for (BasicdataNodeVO goodeAreaNode : goodeAreaNodes) {
+//					//遍历货区节点信息，查询货区对应货架节点
+//					List<BasicdataNodeVO> goodsShelfNode = goodsAllocationMapper.selectThirdNode(basicdataNodeVO.getValue(), goodeAreaNode.getValue());
+//					if (!Func.isEmpty(goodsShelfNode)) {
+//						goodeAreaNode.setChildren(goodsShelfNode);
+//					} else {
+//						goodeAreaNode.setLeaf(true);
+//					}
+//				}
+//			} else {
+//				basicdataNodeVO.setLeaf(true);
+//			}
+//			basicdataNodeVOS.add(basicdataNodeVO);
+//		}
 		//查询一级仓库节点信息
 		List<BasicdataNodeVO> basicdataWarehouseVOList = goodsAreaMapper.selectFirstNode();
 		//遍历仓库节点查询货区节点信息
@@ -155,6 +186,12 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 	public IPage<BasicdataGoodsAllocationVO> selectGoodsAllocationList(Query query, Map<String, Object> basicdataGoodsAllocation) {
 		IPage<Object> page = Condition.getPage(query);
 		//这里前端进行了封装，不需要再进行处理了
+		//获取当前登录人仓库
+		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
+		List<Long> collect = myWatchWarehouse.stream()
+			.map(BasicdataWarehouseEntity::getId)
+			.collect(Collectors.toList());
+		basicdataGoodsAllocation.put("warehouseList",collect);
 		IPage<BasicdataGoodsAllocationVO> goodsAllocationVOIPage = goodsAllocationMapper.selectGoodsAllocationList(page, basicdataGoodsAllocation);
 		return goodsAllocationVOIPage;
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java

@@ -54,6 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 货区 服务实现类
@@ -99,13 +100,11 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 	@Override
 	public IPage<BasicdataGoodsAreaVO> getBasicdataGoodsAreaList(Map<String, Object> basicdataGoodsArea, IPage<Object> page) {
 		//获取当前登录人仓库
-//		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
-//		if (Objects.isNull(basicdataWarehouseEntity)){
-//			List<BasicdataWarehouseVO> myWarehouseList = basicdataWarehouseClient.getMyWarehouseList();
-//			if (myWarehouseList.size()==0){
-//				return null;
-//			}
-//		}
+		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
+		List<Long> collect = myWatchWarehouse.stream()
+			.map(BasicdataWarehouseEntity::getId)
+			.collect(Collectors.toList());
+		basicdataGoodsArea.put("warehouseList",collect);
 		IPage<BasicdataGoodsAreaVO> goodsAreaVOIPage = basicdataGoodsAreaMapper.getBasicdataGoodsAreaList(page,basicdataGoodsArea);
 		return goodsAreaVOIPage;
 	}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java

@@ -114,6 +114,12 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 
 	@Override
 	public IPage<BasicdataGoodsShelfVO> getGoodsShelfList(IPage<Object> page, Map<String, Object> basicdataGoodsShelf) {
+		//获取当前登录人仓库
+		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
+		List<Long> collect = myWatchWarehouse.stream()
+			.map(BasicdataWarehouseEntity::getId)
+			.collect(Collectors.toList());
+		basicdataGoodsShelf.put("warehouseList",collect);
 		IPage<BasicdataGoodsShelfVO> basicdataGoodsShelfVOIPage = basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf);
 		return basicdataGoodsShelfVOIPage;
 	}
@@ -133,10 +139,10 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			log.error("仓库货区信息不合法");
 			throw new RuntimeException("请完善货区信息!!!");
 		}
-		BasicdataWarehouseEntity basicdataWarehouseVO = basicdataWarehouseClient.getMyCurrentWarehouse();
-		if (Objects.isNull(basicdataWarehouseVO)){
-			throw new RuntimeException("当前登录人没有选择仓库!!!");
-		}
+//		BasicdataWarehouseEntity basicdataWarehouseVO = basicdataWarehouseClient.getMyCurrentWarehouse();
+//		if (Objects.isNull(basicdataWarehouseVO)){
+//			throw new RuntimeException("当前登录人没有选择仓库!!!");
+//		}
 		BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = new BasicdataGoodsShelfEntity();
 		BeanUtils.copyProperties(basicdataGoodsShelfDTO, basicdataGoodsShelfEntity);
 
@@ -162,7 +168,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 		String shelfCode =basicdataGoodsShelfDTO.getGoodsAreaName();
 		basicdataGoodsShelfEntity.setQrCode(shelfCode);
 //		basicdataGoodsShelfEntity.setWarehouseId(1687637854291722242L);
-		basicdataGoodsShelfEntity.setWarehouseId(basicdataWarehouseVO.getId());
+//		basicdataGoodsShelfEntity.setWarehouseId(basicdataWarehouseVO.getId());
 		result = this.save(basicdataGoodsShelfEntity);
 		//这里需要根据货架的列数和层数进行货位信息的生成
 //		Integer rowNum = basicdataGoodsShelfEntity.getRowNum();
@@ -329,9 +335,13 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 		log.info("列>>>>>>>>>>{}",rowNum);
 		Integer storeyNum = basicdataGoodsShelfDTO.getStoreyNum();//行
 		log.info("行>>>>>>>>>>{}",storeyNum);
-		Long ck = 1687637854291722242l;
+		//Long ck = 1687637854291722242l;
 		//获取当前登录人仓库
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if (Objects.isNull(basicdataWarehouseEntity)){
+			return  R.fail("当前登录人没有选择仓库");
+		}
+		Long ck = basicdataWarehouseEntity.getId();
 		//查询租户对应的库位码前缀规则
 	//	String allocationCode = basicTenantCodeClient.shelfCode(user.getTenantId(),"5");
 		//判断新增货位

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java

@@ -71,6 +71,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 托盘 服务实现类
@@ -156,6 +157,12 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 
 	@Override
 	public IPage<BasicdataTrayVO> selectTrayList(IPage<Object> page, Map<String, Object> basicdataTray) {
+		//获取当前登录人仓库
+		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseService.getMyWatchWarehouse();
+		List<Long> collect = myWatchWarehouse.stream()
+			.map(BasicdataWarehouseEntity::getId)
+			.collect(Collectors.toList());
+		basicdataTray.put("warehouseList",collect);
 		IPage<BasicdataTrayVO> trayList= trayMapper.selectTrayList(page,basicdataTray);
 		return trayList;
 	}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataWarehouseExcel;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper;
 import com.logpm.basicdata.mapper.BasicdataWarehouseMapper;
 import com.logpm.basicdata.service.IBasicdataWarehouseService;
@@ -41,7 +42,9 @@ import org.springblade.system.feign.IDeptClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 仓库 服务实现类
@@ -57,6 +60,8 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 
 	private final BasicdataGoodsAreaMapper goodsAreaMapper;
 
+	private final IBasicdataWarehouseClient basicdataWarehouseService;
+
 	private final IDeptClient deptClient;
 
 	private final BladeRedis redis;
@@ -88,8 +93,12 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 
 
 	@Override
-	public List<BasicdataWarehouseVO> getWarehouseList() {
-		List<BasicdataWarehouseVO> basicdataGoodsShelfVOList = warehouseMapper.getWarehouseList();
+	public List<BasicdataWarehouseEntity> getWarehouseList() {
+		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseService.getMyWatchWarehouse();
+		if (myWatchWarehouse.size()>0){
+			return myWatchWarehouse;
+		}
+		List<BasicdataWarehouseEntity> basicdataGoodsShelfVOList = warehouseMapper.getWarehouseList();
 		return basicdataGoodsShelfVOList;
 	}
 
@@ -211,4 +220,25 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 
 		return baseMapper.selectOne(queryWrapper);
 	}
+
+	@Override
+	public List<BasicdataWarehouseEntity> getMyWatchWarehouse() {
+		//获取当前登录人仓库
+		List<BasicdataWarehouseEntity> myWarehouseList = new ArrayList<>();
+		BasicdataWarehouseEntity myCurrentWarehouse = this.getMyCurrentWarehouse();
+		if (Objects.isNull(myCurrentWarehouse)){
+			myWarehouseList = this.getMyWarehouseList();
+		}else {
+			myWarehouseList.add(myCurrentWarehouse);
+		}
+		return myWarehouseList;
+	}
+
+	@Override
+	public R clearWarehouseCache() {
+		BladeUser user = AuthUtil.getUser();
+		String str = user.getTenantId() +"--"+ user.getUserId();
+		Long del = redis.del(redis.keys(str));
+		return  del>0?R.success("成功"):R.fail("失败");
+	}
 }

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

@@ -2056,7 +2056,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	public R loadingStart(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
 		//获取当前用户司机
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
-		String format = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+		String format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date());
 		String loadingId = distrilbutionloadingscanDTO.getLoadingId();
 		Boolean b = false;
 		if (distributionDeliveryListEntity.getKind().equals("1")) {

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.warehouse.mapper;
 
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.warehouse.dto.*;
 import com.logpm.warehouse.entity.*;
 import com.logpm.warehouse.vo.*;
@@ -158,4 +159,6 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper<WarehouseGood
 	 * @return
 	 */
     List<WarehouseCargoSumVO> selectCargoSumId();
+
+	List<BasicdataWarehouseEntity> AllWarehouse();
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml

@@ -264,6 +264,12 @@
         WHERE is_deleted = 0
           and enable_status = '1'
     </select>
+    <select id="AllWarehouse" resultType="com.logpm.basicdata.entity.BasicdataWarehouseEntity">
+        select lww.* from logpm_warehouse_warehouse lww
+        <where>
+            lww.is_deleted = 0
+        </where>
+    </select>
 
 
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java

@@ -19,6 +19,7 @@ package com.logpm.warehouse.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.oldproject.entity.WarehouseEntity;
 import com.logpm.warehouse.dto.*;
 import com.logpm.warehouse.entity.*;
 import com.logpm.warehouse.service.IWarehouseUpdownGoodsService;
@@ -37,6 +38,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 货位 服务实现类
@@ -116,19 +118,27 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 	@Override
 	public List<WarehouseVisCargo> selectVisCargo() {
 		//获取当前登录人仓库
-		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
-		log.info("获取当前登录人仓库>>>>>>>>>>>>>>>>>>>>{}",basicdataWarehouseEntity);
-		List<WarehouseVisCargo> records = baseMapper.topWarehouse(basicdataWarehouseEntity.getId());
-		for (WarehouseVisCargo record : records) {
+		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
+		if (myWatchWarehouse.size()==0){
+			myWatchWarehouse = baseMapper.AllWarehouse();
+		}
+		ArrayList<WarehouseVisCargo> arrayList = new ArrayList<>();
+		for (BasicdataWarehouseEntity basicdataWarehouseEntity : myWatchWarehouse) {
 			//查询仓库下的货区
-			List<WarehouseGoodsAreaVO>  warehouseGoodsAreaEntities =baseMapper.topArea(record.getId());
+			List<WarehouseGoodsAreaVO>  warehouseGoodsAreaEntities =baseMapper.topArea(basicdataWarehouseEntity.getId());
 			for (WarehouseGoodsAreaVO warehouseGoodsAreaVO : warehouseGoodsAreaEntities) {
-			List<WarehouseGoodsShelfEntity> warehouseGoodsShelfEntities = baseMapper.topShelf(warehouseGoodsAreaVO.getId());
+				List<WarehouseGoodsShelfEntity> warehouseGoodsShelfEntities = baseMapper.topShelf(warehouseGoodsAreaVO.getId());
 				warehouseGoodsAreaVO.setWarehouseGoodsShelfEntitieList(warehouseGoodsShelfEntities);
 			}
-			record.setWarehouseGoodsAreaVOList(warehouseGoodsAreaEntities);
+			WarehouseVisCargo warehouseVisCargo = new WarehouseVisCargo();
+			Func.copy(basicdataWarehouseEntity,warehouseVisCargo);
+			warehouseVisCargo.setWarehouseGoodsAreaVOList(warehouseGoodsAreaEntities);
+			arrayList.add(warehouseVisCargo);
 		}
-		return records;
+
+
+
+		return arrayList;
 	}
 
 	@Override