consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java
@@ -1,5 +1,14 @@ package com.consum.base.controller; import java.util.List; import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.consum.base.BaseController; import com.consum.base.core.utils.CommonUtil; import com.consum.base.pojo.request.WarehouseManagerParam; @@ -7,22 +16,17 @@ import com.consum.model.po.BaseWarehouseManager; import com.consum.model.po.FinSysTenantUser; import com.walker.web.ResponseValue; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * @Description 库管员 * @Author 卢庆阳 * @Date 2023/10/26 * <p> * <p> */ @Api(value = "库管员", tags = "库管员") @RestController @@ -38,7 +42,8 @@ * @Date 2023/10/26 */ @ApiOperation(value = "新增", notes = "新增") @ApiImplicitParam(name = "warehouseManagerParam", value = "库管员信息", required = true, dataType = "WarehouseManagerParam", paramType = "body") @ApiImplicitParam(name = "warehouseManagerParam", value = "库管员信息", required = true, dataType = "WarehouseManagerParam", paramType = "body") @PostMapping("/save") public ResponseValue add() throws Exception { WarehouseManagerParam param = CommonUtil.getObjFromReqBody(WarehouseManagerParam.class); @@ -50,7 +55,11 @@ if (sysInfo == null) { return ResponseValue.error("请先登录"); } baseWarehouseManagerService.add(param); Set<Long> userIds = baseWarehouseManagerService.add(param); for (Long userId : userIds) { this.getFinSysTenantUserCache().remove(String.valueOf(userId)); this.getUserCacheProvider().removeUser(userId); } return ResponseValue.success(); } @@ -58,20 +67,19 @@ @ApiImplicitParam(name = "warehouseId", value = "仓库id", required = true, dataType = "Long") @GetMapping("/list") public ResponseValue select(Long warehouseId) { List<BaseWarehouseManager> baseWarehouseManagerList = baseWarehouseManagerService.selectWarehouseManager(warehouseId); List<BaseWarehouseManager> baseWarehouseManagerList = baseWarehouseManagerService.selectWarehouseManager(warehouseId); return ResponseValue.success(baseWarehouseManagerList); } @ApiOperation(value = "根据仓库,机构id查询库管员", notes = "根据仓库,机构id查询库管员") @ApiImplicitParams({ @ApiImplicitParam(name = "warehouseId", value = "仓库id", required = true, dataType = "Long"), @ApiImplicitParam(name = "agencyId", value = "机构id", required = true, dataType = "Long") }) @ApiImplicitParams({@ApiImplicitParam(name = "warehouseId", value = "仓库id", required = true, dataType = "Long"), @ApiImplicitParam(name = "agencyId", value = "机构id", required = true, dataType = "Long")}) @GetMapping("/query") public ResponseValue selectManagerList(Long warehouseId, Long agencyId) { List<BaseWarehouseManager> baseWarehouseManagerList = baseWarehouseManagerService.selectManagerList(warehouseId, agencyId); List<BaseWarehouseManager> baseWarehouseManagerList = baseWarehouseManagerService.selectManagerList(warehouseId, agencyId); return ResponseValue.success(baseWarehouseManagerList); } }
@@ -14,7 +14,7 @@ private final static Map<String, String> map = new HashMap<>(); static { // 单据类型 1 采购2 调拨 3出库4部门分发 // 单据类型 1采购2调拨3出库4部门分发5报废 // 1=调增；2=调减 //1采购入库 map.put("1" + "1", "1"); consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerService.java
@@ -4,10 +4,11 @@ import com.consum.model.po.BaseWarehouseManager; import com.walker.jdbc.service.BaseService; import java.util.List; import java.util.Set; public interface BaseWarehouseManagerService extends BaseService { void add(WarehouseManagerParam list) throws Exception; Set<Long> add(WarehouseManagerParam list) throws Exception; List<BaseWarehouseManager> selectWarehouseManager(Long warehouseId);
@@ -72,7 +72,6 @@ BeanUtils.copyProperties(param, baseGoodsTemplate); long goodsTemplatesId = IdUtil.generateId(); baseGoodsTemplate.setId(goodsTemplatesId); //NumberGenerator.getLongSequenceNumber() //根据分类id查询分类 BaseCategory baseCategory = this.baseCategoryService.get(new BaseCategory(param.getCategoryId())); if (baseCategory != null) { consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
@@ -1,5 +1,15 @@ package com.consum.base.service.impl; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; import org.apache.commons.compress.utils.Sets; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.consum.base.core.utils.IdUtil; import com.consum.base.pojo.WarehouseManagerInfo; import com.consum.base.pojo.request.WarehouseManagerParam; @@ -10,13 +20,6 @@ import com.iplatform.model.po.S_role; import com.walker.infrastructure.utils.CollectionUtils; import com.walker.jdbc.service.BaseServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; import java.util.Map; /** * @Description 物品分类 @@ -29,23 +32,24 @@ @Autowired private FinSysTenantUserServiceImpl finSysTenantUserService; /** * @return * @Description 新增 * @Author 卢庆阳 * @Date 2023/10/26 */ @Override @Transactional(rollbackFor = Exception.class) public void add(WarehouseManagerParam list) throws Exception { public Set<Long> add(WarehouseManagerParam list) throws Exception { Set<Long> sysUserIds = Sets.newHashSet(); Long warehouseId = list.getWarehouseId(); // 角色id Long roleId = null; List<S_role> roleAll = finSysTenantUserService.getRoleAll(); if (!CollectionUtils.isEmpty(roleAll)) { S_role sRole = roleAll.stream().filter(item -> item.getRole_name().equals("仓库管理员")).findFirst().orElse(null); S_role sRole = roleAll.stream().filter(item -> item.getRole_name().equals("仓库管理员")).findFirst().orElse(null); if (sRole != null) { roleId = sRole.getRole_id(); } @@ -66,14 +70,16 @@ params.put("managerId", finSysTenantUser.getSysUserId()); params.put("roleId", roleId); this.execute(deleteRoleSql, params); sysUserIds.add(finSysTenantUser.getSysUserId()); } //删除库管记录 // 删除库管记录 String sql = "delete from base_warehouse_manager where base_warehouse_id =:warehouseId"; Map<String, Object> params = new HashMap<>(); params.put("warehouseId", warehouseId); this.execute(sql, params); //重新保存 // 重新保存 List<WarehouseManagerInfo> warehouseManagerInfoList = list.getWarehouseManagerInfoList(); if (!CollectionUtils.isEmpty(warehouseManagerInfoList)) { for (WarehouseManagerInfo warehouseManagerInfo : warehouseManagerInfoList) { @@ -92,7 +98,8 @@ } Long sysUserId = finSysTenantUser.getSysUserId(); // 先判断是否拥有该角色 String isHasRole = "select count(1) from s_role_user where org_id=0 and role_id=" + roleId + " and user_id=" + sysUserId; String isHasRole = "select * from s_role_user where org_id=0 and role_id=" + roleId + " and user_id=" + sysUserId; List<Map<String, Object>> isHasRoleList = this.select(isHasRole, new HashMap<>()); if (!CollectionUtils.isEmpty(isHasRoleList)) { continue; @@ -103,9 +110,10 @@ userRoleParam.put("roleId", roleId); this.execute(saveUserRole, userRoleParam); sysUserIds.add(finSysTenantUser.getSysUserId()); } } return sysUserIds; } @Override @@ -118,7 +126,8 @@ @Override public List<BaseWarehouseManager> selectManagerList(Long warehouseId, Long agencyId) { StringBuilder sql = new StringBuilder("select * from base_warehouse_manager bwm left join base_warehouse bw on bwm.base_warehouse_id = bw.id " StringBuilder sql = new StringBuilder( "select * from base_warehouse_manager bwm left join base_warehouse bw on bwm.base_warehouse_id = bw.id " + "where 1=1 "); Map<String, Object> param = new HashMap<>(); if (warehouseId != null) { @@ -132,6 +141,5 @@ List<BaseWarehouseManager> select = this.select(sql.toString(), param, new BaseWarehouseManager()); return select; } } consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -132,9 +132,9 @@ // 从当前登录库管人从库中出库，入到所选部门的下 // 查询库管员信息和相关仓库 Long id = sysInfo.getId(); Long sysUserId = sysInfo.getSysUserId(); BaseWarehouseManager manager = new BaseWarehouseManager(); manager.setManagerId(id); manager.setManagerId(sysUserId); List<BaseWarehouseManager> managerList = baseWarehouseManagerService.select(manager); if (CollectionUtils.isEmpty(managerList)) { log.error("该用户不是库管员");
