故障报修添加工具类型

zhuguifei

2025-02-24 8a545b65a8d29961543a8d66bab2dbec58e5f89c

故障报修添加工具类型

 eims-ui/apps/web-antd/src/views/eims/repair-req/data.tsx

@@ -189,6 +189,24 @@
    }
  },
  {
    component: 'Input',
    fieldName: 'fixtureName',
    label: '工具名称',
    dependencies: {
      show: () => false,
      triggerFields: ['']
    }
  },
  {
    component: 'Input',
    fieldName: 'fixtureId',
    label: '工具id',
    dependencies: {
      show: () => false,
      triggerFields: ['']
    }
  },
  {
    component: 'Select',
    componentProps: {
      getPopupContainer,

 eims-ui/apps/web-antd/src/views/eims/repair-req/repair-req-drawer.vue

@@ -1,5 +1,5 @@
<script setup lang="ts">
import { computed, onMounted, ref } from 'vue';
import { computed, ref } from 'vue';

import { useVbenDrawer, useVbenModal } from '@vben/common-ui';
import { DictEnum } from '@vben/constants';
@@ -60,6 +60,13 @@
                  triggerFields: ['']
                },
                fieldName: 'equName'
              },
              {
                dependencies: {
                  show: () => reqType === '2',
                  triggerFields: ['']
                },
                fieldName: 'fixtureName'
              }
            ]);
          }
@@ -72,6 +79,13 @@
          triggerFields: ['']
        },
        fieldName: 'equName'
      },
      {
        dependencies: {
          show: () => false,
          triggerFields: ['']
        },
        fieldName: 'fixtureName'
      }
    ]);
    drawerApi.drawerLoading(true);
@@ -96,6 +110,13 @@
            triggerFields: ['']
          },
          fieldName: 'equName'
        },
        {
          dependencies: {
            show: () => reqType === '2',
            triggerFields: ['']
          },
          fieldName: 'fixtureName'
        }
      ]);
    }
@@ -215,6 +236,7 @@
      return;
    }
    const data = cloneDeep(await formApi.getValues());
    // todo åˆ é™¤å¤šä½™å­—段  Reflect.deleteProperty(formValues, 'equId');
    await (isUpdate.value ? updateRepairReq(data) : addRepairReq(data));
    emit('reload');
    await handleCancel();

 eims/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/FixtureService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package org.dromara.common.core.service;

public interface FixtureService {
    /**
     * é€šè¿‡å·¥å…·ID查询工具名称
     *
     * @param fixIds å·¥å…·ID串逗号分隔
     * @return å·¥å…·åç§°ä¸²é€—号分隔
     */
    String selectFixtureNameByIds(String fixIds);
}

 eims/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java

@@ -41,8 +41,13 @@
     */
    String EQU_ID_TO_NAME = "equ_id_to_name";
    /**
     * å·¥å…·ç±»åž‹(治具)id转名称
     * å·¥å…·(治具)类型id转名称
     */
    String FIXTURE_TYPE_ID_TO_NAME = "fixture_type_id_to_name";

    /**
     * å·¥å…·(治具)id转名称
     */
    String FIXTURE_ID_TO_NAME = "fixture_id_to_name";

}

 eims/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/FixtureNameTranslationImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
package org.dromara.common.translation.core.impl;

import lombok.AllArgsConstructor;
import org.dromara.common.core.service.FixtureService;
import org.dromara.common.core.service.FixtureTypeService;
import org.dromara.common.translation.annotation.TranslationType;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.common.translation.core.TranslationInterface;

/**
 * å·¥å…·åç§°ç¿»è¯‘实现
 *
 * @author zhuguifei
 */
@AllArgsConstructor
@TranslationType(type = TransConstant.FIXTURE_ID_TO_NAME)
public class FixtureNameTranslationImpl implements TranslationInterface<String> {

    private final FixtureService fixtureService;

    @Override
    public String translation(Object key, String other) {
        if (key instanceof String ids) {
            return fixtureService.selectFixtureNameByIds(ids);
        } else if (key instanceof Long id) {
            return fixtureService.selectFixtureNameByIds(id.toString());
        }
        return null;
    }
}

 eims/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/FixtureTypeNameTranslationImpl.java

@@ -7,7 +7,7 @@
import org.dromara.common.translation.core.TranslationInterface;

/**
 * å·¥å…·åç§°ç¿»è¯‘实现
 * å·¥å…·ç±»åž‹åç§°ç¿»è¯‘实现
 *
 * @author zhuguifei
 */

 eims/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -7,3 +7,4 @@
org.dromara.common.translation.core.impl.EquTypeNameTranslationImpl
org.dromara.common.translation.core.impl.EquNameTranslationImpl
org.dromara.common.translation.core.impl.FixtureTypeNameTranslationImpl
org.dromara.common.translation.core.impl.FixtureNameTranslationImpl

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/EimsRepairReq.java

@@ -85,6 +85,11 @@
    private Long equId;

    /**
     * å·¥å…·id
     */
    private Long fixtureId;

    /**
     * ç»´ä¿®å•id
     */
    private Long repairId;

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsRepairReqBo.java

@@ -93,6 +93,11 @@
    private Long equId;

    /**
     * å·¥å…·id
     */
    private Long fixtureId;

    /**
     * ç»´ä¿®å•id
     */
    private Long repairId;

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsRepairReqVo.java

@@ -113,6 +113,17 @@
    private Long equId;

    /**
     * å·¥å…·id
     */
    private Long fixtureId;

    /**
     * å·¥å…·
     */
    @Translation(type = TransConstant.FIXTURE_ID_TO_NAME, mapper = "fixtureId")
    private String fixtureName;

    /**
     * ç»´ä¿®å•id
     */
    @ExcelProperty(value = "维修单id")

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsFixtureServiceImpl.java

@@ -3,6 +3,7 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.dromara.common.core.service.FixtureService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -39,7 +40,7 @@
 */
@RequiredArgsConstructor
@Service
public class EimsFixtureServiceImpl implements IEimsFixtureService {
public class EimsFixtureServiceImpl implements IEimsFixtureService, FixtureService {

    private final EimsFixtureMapper baseMapper;
    private final EimsFixtureTypeMapper fixtureTypeMapper;
@@ -194,4 +195,15 @@
        return baseMapper.deleteByIds(ids) > 0;
    }

    @Override
    public String selectFixtureNameByIds(String fixIds) {
        List<String> list = new ArrayList<>();
        for (Long id : StringUtils.splitTo(fixIds, Convert::toLong)) {
            EimsFixtureVo vo = SpringUtils.getAopProxy(this).queryById(id);
            if (ObjectUtil.isNotNull(vo)) {
                list.add(vo.getFixtureName());
            }
        }
        return String.join(StringUtils.SEPARATOR, list);
    }
}