设备调拨功能增加

cuikaidong

2025-05-26 7c77e020b81e42fb65aa966742ff7c93e73668e1

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java

@@ -20,10 +20,8 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import org.jeecg.modules.eam.mapper.EamEquipmentSealUpMapper;
import org.jeecg.modules.eam.request.EamEquipmentSealUpQuery;
@@ -124,7 +122,6 @@
        } else {
            queryWrapper.orderByDesc("wmo.create_time");
        }

        return equipmentSealUpMapper.queryPageList(page, queryWrapper);
    }

@@ -213,7 +210,7 @@
        if (result != null) {
            entity.setSealEndTime(new Date());
            entity.setSealStatus(EquipmentSealUpStatusEnum.WAIT_UNSEALING_AUDIT.name());
               //保存工单
            //保存工单
            equipmentSealUpMapper.updateById(entity);
            return result.isSuccess();
        }
@@ -320,7 +317,7 @@
        Map<String, Object> values = new HashMap<>();
        switch (status) {
            // 审批
            case WAIT_UNSEALING_AUDIT:
            case WAIT_CHECK:
                //执行完成
                values.put("dataId", entity.getId());
                values.put("organization", request.getApprovalComment());
@@ -346,7 +343,7 @@
                }
                break;
            // 已封存
            case SEALED:
            case WAIT_UNSEALING_AUDIT:
                values.put("dataId", entity.getId());
                values.put("organization", request.getUnsealApprovalComment());
                values.put("comment", request.getUnsealApprovalComment());
@@ -360,11 +357,11 @@
                } else {
                    //设置entity
                    entity.setSealStatus(EquipmentSealUpStatusEnum.SEALED.name());
                    entity.setSealEndTime(null);
                }
                entity.setUnsealApprovalUser(user.getUsername());
                entity.setUnsealApprovalComment(request.getUnsealApprovalComment());
                entity.setUnsealApprovalTime(new Date());

                // 修改设备状态
                equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
                eamEquipmentService.updateById(equipment);