consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -40,7 +40,6 @@ @Autowired private LWhGoodsService lWhGoodsService; /** * @Description 新增 * @Author 卢庆阳 @@ -77,12 +76,12 @@ CommonUtil.copyProperties(param, param2); param = param2; FinSysTenantUser sysInfo = this.getSysInfo(); if (sysInfo == null) { FinSysTenantUser currentUser = this.getSysInfo(); if (currentUser == null) { return ResponseValue.error("登录用户信息不存在"); } param.setAgencyId(Long.valueOf(sysInfo.getTenantId())); GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param); param.setAgencyId(Long.valueOf(currentUser.getTenantId())); GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param, currentUser); return ResponseValue.success(pager); } @@ -180,9 +179,8 @@ } @ApiOperation(value = "根据仓库id和型号id 查询库存", notes = "根据仓库id和型号id 查询库存") @ApiImplicitParams({ @ApiImplicitParam(name = "warehouseQry", value = "仓库id和型号id", required = true, dataType = "WarehouseQry", paramType = "query") }) @ApiImplicitParams({@ApiImplicitParam(name = "warehouseQry", value = "仓库id和型号id", required = true, dataType = "WarehouseQry", paramType = "query")}) @GetMapping("/select/number") public ResponseValue selectNumber() { WarehouseQry warehouseQry = CommonUtil.getObjFromReq(WarehouseQry.class); @@ -193,7 +191,8 @@ Long warehouseId = warehouseQry.getWarehouseId(); if (warehouseId == null) { Long agencyId = warehouseQry.getAgencyId(); BaseWarehouse defaultWarehouseByAgencyId = this.baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId); BaseWarehouse defaultWarehouseByAgencyId = this.baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId); warehouseId = defaultWarehouseByAgencyId.getId(); } Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId(); @@ -205,6 +204,4 @@ return ResponseValue.success(num); } } consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -203,10 +203,11 @@ @GetMapping("/detail/list") public ResponseValue queryFormOutputDetailList() { LWhFormOutputQry formOutputQry = CommonUtil.getObjFromReq(LWhFormOutputQry.class); S_user_core currentUser = this.getCurrentUser(); FinSysTenantUser currentUser = this.getSysInfo(); if (currentUser == null) { return ResponseValue.error("登录用户信息不存在"); } formOutputQry.setAgencyId(Long.valueOf(currentUser.getTenantId())); PageUtil genericPager = lWarehouseFlowService.queryAllBusinessFlow(formOutputQry); return ResponseValue.success(genericPager); } consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java
@@ -2,6 +2,7 @@ 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; @@ -15,7 +16,7 @@ * @Author 卢庆阳 * @Date 2023/10/26 */ GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param); GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param, FinSysTenantUser currentUser); /** * @Description 编辑(修改状态) consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
@@ -1,5 +1,16 @@ package com.consum.base.service.impl; 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; import org.springframework.stereotype.Service; import com.consum.base.Constants; import com.consum.base.core.CodeGeneratorService; import com.consum.base.core.utils.IdUtil; @@ -11,20 +22,12 @@ 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; import com.walker.infrastructure.utils.CollectionUtils; import com.walker.infrastructure.utils.StringUtils; import com.walker.jdbc.service.BaseServiceImpl; 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; import org.springframework.stereotype.Service; /** * @Description 仓库管理 @@ -77,14 +80,15 @@ * @Date 2023/10/26 */ @Override public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param) { public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param, FinSysTenantUser currentUser) { StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 "); HashMap<String, Object> paramts = new HashMap<>(); //仓库名称 if (!StringUtils.isEmpty(param.getWarehouseName())) { sql.append(" and WAREHOUSE_NAME like:WAREHOUSE_NAME "); paramts.put("WAREHOUSE_NAME", StringUtils.CHAR_PERCENT + param.getWarehouseName() + StringUtils.CHAR_PERCENT); paramts.put("WAREHOUSE_NAME", StringUtils.CHAR_PERCENT + param.getWarehouseName() + StringUtils.CHAR_PERCENT); } //类型 if (!StringUtils.isEmpty(param.getClassificationCode())) { @@ -92,9 +96,16 @@ paramts.put("CLASSIFICATION_CODE", param.getClassificationCode()); } //机构id // 因为仓库是省公司统一维护的,省可以看到全部,地市和县区看自己的 if (param.getAgencyId() != null) { Integer lv = currentUser.getLv(); if (lv != 1) { sql.append(" and AGENCY_ID =:AGENCY_ID "); paramts.put("AGENCY_ID", param.getAgencyId()); } else { sql.append(" and AGENCY_ID like :AGENCY_ID "); paramts.put("AGENCY_ID", param.getAgencyId() + StringUtils.CHAR_PERCENT); } } //状态 if (param.getStates() != null) { @@ -115,7 +126,8 @@ */ @Override public int updateBaseWarehouse(BaseWarehouse baseWarehouse) { SDictData SDictData = this.sDictDataService.get(new SDictData(Long.valueOf(baseWarehouse.getClassificationCode()))); SDictData SDictData = this.sDictDataService.get(new SDictData(Long.valueOf(baseWarehouse.getClassificationCode()))); if (SDictData != null) { baseWarehouse.setClassificationName(SDictData.getDict_label()); } @@ -171,7 +183,6 @@ } } /** @@ -203,7 +214,6 @@ return select(sql.toString(), paramts, new BaseWarehouse()); } /** * 根据机构id查询默认仓库 * @@ -212,7 +222,8 @@ */ @Override public BaseWarehouse getDefaultWarehouseByAgencyId(Long agencyId) { StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE IS_DEFAULT = 1 and AGENCY_ID =:agencyId "); StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE IS_DEFAULT = 1 and AGENCY_ID =:agencyId "); Map<String, Object> param = new HashMap<>(); param.put("agencyId", agencyId); List<BaseWarehouse> select = select(sql.toString(), param, new BaseWarehouse());