调整

zhuguifei

2025-03-11 7cc3ac34f175e2dacc76a02fb66ae3ba9f747b55

调整

 eims-ui/apps/web-antd/src/api/eims/maint-orditm/index.ts

ÎļþÒÑɾ³ý

 eims-ui/apps/web-antd/src/api/eims/maint-orditm/model.d.ts

ÎļþÒÑɾ³ý

 eims-ui/apps/web-antd/src/api/eims/maint-plan/model.d.ts

@@ -8,7 +8,9 @@
   * è®¾å¤‡id

   */
  equId: number | string;
  maintName: string;
  maintNo: number;
  maintDesc: string;

  /**
   * ä¿å…»ç±»åž‹ï¼ˆå­—典）

 eims-ui/apps/web-antd/src/api/eims/maint-stand/index.ts

ÎļþÒÑɾ³ý

 eims-ui/apps/web-antd/src/api/eims/maint-stand/model.d.ts

ÎļþÒÑɾ³ý

 eims-ui/apps/web-antd/src/views/eims/components/miant-plan-modal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
<script setup lang="ts">
import { ref } from 'vue';

import { useVbenModal } from '@vben/common-ui';

import { message } from 'ant-design-vue';

import InnerView from '#/views/eims/maint-plan/index.vue';

const emit = defineEmits<{ updateSelect: [any] }>();

const [BasicModal, modalApi] = useVbenModal({
  fullscreenButton: false,
  draggable: true,
  onCancel: handleCancel,
  onConfirm: handleConfirm
});
const innerView = ref();

async function handleConfirm() {
  try {
    modalApi.modalLoading(true);
    const tableSelect = innerView.value.tableSelect();
    if (tableSelect.length > 1) {
      message.error('最多只能选择一条数据！');
      modalApi.modalLoading(false);
      return false;
    }
    emit('updateSelect', tableSelect[0]);
    await handleCancel();
  } catch (error) {
    console.error(error);
  } finally {
    modalApi.modalLoading(false);
  }
}

async function handleCancel() {
  modalApi.close();
}
</script>

<template>
  <BasicModal :fullscreen-button="true" class="w-[800px]">
    <InnerView ref="innerView" />
  </BasicModal>
</template>

<style scoped></style>

 eims-ui/apps/web-antd/src/views/eims/maint-order/data.tsx

@@ -84,11 +84,15 @@
    title: '设备名称',
    field: 'equName',
    minWidth: 200,
    fixed: 'left'
  },
  {
    title: '资产编号',
    field: 'assetNo',
    minWidth: 160
  },
  {
    title: '保养项',
    field: 'maintName',
    minWidth: 160
  },
  {
@@ -151,6 +155,14 @@
  },
  {
    component: 'Input',
    dependencies: {
      show: () => false,
      triggerFields: ['']
    },
    fieldName: 'planId',
  },
  {
    component: 'Input',
    fieldName: 'equId',
    label: '设备id',
    dependencies: {

 eims-ui/apps/web-antd/src/views/eims/maint-order/index.vue

@@ -19,7 +19,6 @@

import { columns, querySchema } from './data';
import maintOrderDrawer from './maint-order-drawer.vue';
import SubOrditm from './sub-orditm.vue';

defineExpose({
  tableSelect
@@ -243,7 +242,7 @@
<template>
  <Page :auto-content-height="true">
    <div class="flex h-full gap-[8px] flex-col">
      <BasicTable class="h-2/3" table-title="保养工单列表">
      <BasicTable table-title="保养工单列表">
        <template #toolbar-tools>
          <Space>
            <a-button v-access:code="['eims:maintOrder:export']" @click="handleDownloadExcel">
@@ -309,7 +308,7 @@
        </template>
      </BasicTable>
      <!--<BasisSubTable :columns="maintStandCol" :list-api="listMaintStand" :req-value="equId" class="h-1/3" req-key="equId" title="保养实施项目" />-->
      <SubOrditm :order-id="orderId" class="h-1/3" />

    </div>
    <MaintOrderDrawer @reload="tableApi.query()" />
  </Page>

 eims-ui/apps/web-antd/src/views/eims/maint-order/sub-orditm.vue

ÎļþÒÑɾ³ý

 eims-ui/apps/web-antd/src/views/eims/maint-orditm/data.tsx

ÎļþÒÑɾ³ý

 eims-ui/apps/web-antd/src/views/eims/maint-orditm/index.vue

ÎļþÒÑɾ³ý

 eims-ui/apps/web-antd/src/views/eims/maint-orditm/maint-orditm-drawer.vue

ÎļþÒÑɾ³ý

 eims-ui/apps/web-antd/src/views/eims/maint-plan/data.tsx

@@ -86,6 +86,11 @@
    }
  },
  {
    title: '保养项',
    field: 'maintName',
    minWidth: 200
  },
  {
    title: '保养类型',
    field: 'maintType',
    minWidth: 120,
@@ -163,6 +168,11 @@
    label: '设备名称'
  },
  {
    component: 'Input',
    fieldName: 'maintName',
    label: '保养项'
  },
  {
    component: 'RadioGroup',
    componentProps: {
      buttonStyle: 'solid',

 eims-ui/apps/web-antd/src/views/eims/maint-plan/index.vue

@@ -11,17 +11,20 @@

import { useVbenVxeGrid, vxeCheckboxChecked, type VxeGridProps, vxeSortEvent } from '#/adapter/vxe-table';
import { delMaintPlan, listMaintPlan, maintPlanExport } from '#/api/eims/maint-plan';
import { listMaintStand } from '#/api/eims/maint-stand';
import { generateCode } from '#/api/eims/utils';
import { getDeptTree, userList } from '#/api/system/user';
import { MAINT_ORDER_STATUS } from '#/constants/dict';
import { commonDownloadExcel } from '#/utils/file/download';
import BasisSubTable from '#/views/eims/components/basis-sub-table.vue';
import maintOrderDrawer from '#/views/eims/maint-order/maint-order-drawer.vue';
import { columns as maintSrandCol } from '#/views/eims/maint-stand/data';

import { columns, querySchema } from './data';
import maintPlanDrawer from './maint-plan-drawer.vue';


defineExpose({
  tableSelect
});

const formOptions: VbenFormProps = {
  commonConfig: {
@@ -145,6 +148,7 @@
  }
  const planOrder = {
    equId: record.equId,
    planId: record.id,
    equName: record.equName,
    maintUser: record.maintUser,
    maintUserName: record.maintUserName,
@@ -230,12 +234,17 @@
onMounted(async () => {
  await setupDeptSelect();
});

// é€‰ä¸­æ•°æ®
function tableSelect() {
  return tableApi.grid.getCheckboxRecords();
}
</script>

<template>
  <Page :auto-content-height="true">
    <div class="flex h-full gap-[8px] flex-col">
      <BasicTable class="h-2/3" table-title="保养计划列表">
      <BasicTable  table-title="保养计划列表">
        <template #toolbar-tools>
          <Space>
            <a-button v-access:code="['eims:maintPlan:export']" @click="handleDownloadExcel">
@@ -285,7 +294,6 @@
          </Dropdown>
        </template>
      </BasicTable>
      <BasisSubTable :columns="maintSrandCol" :list-api="listMaintStand" :req-value="equId" class="h-1/3" req-key="equId" title="保养实施项目" />
    </div>
    <MaintPlanDrawer @reload="tableApi.query()" />
    <MaintOrderDrawer @reload="tableApi.query()" />

 eims-ui/apps/web-antd/src/views/eims/maint-stand/data.tsx

ÎļþÒÑɾ³ý

 eims-ui/apps/web-antd/src/views/eims/maint-stand/index.vue

ÎļþÒÑɾ³ý

 eims-ui/apps/web-antd/src/views/eims/maint-stand/maint-stand-drawer.vue

ÎļþÒÑɾ³ý

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintOrditmController.java

ÎļþÒÑɾ³ý

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintStandController.java

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -33,6 +33,21 @@
    private Long id;

    /**
     * ä¿å…»é¡¹åç§°
     */
    private String maintName;

    /**
     * ä¿å…»é¡¹ç¼–号
     */
    private Integer maintNo;

    /**
     * ä¿å…»é¡¹æè¿°
     */
    private String maintDesc;

    /**
     * è®¾å¤‡id

     */

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -28,6 +28,23 @@
    @NotNull(message = "不能为空", groups = { EditGroup.class })
    private Long id;


    /**
     * ä¿å…»é¡¹åç§°
     */
    @NotNull(message = "保养项名称不能为空", groups = { EditGroup.class })
    private String maintName;

    /**
     * ä¿å…»é¡¹ç¼–号
     */
    private Integer maintNo;

    /**
     * ä¿å…»é¡¹æè¿°
     */
    private String maintDesc;

    /**
     * è®¾å¤‡id


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

ÎļþÒÑɾ³ý

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

@@ -54,6 +54,11 @@
    private String assetNo;

    /**
     * ä¿å…»é¡¹åç§°
     */
    private String maintName;

    /**
     * è®¡åˆ’表冗余-保养类型（字典）
     */
    @ExcelProperty(value = "计划表冗余-保养类型", converter = ExcelDictConvert.class)

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

ÎļþÒÑɾ³ý

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

@@ -41,6 +41,22 @@
    @ExcelProperty(value = "")
    private Long id;


    /**
     * ä¿å…»é¡¹åç§°
     */
    private String maintName;

    /**
     * ä¿å…»é¡¹ç¼–号
     */
    private Integer maintNo;

    /**
     * ä¿å…»é¡¹æè¿°
     */
    private String maintDesc;

    /**
     * è®¾å¤‡id


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

ÎļþÒÑɾ³ý

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java

@@ -16,11 +16,8 @@
import org.dromara.eims.domain.*;
import org.dromara.eims.domain.bo.EimsMaintPlanBo;
import org.dromara.eims.domain.vo.EimsMaintPlanVo;
import org.dromara.eims.domain.vo.EimsMaintStandVo;
import org.dromara.eims.mapper.EimsMaintOrderMapper;
import org.dromara.eims.mapper.EimsMaintOrditmMapper;
import org.dromara.eims.mapper.EimsMaintPlanMapper;
import org.dromara.eims.mapper.EimsMaintStandMapper;
import org.dromara.eims.service.IEimsMaintOrderService;
import org.dromara.eims.service.IEimsMaintPlanService;
import org.dromara.eims.service.IGenerateCodeService;
@@ -38,9 +35,7 @@
public class MaintPlanToOrderJob {
    private final EimsMaintOrderMapper orderMapper;

    private final EimsMaintStandMapper standMapper;

    private final EimsMaintOrditmMapper orditmMapper;

    private final EimsMaintPlanMapper planMapper;

@@ -110,6 +105,7 @@
            order.setId(null);
            order.setStatus(DictConstants.MAINT_ORDER_STATUS_DETAIL.DAIBAOYANG);
            order.setPlanTime(createOrderTime);
            order.setPlanId(planVo.getId());
            order.setMaintCode(codeService.generateCode("BYZD"));
            EimsMaintPlan plan = MapstructUtils.convert(planVo, EimsMaintPlan.class);
            assert plan != null;
@@ -121,21 +117,9 @@
            if (!flag) continue;
            planMapper.updateById(plan);

            //生成保养明细
            Long equId = plan.getEquId();
            List<EimsMaintStandVo> standList = standMapper.selectVoList(new LambdaQueryWrapper<EimsMaintStand>().eq(EimsMaintStand::getEquId, equId));
            //TODO æ²¡æœ‰ä¿å…»é¡¹ï¼Œæ·»åŠ å¼‚常记录
            if(standList.isEmpty()) continue;
            for (int j = 0; j < standList.size(); j++) {
                EimsMaintStandVo stand = standList.get(j);
                EimsMaintOrditm itm = new EimsMaintOrditm();
                itm.setOrderId(order.getId());
                itm.setEquId(equId);
                itm.setItmName(stand.getName());
                itm.setItmAction(stand.getStand());
                itm.setItmUser(order.getMaintUser());
                orditmMapper.insert(itm);
            }



        }
        return ExecuteResult.success("保养计划生成保养工单成功");
    }

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/mapper/EimsMaintOrditmMapper.java

ÎļþÒÑɾ³ý

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/mapper/EimsMaintStandMapper.java

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -15,13 +15,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.eims.domain.EimsMaintOrditm;
import org.dromara.eims.domain.EimsMaintStand;
import org.dromara.eims.domain.vo.EimsMaintPlanVo;
import org.dromara.eims.domain.vo.EimsMaintStandVo;
import org.dromara.eims.domain.vo.EimsRepairResVo;
import org.dromara.eims.mapper.EimsMaintOrditmMapper;
import org.dromara.eims.mapper.EimsMaintStandMapper;

import org.dromara.system.domain.SysDept;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.mapper.SysDeptMapper;
@@ -49,10 +43,8 @@
public class EimsMaintOrderServiceImpl implements IEimsMaintOrderService, MaintOrderService {

    private final EimsMaintOrderMapper baseMapper;
    private final EimsMaintOrditmMapper orditmMapper;
    private final SysDeptMapper sysDeptMapper;

    private final EimsMaintStandMapper standMapper;
    /**
     * æŸ¥è¯¢ä¿å…»å·¥å•
     *
@@ -168,21 +160,6 @@
        if (flag) {
            bo.setId(add.getId());

            //生成保养明细
            Long equId = bo.getEquId();
            List<EimsMaintStandVo> standList = standMapper.selectVoList(new LambdaQueryWrapper<EimsMaintStand>().eq(EimsMaintStand::getEquId, equId));
            //TODO æ²¡æœ‰ä¿å…»é¡¹ï¼Œæ·»åŠ å¼‚常记录
            for (int j = 0; j < standList.size(); j++) {
                EimsMaintStandVo stand = standList.get(j);
                EimsMaintOrditm itm = new EimsMaintOrditm();
                itm.setOrderId(bo.getId());
                itm.setEquId(equId);
                itm.setItmName(stand.getName());
                itm.setItmAction(stand.getStand());
                itm.setItmUser(bo.getMaintUser());
                orditmMapper.insert(itm);
            }

        }
        return flag;
    }
@@ -200,17 +177,6 @@
        EimsMaintOrder update = MapstructUtils.convert(bo, EimsMaintOrder.class);

        EimsMaintOrder old = baseMapper.selectById(bo.getId());

        // ä¿å…»çŠ¶æ€å˜æ›´å¾…审核时需要校验保养项数据
        if(old.getStatus().equals(DictConstants.MAINT_ORDER_STATUS_DETAIL.BAOYANG)&&bo.getStatus().equals(DictConstants.MAINT_ORDER_STATUS_DETAIL.DAIYANZHENG)){
            LambdaQueryWrapper<EimsMaintOrditm>  itmQueryWrapper = Wrappers.lambdaQuery();
            itmQueryWrapper.eq(EimsMaintOrditm::getOrderId, bo.getId());
            List<EimsMaintOrditm> eimsMaintOrditms = orditmMapper.selectList(itmQueryWrapper);
            List<EimsMaintOrditm> wwc = eimsMaintOrditms.stream().filter(item->!item.getStatus().equals(DictConstants.EIMS_ORDITM_STATUS_DETAIL.YIWANCHENG)).toList();
             if(!wwc.isEmpty()){
                return false;
             }
        }

        validEntityBeforeSave(update);
        return baseMapper.updateById(update) > 0;

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsMaintOrderMapper.xml

@@ -7,6 +7,7 @@
    </resultMap>
    <select id="selectMaintOrderList" resultMap="EimsMaintOrderResult">
        SELECT mo.*,equ.equ_name equName,equ.equ_code equCode,equ.asset_no assetNo,equ.model_no modelNo,mo.create_time createTime,
               pl.maint_name maintName,
               us.nick_name maintUserName,dp.dept_name maintDeptName,ue.nick_name verifyUserName,
               CONCAT_WS('', mo.maint_cycle, dd.dict_label) maintCycleUnitName
        FROM eims_maint_order mo
@@ -14,6 +15,7 @@
                 LEFT JOIN sys_user us ON mo.maint_user = us.user_id
                 LEFT JOIN sys_user ue ON mo.verify_user = ue.user_id
                 LEFT JOIN sys_dept dp ON mo.maint_dept = dp.dept_id
                 LEFT JOIN eims_maint_plan pl ON pl.id = mo.plan_id
                 LEFT JOIN sys_dict_data dd on dd.dict_type = 'maint_cycle_unit' and dd.dict_value = mo.maint_cycle_unit
            ${ew.getCustomSqlSegment}
    </select>

 eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsMaintOrditmMapper.xml

ÎļþÒÑɾ³ý

 eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsMaintStandMapper.xml

ÎļþÒÑɾ³ý