consum-base/src/main/java/com/consum/base/cache/RedisFinSysTenantUserCache.java
@@ -29,6 +29,10 @@ logger.warn("从数据库未查询到用户，无法缓存，userId = {}", userId); return null; } // TODO 超级管理员 if (finSysTenantUser.getId() == 0) { finSysTenantUser.setTenantId("0"); } this.putCacheData(userId, finSysTenantUser); } return finSysTenantUser; consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; @@ -255,7 +256,7 @@ return ResponseValue.success("查询成功!", list); } @ApiOperation(value = "查询机构下默认仓库下的分类模板信息", notes = "查询机构下默认仓库下的分类模板信息") @ApiOperation(value = "调拨查询机构下所有仓库下的分类模板信息", notes = "调拨查询机构下所有仓库下的分类模板信息") @ApiImplicitParams({ @ApiImplicitParam(name = "agencyId", value = "父级机构id", required = true, dataType = "java.lang.Long", paramType = "query"), @@ -264,22 +265,22 @@ @GetMapping("/query/warehouse/goods") public ResponseValue queryWarehouseGoods(Long agencyId, Long categoryId) { // TODO 调拨查询仓库物品 // 调拨查询所有仓库物品模板信息 Map<String, Object> map = new HashMap<>(); map.put("categoryId", categoryId); List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(agencyId, (short)1, (short)1); List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, null, (short)1); if (CollectionUtils.isEmpty(baseWarehouseList)) { return ResponseValue.error("机构无默认仓库！"); return ResponseValue.error("机构无仓库！"); } map.put("warehouseId", baseWarehouseList.get(0).getId()); List<Long> warehouseIdList = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList()); map.put("warehouseIdList", warehouseIdList); String sql = "SELECT DISTINCT bgt.id,bgt.GOODS_NAME, CLASSIFICATION type FROM l_wh_goods g LEFT JOIN base_goods_template bgt ON g.BASE_GOODS_TEMPLATE_ID = bgt.id " + "WHERE WAREHOUSE_TYPE = 0 " + "AND WAREHOUSE_ID = :warehouseId " // TODO 临时解决 /*+ "AND CATEGORY_ID = :categoryId "*/ + "WHERE WAREHOUSE_TYPE = 0 " + "AND WAREHOUSE_ID in (:warehouseIdList) " + "AND CATEGORY_ID = :categoryId " // 1:集采,2:自采 + "AND BUY_TYPE =1";
@@ -1,8 +1,8 @@ package com.consum.base.controller; import io.swagger.annotations.Api; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -23,6 +23,7 @@ import com.walker.infrastructure.utils.StringUtils; 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; @@ -59,7 +60,7 @@ } // TODO 加权限 省级管理员录入所有仓库信息 int result = this.baseWarehouseService.add(param); int result = baseWarehouseService.add(param); if (result > 0) { return ResponseValue.success(1); } @@ -83,7 +84,7 @@ return ResponseValue.error("登录用户信息不存在"); } param.setAgencyId(Long.valueOf(currentUser.getTenantId())); GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param, currentUser); GenericPager<BaseWarehouse> pager = baseWarehouseService.queryList(param, currentUser); return ResponseValue.success(pager); } @@ -107,7 +108,7 @@ return ResponseValue.error("仓库名称为空"); } int num = this.baseWarehouseService.updateBaseWarehouse(baseWarehouse); int num = baseWarehouseService.updateBaseWarehouse(baseWarehouse); return num > 0 ? ResponseValue.success(1) : ResponseValue.error("编辑失败！"); } @@ -122,7 +123,7 @@ if (id == null) { return ResponseValue.error("仓库id为空"); } BaseWarehouse baseWarehouse = this.baseWarehouseService.getById(id); BaseWarehouse baseWarehouse = baseWarehouseService.getById(id); if (baseWarehouse == null) { return ResponseValue.error("查询失败！"); } @@ -144,23 +145,9 @@ if (baseWarehouse.getId() == null) { return ResponseValue.error("仓库id为空"); } int num = this.baseWarehouseService.updateById(baseWarehouse); int num = baseWarehouseService.updateById(baseWarehouse); return num > 0 ? ResponseValue.success(1) : ResponseValue.error("删除失败！"); } /** * @Description 根据仓库id获取机构用户信息 * @Author 卢庆阳 * @Date 2023/10/26 */ @GetMapping("/select/userList") public ResponseValue queryList(Long baseWarehouseId) { if (baseWarehouseId == null) { return ResponseValue.error("仓库id为空"); } this.baseWarehouseService.queryUserList(baseWarehouseId); return ResponseValue.success(); } /** @@ -173,7 +160,7 @@ if (agencyId == null) { return ResponseValue.success(new ArrayList<>()); } List<BaseWarehouse> list = this.baseWarehouseService.getByAgencyId(agencyId, null, null); List<BaseWarehouse> list = baseWarehouseService.getBaseWareHouseList(agencyId, null, null); if (list == null) { return ResponseValue.error("查询失败！"); } @@ -193,8 +180,7 @@ Long warehouseId = warehouseQry.getWarehouseId(); if (warehouseId == null) { Long agencyId = warehouseQry.getAgencyId(); BaseWarehouse defaultWarehouseByAgencyId = this.baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId); BaseWarehouse defaultWarehouseByAgencyId = baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId); warehouseId = defaultWarehouseByAgencyId.getId(); } Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId(); @@ -202,7 +188,31 @@ Integer states = warehouseQry.getStates(); Integer buyType = warehouseQry.getBuyType(); int num = this.lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModelsId, 1, buyType); int num = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModelsId, 1, buyType); return ResponseValue.success(num); } @ApiOperation(value = "根据仓库id和型号id 查询库存", notes = "根据仓库id和型号id 查询库存") @ApiImplicitParams({@ApiImplicitParam(name = "warehouseQry", value = "仓库id和型号id", required = true, dataType = "WarehouseQry", paramType = "query")}) @GetMapping("/select/in/warehouse/num") public ResponseValue selectAllNumber() { WarehouseQry warehouseQry = CommonUtil.getObjFromReq(WarehouseQry.class); WarehouseQry param2 = new WarehouseQry(); CommonUtil.copyProperties(warehouseQry, param2); warehouseQry = param2; Long agencyId = warehouseQry.getAgencyId(); List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, null, (short)1); List<Long> warehouseIdList = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList()); Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId(); Integer warehouseType = warehouseQry.getWarehouseType(); Integer states = warehouseQry.getStates(); Integer buyType = warehouseQry.getBuyType(); int num = lWhGoodsService.queryGoodsModelInWareHouseNum(warehouseType, warehouseIdList, baseGoodsModelsId, states, buyType); return ResponseValue.success(num); }
@@ -9,6 +9,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.TreeMap; import org.springframework.beans.factory.annotation.Autowired; @@ -81,36 +82,33 @@ private long defaultParentId = 0L; /** * @Description 获取区划树 * @Description 获取机构树 * @Author wh * @Date 2023/7/11 11:15 */ @GetMapping("/select/tree_fin_tenant") public ResponseValue listOrgRootTree() { List<FinSysTenant> finSysTenantList = null; FinSysTenantUser finSysTenantUser = new FinSysTenantUser(); finSysTenantUser.setSysUserId(this.getCurrentUser().getId()); List<FinSysTenantUser> finSysTenantUserList = finSysTenantUserService.select(finSysTenantUser); FinSysTenantUser user = null; // 系统用户 FinSysTenant finSysTenant1 = null; List<TreeNode> treeRootList = null; // 数列表 FinSysTenant finSysTenant = new FinSysTenant(); // 获取地区父级 finSysTenantList = this.finSysTenantService.queryForTree(); // 根据登陆人id获取系统用户，如果有系统用户时 if (finSysTenantUserList.size() > 0) { // 获取当前用户信息 user = finSysTenantUserList.get(0); String tenantId = user.getTenantId(); finSysTenant.setId(new Long(tenantId)); // 查询区域 List<FinSysTenant> select = finSysTenantService.select(finSysTenant); if (select.size() > 0) { finSysTenant1 = select.get(0); } // 系统用户 FinSysTenantUser user = this.getSysInfo(); if (Objects.isNull(user)) { return ResponseValue.error("登录用户信息不存在"); } if (finSysTenant1 != null) { if (finSysTenant1.getLv() != 1 && finSysTenant1.getParentId() != 0 && user != null) { // 获取所有机构 List<FinSysTenant> finSysTenantList = this.finSysTenantService.queryForTree(); // 根据登陆人id获取系统用户，如果有系统用户时 // 获取当前用户信息 String tenantId = user.getTenantId(); FinSysTenant finSysTenant = new FinSysTenant(); finSysTenant.setId(new Long(tenantId)); // 主键是TempId finSysTenant.setTempId(new Long(tenantId)); // 查询当前用户的机构 FinSysTenant userTenant = finSysTenantService.get(finSysTenant); // 树列表 List<TreeNode> treeRootList; if (userTenant != null) { if (userTenant.getLv() != 1 && userTenant.getParentId() != 0) { rootMap.clear(); this.childMap.clear(); this.defaultParentId = new Long(user.getTenantId()); consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -219,7 +219,7 @@ // 加密手机号 String key = PlatformRSAUtils.AES_KEY; String encPhone = ""; if (tenantUser.getUserPhone() != null) { if (StringUtils.isNotEmpty(userPhone)) { encPhone = AESUtils.encryptStrAES(userPhone, key); } tenantUser.setUserPhone(encPhone); @@ -715,12 +715,12 @@ return ResponseValue.error("用户信息不存在"); } String avatar = userParam.getAvatar(); if (!picFormatArr.contains(avatar.substring(avatar.lastIndexOf(".")))) { if (StringUtils.isNotEmpty(avatar) && !picFormatArr.contains(avatar.substring(avatar.lastIndexOf(".")))) { return ResponseValue.error("头像格式不允许"); } FinSysTenantUser updUser = new FinSysTenantUser(); updUser.setId(sysInfo.getId()); updUser.setAvatar(userParam.getAvatar()); updUser.setAvatar(avatar); updUser.setEmail(userParam.getEmail()); updUser.setUserName(userParam.getUserName()); updUser.setSex(userParam.getSex()); consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -118,7 +118,7 @@ FinSysTenantUser sysTenantUser = this.getSysInfo(); String agencyId = sysTenantUser.getTenantId(); List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short)1, (short)1); baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1); if (CollectionUtils.isEmpty(baseWarehouseList)) { return ResponseValue.error("机构无默认仓库！"); } @@ -268,7 +268,7 @@ FinSysTenantUser sysTenantUser = this.getSysInfo(); String agencyId = sysTenantUser.getTenantId(); List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short)1, (short)1); baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1); if (CollectionUtils.isEmpty(baseWarehouseList)) { return ResponseValue.error("机构无默认仓库！"); } consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
@@ -5,7 +5,7 @@ import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import cn.hutool.core.convert.Convert; import com.consum.base.BaseController; import com.consum.base.config.WhWarningImportVerifyHandler; import com.consum.base.handler.WhWarningImportVerifyHandler; import com.consum.base.core.utils.CommonUtil; import com.consum.base.core.utils.IdUtil; import com.consum.base.pojo.WarnConfImEntity; consum-base/src/main/java/com/consum/base/handler/WhWarningImportVerifyHandler.java
File was renamed from consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java @@ -1,4 +1,4 @@ package com.consum.base.config; package com.consum.base.handler; import java.util.HashMap; import java.util.List; consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java
@@ -1,11 +1,12 @@ package com.consum.base.service; import java.util.List; import com.consum.base.pojo.BaseWarehouseParam; import com.consum.model.po.BaseWarehouse; import com.consum.model.po.FinSysTenantUser; import com.walker.db.page.GenericPager; import com.walker.jdbc.service.BaseService; import java.util.List; public interface BaseWarehouseService extends BaseService { @@ -41,20 +42,12 @@ int updateById(BaseWarehouse baseWarehouse); /** * @Description 根据仓库id获取机构用户信息 * @Author 卢庆阳 * @Date 2023/10/26 */ void queryUserList(Long baseWarehouseId); /** * @return * @Description 根据机构id查询机构仓库 * @Author 卢庆阳 * @Date 2023/10/27 */ List<BaseWarehouse> getByAgencyId(Long agencyId, Short isDefault, Short states); List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short isDefault, Short states); /** * 根据机构id查询默认仓库 consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
@@ -16,6 +16,9 @@ int queryGoodsModelNum(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Integer states, Integer buyType); int queryGoodsModelInWareHouseNum(Integer warehouseType, List<Long> warehouseId, Long baseGoodsModelsId, Integer states, Integer buyType); List<Map<String, Object>> queryOutGoods(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Integer states, Integer buyType, Integer goodsModelNum);
@@ -3,9 +3,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -16,12 +13,10 @@ import com.consum.base.core.utils.IdUtil; import com.consum.base.pojo.BaseWarehouseParam; import com.consum.base.service.BaseWarehouseService; import com.consum.base.service.FinSysTenantDepartmentService; import com.consum.base.service.FinSysTenantService; import com.consum.base.service.SDictDataServiceImpl; import com.consum.model.po.BaseWarehouse; import com.consum.model.po.FinSysTenant; import com.consum.model.po.FinSysTenantDepartment; import com.consum.model.po.FinSysTenantUser; import com.consum.model.po.SDictData; import com.walker.db.page.GenericPager; @@ -41,8 +36,6 @@ private CodeGeneratorService codeGeneratorService; @Autowired private FinSysTenantService finSysTenantService; @Autowired private FinSysTenantDepartmentService departmentService; @Autowired private SDictDataServiceImpl sDictDataService; @@ -163,36 +156,13 @@ } /** * @Description 根据仓库id获取机构用户信息 * @Author 卢庆阳 * @Date 2023/10/26 */ @Override public void queryUserList(Long baseWarehouseId) { // 1.根据仓库id查询仓库 BaseWarehouse baseWarehouse = this.getById(baseWarehouseId); if (baseWarehouse != null) { Long agencyId = baseWarehouse.getAgencyId(); String agencyName = baseWarehouse.getAgencyName(); // 2.根据机构id查询部门 List<FinSysTenantDepartment> list = this.departmentService.getByTenantId(agencyId); // 获取部门id Set<Long> deptIds = list.stream().map(dept -> dept.getId()).collect(Collectors.toSet()); // 3.根据部门id查询用户 // this.userService.getByDeptIds(); } } /** * @return * @Description 根据机构id查询机构仓库 * @Author 卢庆阳 * @Date 2023/10/27 */ @Override public List<BaseWarehouse> getByAgencyId(Long agencyId, Short isDefault, Short states) { public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short isDefault, Short states) { StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 "); HashMap<String, Object> paramts = new HashMap<>(); @@ -227,11 +197,8 @@ Map<String, Object> param = new HashMap<>(); param.put("agencyId", agencyId); List<BaseWarehouse> select = select(sql.toString(), param, new BaseWarehouse()); Optional<BaseWarehouse> optional = select.stream().findFirst(); if (optional.isPresent()) { return optional.get(); } return null; BaseWarehouse baseWarehouse = select.stream().findFirst().orElse(null); return baseWarehouse; } @Override consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
@@ -66,6 +66,35 @@ return queryForInt(sql.toString(), paramts); } @Override public int queryGoodsModelInWareHouseNum(Integer warehouseType, List<Long> warehouseId, Long baseGoodsModelsId, Integer states, Integer buyType) { StringBuilder sql = new StringBuilder(query_Goods_Model_Num); Map<String, Object> paramts = new HashMap<>(); if (warehouseType != null) { sql.append(" and WAREHOUSE_TYPE=:warehouseType"); paramts.put("warehouseType", warehouseType); } if (warehouseId != null) { sql.append(" and WAREHOUSE_ID in (:warehouseId)"); paramts.put("warehouseId", warehouseId); } if (baseGoodsModelsId != null) { sql.append(" and BASE_GOODS_MODELS_ID=:baseGoodsModelsId"); paramts.put("baseGoodsModelsId", baseGoodsModelsId); } if (states != null) { sql.append(" and STATES=:states"); paramts.put("states", states); } if (buyType != null) { sql.append(" and BUY_TYPE=:buyType"); paramts.put("buyType", buyType); } return queryForInt(sql.toString(), paramts); } /** * 出库时候，先入库的先出库，同时入库的，按价格高的先出库 *
