consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -269,7 +269,8 @@ Map<String, Object> map = new HashMap<>(); map.put("categoryId", categoryId); List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, (short)1); List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, StatesType.NORMAL.getValue()); if (CollectionUtils.isEmpty(baseWarehouseList)) { return ResponseValue.error("机构无仓库！");
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import com.consum.base.BaseController; import com.consum.base.core.type.StatesType; import com.consum.base.core.utils.CommonUtil; import com.consum.base.pojo.BaseWarehouseParam; import com.consum.base.pojo.query.WarehouseQry; @@ -220,7 +221,8 @@ warehouseQry = param2; Long agencyId = warehouseQry.getAgencyId(); List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, (short)1); List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, StatesType.NORMAL.getValue()); List<Long> warehouseIdList = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList()); Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId(); consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -24,6 +24,7 @@ import com.consum.base.BaseController; import com.consum.base.core.WhBusinessEnum; import com.consum.base.core.type.StatesType; import com.consum.base.core.utils.CommonUtil; import com.consum.base.core.utils.IdUtil; import com.consum.base.pojo.GoodsUseRecordVO; @@ -131,7 +132,7 @@ FinSysTenantUser sysTenantUser = this.getSysInfo(); String agencyId = sysTenantUser.getTenantId(); List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1); baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue()); Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet()); // 通过调拨单中的型号id查询出该型号物品所在的仓库位置 List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds); @@ -298,7 +299,7 @@ FinSysTenantUser sysTenantUser = this.getSysInfo(); String agencyId = sysTenantUser.getTenantId(); List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1); baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue()); Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet()); // 通过调拨单中的型号id查询出该型号物品所在的仓库位置 consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java
@@ -47,7 +47,7 @@ * @Author 卢庆阳 * @Date 2023/10/27 */ List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short states); List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Integer states); /** * 根据机构id查询默认仓库 consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
@@ -162,7 +162,7 @@ * @Date 2023/10/27 */ @Override public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short states) { public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Integer states) { StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 "); HashMap<String, Object> paramts = new HashMap<>();
@@ -19,6 +19,7 @@ import com.consum.base.core.CodeGeneratorEnum; import com.consum.base.core.CodeGeneratorService; import com.consum.base.core.type.CategoryType; import com.consum.base.core.type.StatesType; import com.consum.base.core.type.TransferBusinessType; import com.consum.base.core.type.WareHouseType; import com.consum.base.core.utils.CurrencyUtil; @@ -217,7 +218,7 @@ // 根据物品型号查询物品库存 // 调拨申请时没有仓库id 查询上级机构的所有仓库 List<BaseWarehouse> baseWareHouseList = baseWarehouseService.getBaseWareHouseList(outAgencyId, (short)1); baseWarehouseService.getBaseWareHouseList(outAgencyId, StatesType.NORMAL.getValue()); List<Long> warehouseIdList = baseWareHouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList()); int goodsNum = lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), warehouseIdList,
