去除默认机构默认仓库逻辑

futian.liu

2023-12-20 350125984c618f95d09fb08978953ad24f5d3b6c

去除默认机构默认仓库逻辑

 consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java

@@ -197,8 +197,8 @@
        Long warehouseId = warehouseQry.getWarehouseId();
        if (warehouseId == null) {
            Long agencyId = warehouseQry.getAgencyId();
            BaseWarehouse defaultWarehouseByAgencyId = baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId);
            warehouseId = defaultWarehouseByAgencyId.getId();
            BaseWarehouse baseWarehouse = baseWarehouseService.getWarehouseByAgencyId(agencyId, null);
            warehouseId = baseWarehouse.getId();
        }
        Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
        Integer warehouseType = warehouseQry.getWarehouseType();

 consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java

@@ -49,13 +49,5 @@
     */
    List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Integer states);

    /**
     * 根据机构id查询默认仓库
     *
     * @param agencyId
     * @return
     */
    BaseWarehouse getDefaultWarehouseByAgencyId(Long agencyId);

    BaseWarehouse getWarehouseByAgencyId(Long agencyId, String warehouseName);
}

 consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java

@@ -179,23 +179,6 @@
        return select(sql.toString(), paramts, new BaseWarehouse());
    }

    /**
     * 根据机构id查询默认仓库
     *
     * @param agencyId
     * @return
     */
    @Override
    public BaseWarehouse getDefaultWarehouseByAgencyId(Long 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());
        BaseWarehouse baseWarehouse = select.stream().findFirst().orElse(null);
        return baseWarehouse;
    }

    @Override
    public BaseWarehouse getWarehouseByAgencyId(Long agencyId, String warehouseName) {
        StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE STATES= 1");

 consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java

@@ -119,7 +119,7 @@
            // 入库仓库为当前用户的默认仓库中的第一个
            String tenantId = sysInfo.getTenantId();
            String tenantName = sysInfo.getTenantName();
            BaseWarehouse warehouse = baseWarehouseService.getDefaultWarehouseByAgencyId(Long.valueOf(tenantId));
            BaseWarehouse warehouse = baseWarehouseService.getWarehouseByAgencyId(Long.valueOf(tenantId), null);
            if (warehouse == null) {
                log.error("仓库不存在");
                throw new Exception("仓库不存在");