cy
2023-12-09 a4d0977f01a4b290f4982918382fffb4f5fbcb14
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("该用户不是库管员");
@@ -187,14 +187,14 @@
        List<LWhProcureModel> modelList = new ArrayList<>();
        // 判断添加一次使用人记录
        List<LWhFormTransferGoodsInfoParam> type = transferGoods.stream()
        List<LWhFormTransferGoodsInfoParam> recordType = transferGoods.stream()
            .filter(
                item -> businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue() && item.getModels().stream()
                    .anyMatch(model -> baseGoodsModelsService.queryGoodsModelInfo(model.getBaseGoodsModelsId()).stream()
                        .findFirst().orElse(null).get("type").equals(CategoryType.TYPE_A.getValue())))
            .collect(Collectors.toList());
        LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
        if (CollectionUtils.isEmpty(type)) {
        if (!CollectionUtils.isEmpty(recordType)) {
            lWhProcureModelUserRecord.setId(IdUtil.generateId());
            lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId);
            lWhProcureModelUserRecord.setOperatorId(sysInfo.getId());
@@ -598,7 +598,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());