分发明细只查本机构及下级

futian.liu

2023-12-09 b0254fc60807423cd748f057ed0393ab0e784fce

 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("该用户不是库管员");
@@ -293,6 +293,11 @@
            paramts.put("goodsTemplateName",
                StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
        }
        // 物品id
        if (param.getGoodsTemplateId() != null) {
            sql.append("AND bgt.id = :goodsTemplateId ");
            paramts.put("goodsTemplateId", param.getGoodsTemplateId());
        }
        // 调拨机构
        if (param.getOutAgencyId() != null) {
            sql.append(" and OUT_AGENCY_ID = :OUT_AGENCY_ID ");
@@ -332,9 +337,9 @@
            paramts.put("inTimeEnd", param.getEndTime() * 1000000 + 240000);
        }
        // 分发部门
        if (param.getInWarehouseId() != null) {
        if (param.getDepartmentId() != null) {
            sql.append("and ft.IN_WAREHOUSE_ID = :inWarehouseId ");
            paramts.put("inWarehouseId", param.getInWarehouseId());
            paramts.put("inWarehouseId", param.getDepartmentId());
        }

        sql.append(" ORDER BY ft.CREATE_TIME DESC");
@@ -551,6 +556,11 @@
            paramts.put("goodsName",
                StringUtils.CHAR_PERCENT + transferQry.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
        }
        // 物品id
        if (transferQry.getGoodsTemplateId() != null) {
            sql.append("AND bgt.id =:goodsTemplateId ");
            paramts.put("goodsTemplateId", transferQry.getGoodsTemplateId());
        }
        // 规格型号
        if (transferQry.getBaseGoodsModelsId() != null) {
            sql.append("AND bgm.id =:goodsModelId ");
@@ -558,13 +568,13 @@
        }
        // 调拨机构
        if (transferQry.getOutAgencyId() != null) {
            sql.append("AND OUT_AGENCY_ID = :OUT_AGENCY_ID ");
            paramts.put("OUT_AGENCY_ID", transferQry.getOutAgencyId());
            sql.append("AND OUT_AGENCY_ID like :OUT_AGENCY_ID ");
            paramts.put("OUT_AGENCY_ID", transferQry.getOutAgencyId() + StringUtils.CHAR_PERCENT);
        }
        // 分发部门
        if (transferQry.getInWarehouseId() != null) {
        if (transferQry.getDepartmentId() != null) {
            sql.append("and ft.IN_WAREHOUSE_ID = :inWarehouseId ");
            paramts.put("inWarehouseId", transferQry.getInWarehouseId());
            paramts.put("inWarehouseId", transferQry.getDepartmentId());
        }
        // 创建人
        if (StringUtils.isNotEmpty(transferQry.getOperatorName())) {
@@ -598,7 +608,7 @@
            + "       ft.OUT_OPERATOR_NAME,\n" + "       ft.OUTPUT_TIME\n" + "FROM l_wh_form_transfer ft\n"
            + "         LEFT JOIN l_wh_procure_model pm ON ft.ID = pm.BUSINESS_ID\n"
            + "         LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID\n"
            + "         LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID where 1=1 ");
            + "         LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID where ft.BUSINESS_TYPE =0 ");
        if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
            sql.append("AND ft.BUSINESS_FORM_CODE = :businessFormCode ");
            params.put("businessFormCode", param.getBusinessFormCode());
@@ -607,6 +617,10 @@
            sql.append("AND bgt.GOODS_NAME like :goodsName ");
            params.put("goodsName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
        }
        if (param.getGoodsTemplateId() != null) {
            sql.append("AND bgt.id = :goodsTemplateId ");
            params.put("goodsTemplateId", param.getGoodsTemplateId());
        }
        if (param.getBaseGoodsModelsId() != null) {
            sql.append("AND bgm.id = :goodsModelId ");
            params.put("goodsModelId", param.getBaseGoodsModelsId());