1.修改班组字段

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTeamGroupEntity.java

@@ -70,7 +70,7 @@ public class BasicdataTeamGroupEntity extends TenantEntity {
 	 * 仓库
 	 */
 	@ApiModelProperty(value = "仓库")
-	private String belongTo;
+	private Long warehouseId;
 	/**
 	 * 仓库名称
 	 */

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

@@ -16,6 +16,8 @@
  */
 package com.logpm.basicdata.controller;
 
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.service.IBasicdataWarehouseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -42,6 +44,8 @@ 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 java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -58,6 +62,8 @@ public class BasicdataTeamGroupController extends BladeController {
 
 	private final IBasicdataTeamGroupService basicdataTeamGroupService;
 
+	private final IBasicdataWarehouseService basicdataWarehouseService;
+
 	/**
 	 * 基础班组表 详情
 	 */
@@ -75,7 +81,13 @@ public class BasicdataTeamGroupController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicdataTeamGroup")
 	public R<IPage<BasicdataTeamGroupEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataTeamGroup, Query query) {
-		IPage<BasicdataTeamGroupEntity> pages = basicdataTeamGroupService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataTeamGroup, BasicdataTeamGroupEntity.class));
+		QueryWrapper<BasicdataTeamGroupEntity> queryWrapper = Condition.getQueryWrapper(basicdataTeamGroup, BasicdataTeamGroupEntity.class);
+		//获取当前登录人仓库
+		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseService.getMyWatchWarehouse();
+		//取出id
+		List<Long> collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
+		queryWrapper.lambda().in(collect.size()>0,BasicdataTeamGroupEntity::getWarehouseId,collect);
+		IPage<BasicdataTeamGroupEntity> pages = basicdataTeamGroupService.page(Condition.getPage(query),queryWrapper );
 		return R.data(pages);
 	}
 
@@ -108,6 +120,7 @@ public class BasicdataTeamGroupController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入basicdataTeamGroup")
 	public R save(@Valid @RequestBody BasicdataTeamGroupEntity basicdataTeamGroup) {
+
 		return R.status(basicdataTeamGroupService.save(basicdataTeamGroup));
 	}
 

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

@@ -289,6 +289,17 @@ public class BasicdataWarehouseController extends BladeController {
 		return R.data(obj);
 	}
 
+	/**
+	 *
+	 *根据当前登录用户查询能看到的仓库
+	 */
+	@GetMapping("/clearWarehouseCache")
+	@ApiOperationSupport(order = 3)
+	public R<?> clearWarehouseCache() {
+		R r = warehouseService.clearWarehouseCache();
+		return r;
+	}
+
 
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataTeamGroupExcel.java

@@ -94,7 +94,7 @@ public class BasicdataTeamGroupExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("仓库")
-	private String belongTo;
+	private String warehouseId;
 	/**
 	 * 班组类型
 	 */

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

@@ -19,7 +19,7 @@
         <result column="reserve4" property="reserve4"/>
         <result column="reserve5" property="reserve5"/>
         <result column="group_name" property="groupName"/>
-        <result column="belong_to" property="belongTo"/>
+        <result column="warehouse_id" property="warehouseId"/>
         <result column="group_type" property="groupType"/>
         <result column="department" property="department"/>
     </resultMap>

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

@@ -31,12 +31,14 @@ import com.logpm.basicdata.mapper.BasicdataTeamGroupMapper;
 import com.logpm.basicdata.service.IBasicdataTeamGroupService;
 import lombok.AllArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.api.R;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 基础班组表 服务实现类
@@ -82,13 +84,13 @@ public class BasicdataTeamGroupServiceImpl extends BaseServiceImpl<BasicdataTeam
 	 */
 	@Override
 	public Boolean saveOrUpdateOwn(BasicdataTeamGroupEntity basicdataTeamGroup) {
-		if(ObjectUtils.isNull(basicdataTeamGroup.getBelongTo())){
-			throw new ServiceException("参数异常！！");
-		}
-		BasicdataWarehouseEntity one = basicdataWarehouseService.getOne(Wrappers.<BasicdataWarehouseEntity>query().lambda().eq(BasicdataWarehouseEntity::getId, basicdataTeamGroup.getBelongTo()));
-		if(ObjectUtils.isNull(one)){
-			throw new ServiceException("仓库数据异常！！");
+		//获取当前登录人仓库
+		BasicdataWarehouseEntity one = basicdataWarehouseService.getMyCurrentWarehouse();
+		if (Objects.isNull(one)){
+			throw new ServiceException("无选择仓库,无法新增修改！！");
 		}
+		basicdataTeamGroup.setWarehouseId(one.getId());
+		basicdataTeamGroup.setWarehouseName(one.getName());
 		//查询部门信息
 		if(ObjectUtils.isNotNull(basicdataTeamGroup.getId())){
 			//修改

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

@@ -31,6 +31,7 @@ import com.logpm.basicdata.service.IBasicdataWarehouseService;
 import com.logpm.basicdata.vo.BasicdataWarehouseVO;
 import com.logpm.basicdata.wrapper.BasicdataWarehouseWrapper;
 import lombok.AllArgsConstructor;
+import lombok.extern.log4j.Log4j2;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.secure.BladeUser;
@@ -54,6 +55,7 @@ import java.util.Objects;
  */
 @Service
 @AllArgsConstructor
+@Log4j2
 public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWarehouseMapper, BasicdataWarehouseEntity> implements IBasicdataWarehouseService {
 
 	private final BasicdataWarehouseMapper warehouseMapper;
@@ -239,6 +241,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		BladeUser user = AuthUtil.getUser();
 		String str = user.getTenantId() +"--"+ user.getUserId();
 		Long del = redis.del(redis.keys(str));
+		log.info("key>>>>>>>str>>>>>>{}",str);
 		return  del>0?R.success("成功"):R.fail("失败");
 	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseVisualizationDTO.java

@@ -21,6 +21,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 
 /**
  * 在库订单包件清单 可视化
@@ -48,6 +50,12 @@ public class WarehouseVisualizationDTO extends WarehouseParcelListcopyEntity {
 	@ApiModelProperty(value = "打托方式")
 	private String updownType;
 
+	/**
+	 * 仓库列表
+	 */
+	@ApiModelProperty(value = "仓库列表")
+	private List<Long> warehouseIdList;
+
 
 
 }