diff --git a/jeecg-boot/db/mes-xsl-equip-inspect-config-menu-permission.sql b/jeecg-boot/db/mes-xsl-equip-inspect-config-menu-permission.sql new file mode 100644 index 0000000..4f2a379 --- /dev/null +++ b/jeecg-boot/db/mes-xsl-equip-inspect-config-menu-permission.sql @@ -0,0 +1,91 @@ +-- MES 设备点检配置（主子表）：建表 + 菜单 + 按钮 + 租户 admin 授权 +-- 权限前缀：mes:mes_xsl_equip_inspect_config:* +-- 父菜单：设备管理；类型字典复用 xslmes_im_item_category（须先有点检及保养项目功能） +-- Flyway：V3.9.2_78__mes_xsl_equip_inspect_config.sql +SET NAMES utf8mb4; + +CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_config` ( + `id` varchar(32) NOT NULL COMMENT '主键', + `equipment_ledger_id` varchar(32) NOT NULL COMMENT '设备台账主键 mes_xsl_equipment_ledger.id', + `equipment_name` varchar(500) DEFAULT NULL COMMENT '设备名称冗余', + `equipment_code` varchar(500) DEFAULT NULL COMMENT '设备编号冗余', + `config_type` varchar(500) NOT NULL COMMENT '配置类型（字典xslmes_im_item_category：inspect点检/maintain保养；同设备同类型唯一）', + `tenant_id` int DEFAULT NULL COMMENT '租户', + `sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门', + `create_by` varchar(500) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(500) DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）', + PRIMARY KEY (`id`), + KEY `idx_meic_tenant_equip_type` (`tenant_id`, `equipment_ledger_id`, `config_type`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备点检配置'; + +CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_config_line` ( + `id` varchar(32) NOT NULL COMMENT '主键', + `config_id` varchar(32) NOT NULL COMMENT '主表主键 mes_xsl_equip_inspect_config.id', + `inspect_maintain_item_id` varchar(32) NOT NULL COMMENT '点检及保养项目主键 mes_xsl_inspect_maintain_item.id', + `item_code` varchar(500) DEFAULT NULL COMMENT '点检项目编号冗余', + `item_name` varchar(500) DEFAULT NULL COMMENT '项目名称冗余', + `item_category` varchar(500) DEFAULT NULL COMMENT '项目类别冗余', + `item_type` varchar(500) DEFAULT NULL COMMENT '项目类型冗余', + `equipment_part_name` varchar(500) DEFAULT NULL COMMENT '设备部位名称冗余', + `equipment_sub_part_name` varchar(500) DEFAULT NULL COMMENT '设备小部位名称冗余', + `inspect_method` varchar(500) DEFAULT NULL COMMENT '点检方式冗余', + `judgment_criteria` varchar(500) DEFAULT NULL COMMENT '判断基准冗余', + `sort_no` int DEFAULT '0' COMMENT '排序号', + `create_by` varchar(500) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(500) DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + KEY `idx_meicl_config` (`config_id`), + KEY `idx_meicl_item` (`inspect_maintain_item_id`), + UNIQUE KEY `uk_meicl_config_item` (`config_id`, `inspect_maintain_item_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备点检配置明细'; + +SET @mes_tenant_id = 1002; + +SET @mes_equip_pid = ( + SELECT `id` FROM `sys_permission` + WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理' + LIMIT 1 +); +SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133'); + +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`) +VALUES ('1860000000000000148', @mes_equip_pid, '设备点检配置', '/xslmes/mesXslEquipInspectConfig', 'xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfigList', NULL, 1, NULL, '1', 12, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW()) +ON DUPLICATE KEY UPDATE +`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`), +`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`), +`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`), +`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:control-outlined'; + +UPDATE `sys_permission` SET `icon` = 'ant-design:control-outlined' WHERE `id` = '1860000000000000148' AND `del_flag` = 0; + +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES +('1860000000000000149', '1860000000000000148', '新增', 2, 'mes:mes_xsl_equip_inspect_config:add', '1', '1', 0, 'admin', NOW()), +('1860000000000000150', '1860000000000000148', '编辑', 2, 'mes:mes_xsl_equip_inspect_config:edit', '1', '1', 0, 'admin', NOW()), +('1860000000000000151', '1860000000000000148', '删除', 2, 'mes:mes_xsl_equip_inspect_config:delete', '1', '1', 0, 'admin', NOW()), +('1860000000000000152', '1860000000000000148', '批量删除', 2, 'mes:mes_xsl_equip_inspect_config:deleteBatch', '1', '1', 0, 'admin', NOW()), +('1860000000000000153', '1860000000000000148', '导出', 2, 'mes:mes_xsl_equip_inspect_config:exportXls', '1', '1', 0, 'admin', NOW()), +('1860000000000000154', '1860000000000000148', '导入', 2, 'mes:mes_xsl_equip_inspect_config:importExcel', '1', '1', 0, 'admin', NOW()) +ON DUPLICATE KEY UPDATE +`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), +`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`); + +INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`) +SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1' +FROM `sys_role` r +CROSS JOIN `sys_permission` p +WHERE r.`tenant_id` = @mes_tenant_id + AND r.`role_code` = 'admin' + AND p.`id` IN ( + '1860000000000000148', + '1860000000000000149', '1860000000000000150', '1860000000000000151', '1860000000000000152', + '1860000000000000153', '1860000000000000154' + ) + AND NOT EXISTS ( + SELECT 1 FROM `sys_role_permission` rp + WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id` + ); diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectConfigController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectConfigController.java new file mode 100644 index 0000000..8d5c1db --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectConfigController.java @@ -0,0 +1,230 @@ +package org.jeecg.modules.xslmes.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig; +import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine; +import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger; +import org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem; +import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService; +import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService; +import org.jeecg.modules.xslmes.service.IMesXslInspectMaintainItemService; +import org.jeecg.modules.xslmes.vo.MesXslEquipInspectConfigPage; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +/** + * MES 设备点检配置（主子表） + */ +@Tag(name = "MES设备点检配置") +@RestController +@RequestMapping("/xslmes/mesXslEquipInspectConfig") +@Slf4j +public class MesXslEquipInspectConfigController + extends JeecgController { + + private static final Set CONFIG_TYPE = Set.of("inspect", "maintain"); + + @Autowired + private IMesXslEquipInspectConfigService mesXslEquipInspectConfigService; + + @Autowired + private IMesXslEquipmentLedgerService mesXslEquipmentLedgerService; + + @Autowired + private IMesXslInspectMaintainItemService mesXslInspectMaintainItemService; + + @Operation(summary = "MES设备点检配置-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList( + MesXslEquipInspectConfig model, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = mesXslEquipInspectConfigService.page(page, queryWrapper); + return Result.OK(pageList); + } + + @AutoLog(value = "MES设备点检配置-添加") + @Operation(summary = "MES设备点检配置-添加") + @RequiresPermissions("mes:mes_xsl_equip_inspect_config:add") + @PostMapping(value = "/add") + public Result add(@RequestBody MesXslEquipInspectConfigPage page) { + MesXslEquipInspectConfig main = new MesXslEquipInspectConfig(); + BeanUtils.copyProperties(page, main); + //update-begin---author:jiangxh ---date:20260519 for：【MES】设备点检配置保存校验----------- + String err = validateForSave(main, page.getLineList(), null); + if (err != null) { + return Result.error(err); + } + //update-end---author:jiangxh ---date:20260519 for：【MES】设备点检配置保存校验----------- + mesXslEquipInspectConfigService.saveMain(main, page.getLineList()); + return Result.OK("添加成功！"); + } + + @AutoLog(value = "MES设备点检配置-编辑") + @Operation(summary = "MES设备点检配置-编辑") + @RequiresPermissions("mes:mes_xsl_equip_inspect_config:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody MesXslEquipInspectConfigPage page) { + MesXslEquipInspectConfig main = new MesXslEquipInspectConfig(); + BeanUtils.copyProperties(page, main); + //update-begin---author:jiangxh ---date:20260519 for：【MES】设备点检配置保存校验----------- + String err = validateForSave(main, page.getLineList(), main.getId()); + if (err != null) { + return Result.error(err); + } + //update-end---author:jiangxh ---date:20260519 for：【MES】设备点检配置保存校验----------- + mesXslEquipInspectConfigService.updateMain(main, page.getLineList()); + return Result.OK("编辑成功!"); + } + + @AutoLog(value = "MES设备点检配置-删除") + @Operation(summary = "MES设备点检配置-通过id删除") + @RequiresPermissions("mes:mes_xsl_equip_inspect_config:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + mesXslEquipInspectConfigService.delMain(id); + return Result.OK("删除成功!"); + } + + @AutoLog(value = "MES设备点检配置-批量删除") + @Operation(summary = "MES设备点检配置-批量删除") + @RequiresPermissions("mes:mes_xsl_equip_inspect_config:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + mesXslEquipInspectConfigService.delBatchMain(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + @Operation(summary = "MES设备点检配置-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + MesXslEquipInspectConfig entity = mesXslEquipInspectConfigService.getById(id); + if (entity == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(entity); + } + + @Operation(summary = "MES设备点检配置-查询明细") + @GetMapping(value = "/queryLineListByConfigId") + public Result> queryLineListByConfigId( + @RequestParam(name = "id", required = true) String id) { + return Result.OK(mesXslEquipInspectConfigService.selectLinesByConfigId(id)); + } + + @RequiresPermissions("mes:mes_xsl_equip_inspect_config:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, MesXslEquipInspectConfig model) { + return super.exportXls(request, model, MesXslEquipInspectConfig.class, "MES设备点检配置"); + } + + @RequiresPermissions("mes:mes_xsl_equip_inspect_config:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, MesXslEquipInspectConfig.class); + } + + //update-begin---author:jiangxh ---date:20260519 for：【MES】设备点检配置：主表唯一、明细项目不重复、从点检保养项目带出----------- + private String validateForSave( + MesXslEquipInspectConfig main, List lineList, String excludeId) { + if (main == null) { + return "参数不能为空"; + } + if (oConvertUtils.isEmpty(main.getEquipmentLedgerId())) { + return "请选择设备台账"; + } + MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(main.getEquipmentLedgerId()); + if (ledger == null || isDeleted(ledger.getDelFlag())) { + return "设备台账不存在或已删除"; + } + main.setEquipmentName(ledger.getEquipmentName()); + main.setEquipmentCode(ledger.getEquipmentCode()); + + String configType = main.getConfigType(); + if (configType != null) { + configType = configType.trim(); + } + if (oConvertUtils.isEmpty(configType) || !CONFIG_TYPE.contains(configType)) { + return "类型无效，请选择点检或保养"; + } + main.setConfigType(configType); + + if (mesXslEquipInspectConfigService.isConfigDuplicated( + main.getEquipmentLedgerId(), configType, excludeId, main)) { + return "该设备在此类型（点检/保养）下已存在配置，不能重复添加"; + } + + if (lineList == null || lineList.isEmpty()) { + return "请至少添加一条点检项目明细"; + } + + Set itemIds = new HashSet<>(); + int sort = 0; + for (int i = 0; i < lineList.size(); i++) { + MesXslEquipInspectConfigLine line = lineList.get(i); + if (line == null) { + continue; + } + int rowNo = i + 1; + if (oConvertUtils.isEmpty(line.getInspectMaintainItemId())) { + return "第 " + rowNo + " 行未选择点检及保养项目"; + } + String itemId = line.getInspectMaintainItemId().trim(); + if (!itemIds.add(itemId)) { + return "第 " + rowNo + " 行点检项目与前面行重复，同一配置中点检项目不能重复"; + } + MesXslInspectMaintainItem item = mesXslInspectMaintainItemService.getById(itemId); + if (item == null || isDeleted(item.getDelFlag())) { + return "第 " + rowNo + " 行点检及保养项目不存在或已删除"; + } + if (!configType.equals(item.getItemCategory())) { + return "第 " + rowNo + " 行项目类别与配置类型不一致（配置为" + + ("inspect".equals(configType) ? "点检" : "保养") + + "）"; + } + line.setInspectMaintainItemId(itemId); + line.setItemCode(item.getItemCode()); + line.setItemName(item.getItemName()); + line.setItemCategory(item.getItemCategory()); + line.setItemType(item.getItemType()); + line.setEquipmentPartName(item.getEquipmentPartName()); + line.setEquipmentSubPartName(item.getEquipmentSubPartName()); + line.setInspectMethod(item.getInspectMethod()); + line.setJudgmentCriteria(item.getJudgmentCriteria()); + line.setSortNo(sort++); + } + if (itemIds.isEmpty()) { + return "请至少添加一条点检项目明细"; + } + return null; + } + + private static boolean isDeleted(Integer delFlag) { + return delFlag != null && delFlag.equals(CommonConstant.DEL_FLAG_1); + } + //update-end---author:jiangxh ---date:20260519 for：【MES】设备点检配置：主表唯一、明细项目不重复、从点检保养项目带出----------- +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectConfig.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectConfig.java new file mode 100644 index 0000000..c834b4a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectConfig.java @@ -0,0 +1,65 @@ +package org.jeecg.modules.xslmes.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import java.io.Serializable; +import java.util.Date; +import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * MES 设备点检配置主表（表 mes_xsl_equip_inspect_config） + */ +@Data +@TableName("mes_xsl_equip_inspect_config") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description = "MES设备点检配置") +public class MesXslEquipInspectConfig implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_ID) + private String id; + + @Schema(description = "设备台账主键 mes_xsl_equipment_ledger.id") + private String equipmentLedgerId; + + @Excel(name = "设备名称", width = 22) + @Schema(description = "设备名称冗余") + private String equipmentName; + + @Excel(name = "设备编号", width = 18) + @Schema(description = "设备编号冗余") + private String equipmentCode; + + @Excel(name = "类型", width = 12, dicCode = "xslmes_im_item_category") + @Dict(dicCode = "xslmes_im_item_category") + @Schema(description = "配置类型（字典xslmes_im_item_category：inspect点检/maintain保养；同设备同类型唯一）") + private String configType; + + private Integer tenantId; + private String sysOrgCode; + private String createBy; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + private String updateBy; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + private Integer delFlag; + + @TableField(exist = false) + @Schema(description = "点检项目明细") + private List lineList; +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectConfigLine.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectConfigLine.java new file mode 100644 index 0000000..e61bb50 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectConfigLine.java @@ -0,0 +1,73 @@ +package org.jeecg.modules.xslmes.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * MES 设备点检配置明细（表 mes_xsl_equip_inspect_config_line） + */ +@Data +@TableName("mes_xsl_equip_inspect_config_line") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description = "MES设备点检配置明细") +public class MesXslEquipInspectConfigLine implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_ID) + private String id; + + @Schema(description = "主表主键 mes_xsl_equip_inspect_config.id") + private String configId; + + @Schema(description = "点检及保养项目主键 mes_xsl_inspect_maintain_item.id") + private String inspectMaintainItemId; + + @Schema(description = "点检项目编号冗余") + private String itemCode; + + @Schema(description = "项目名称冗余") + private String itemName; + + @Dict(dicCode = "xslmes_im_item_category") + @Schema(description = "项目类别冗余") + private String itemCategory; + + @Dict(dicCode = "xslmes_im_item_type") + @Schema(description = "项目类型冗余") + private String itemType; + + @Schema(description = "设备部位名称冗余") + private String equipmentPartName; + + @Schema(description = "设备小部位名称冗余") + private String equipmentSubPartName; + + @Dict(dicCode = "xslmes_im_inspect_method") + @Schema(description = "点检方式冗余") + private String inspectMethod; + + @Schema(description = "判断基准冗余") + private String judgmentCriteria; + + private Integer sortNo; + private String createBy; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + private String updateBy; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectConfigLineMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectConfigLineMapper.java new file mode 100644 index 0000000..ec09cd1 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectConfigLineMapper.java @@ -0,0 +1,6 @@ +package org.jeecg.modules.xslmes.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine; + +public interface MesXslEquipInspectConfigLineMapper extends BaseMapper {} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectConfigMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectConfigMapper.java new file mode 100644 index 0000000..c318ce4 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectConfigMapper.java @@ -0,0 +1,6 @@ +package org.jeecg.modules.xslmes.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig; + +public interface MesXslEquipInspectConfigMapper extends BaseMapper {} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java index aac6a87..01d97f0 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java @@ -1,5 +1,5 @@ /** * MES XSL 业务模块（Maven 工程名：jeecg-module-xslmes）。 - * 包含：客户管理（{@link org.jeecg.modules.xslmes.entity.MesXslCustomer}）、工序管理（{@link org.jeecg.modules.xslmes.entity.MesXslProcessOperation}）、设备类别（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory}）、设备类型（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentType}）、设备台账（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger}）、设备部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentPart}）、设备小部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart}）、点检及保养项目（{@link org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem}）、备品件类别（{@link org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory}）、备品件信息（{@link org.jeecg.modules.xslmes.entity.MesXslSparePart}）、厂家信息（{@link org.jeecg.modules.xslmes.entity.MesXslManufacturer}）、停机主类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType}）、停机类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeType}）等。 + * 包含：客户管理（{@link org.jeecg.modules.xslmes.entity.MesXslCustomer}）、工序管理（{@link org.jeecg.modules.xslmes.entity.MesXslProcessOperation}）、设备类别（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory}）、设备类型（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentType}）、设备台账（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger}）、设备部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentPart}）、设备小部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart}）、点检及保养项目（{@link org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem}）、设备点检配置（{@link org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig}）、备品件类别（{@link org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory}）、备品件信息（{@link org.jeecg.modules.xslmes.entity.MesXslSparePart}）、厂家信息（{@link org.jeecg.modules.xslmes.entity.MesXslManufacturer}）、停机主类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType}）、停机类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeType}）等。 */ package org.jeecg.modules.xslmes; diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipInspectConfigService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipInspectConfigService.java new file mode 100644 index 0000000..a8f96eb --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipInspectConfigService.java @@ -0,0 +1,23 @@ +package org.jeecg.modules.xslmes.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.io.Serializable; +import java.util.Collection; +import java.util.List; +import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig; +import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine; + +public interface IMesXslEquipInspectConfigService extends IService { + + void saveMain(MesXslEquipInspectConfig main, List lineList); + + void updateMain(MesXslEquipInspectConfig main, List lineList); + + void delMain(String id); + + void delBatchMain(Collection idList); + + List selectLinesByConfigId(String configId); + + boolean isConfigDuplicated(String equipmentLedgerId, String configType, String excludeId, MesXslEquipInspectConfig context); +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectConfigServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectConfigServiceImpl.java new file mode 100644 index 0000000..1f86930 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectConfigServiceImpl.java @@ -0,0 +1,132 @@ +package org.jeecg.modules.xslmes.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.io.Serializable; +import java.util.Collection; +import java.util.List; +import org.jeecg.common.config.TenantContext; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.util.SpringContextUtils; +import org.jeecg.common.util.TokenUtils; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig; +import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine; +import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectConfigLineMapper; +import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectConfigMapper; +import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +@Service +public class MesXslEquipInspectConfigServiceImpl + extends ServiceImpl + implements IMesXslEquipInspectConfigService { + + @Autowired + private MesXslEquipInspectConfigLineMapper mesXslEquipInspectConfigLineMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveMain(MesXslEquipInspectConfig main, List lineList) { + this.save(main); + insertLines(main.getId(), lineList); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateMain(MesXslEquipInspectConfig main, List lineList) { + this.updateById(main); + mesXslEquipInspectConfigLineMapper.delete( + new LambdaQueryWrapper() + .eq(MesXslEquipInspectConfigLine::getConfigId, main.getId())); + insertLines(main.getId(), lineList); + } + + private void insertLines(String configId, List lineList) { + if (CollectionUtils.isEmpty(lineList)) { + return; + } + int sort = 0; + for (MesXslEquipInspectConfigLine line : lineList) { + line.setId(null); + line.setConfigId(configId); + line.setSortNo(sort++); + mesXslEquipInspectConfigLineMapper.insert(line); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delMain(String id) { + mesXslEquipInspectConfigLineMapper.delete( + new LambdaQueryWrapper().eq(MesXslEquipInspectConfigLine::getConfigId, id)); + this.removeById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delBatchMain(Collection idList) { + for (Serializable id : idList) { + delMain(id.toString()); + } + } + + @Override + public List selectLinesByConfigId(String configId) { + return mesXslEquipInspectConfigLineMapper.selectList( + new LambdaQueryWrapper() + .eq(MesXslEquipInspectConfigLine::getConfigId, configId) + .orderByAsc(MesXslEquipInspectConfigLine::getSortNo)); + } + + //update-begin---author:jiangxh ---date:20260519 for：【MES】设备点检配置：同设备同类型（点检/保养）仅允许一条主数据----------- + @Override + public boolean isConfigDuplicated( + String equipmentLedgerId, String configType, String excludeId, MesXslEquipInspectConfig context) { + if (oConvertUtils.isEmpty(equipmentLedgerId) || oConvertUtils.isEmpty(configType)) { + return false; + } + Integer tenantId = resolveTenantId(context); + LambdaQueryWrapper w = new LambdaQueryWrapper<>(); + w.eq(MesXslEquipInspectConfig::getEquipmentLedgerId, equipmentLedgerId.trim()); + w.eq(MesXslEquipInspectConfig::getConfigType, configType.trim()); + w.and( + q -> + q.eq(MesXslEquipInspectConfig::getDelFlag, CommonConstant.DEL_FLAG_0) + .or() + .isNull(MesXslEquipInspectConfig::getDelFlag)); + if (oConvertUtils.isNotEmpty(excludeId)) { + w.ne(MesXslEquipInspectConfig::getId, excludeId); + } + if (tenantId != null) { + w.eq(MesXslEquipInspectConfig::getTenantId, tenantId); + } + return this.count(w) > 0; + } + + private static Integer resolveTenantId(MesXslEquipInspectConfig context) { + if (context != null && context.getTenantId() != null) { + return context.getTenantId(); + } + String ts = TenantContext.getTenant(); + if (oConvertUtils.isEmpty(ts)) { + try { + ts = TokenUtils.getTenantIdByRequest(SpringContextUtils.getHttpServletRequest()); + } catch (Exception ignored) { + // ignore + } + } + if (oConvertUtils.isEmpty(ts)) { + return null; + } + try { + return Integer.parseInt(ts); + } catch (NumberFormatException e) { + return null; + } + } + //update-end---author:jiangxh ---date:20260519 for：【MES】设备点检配置：同设备同类型（点检/保养）仅允许一条主数据----------- +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectConfigPage.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectConfigPage.java new file mode 100644 index 0000000..636230a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectConfigPage.java @@ -0,0 +1,12 @@ +package org.jeecg.modules.xslmes.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig; + +/** + * 设备点检配置主子保存页 VO，继承主表实体（含 {@link MesXslEquipInspectConfig#lineList} 明细）。 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class MesXslEquipInspectConfigPage extends MesXslEquipInspectConfig {} diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/docs/代码修改日志 b/jeecg-boot/jeecg-module-system/jeecg-system-biz/docs/代码修改日志 index 4fe8ec4..4bfac8a 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/docs/代码修改日志 +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/docs/代码修改日志 @@ -339,3 +339,26 @@ jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainI jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslInspectMaintainItemModal.vue jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslEquipmentTypeFilterSelectModal.vue jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslEquipmentSubPartFilterSelectModal.vue +-- author:jiangxh---date:20260519--for: 【MES】设备点检配置主子表（设备台账+类型唯一、明细从点检保养项目带出）--- +jeecg-boot/db/mes-xsl-equip-inspect-config-menu-permission.sql +jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_78__mes_xsl_equip_inspect_config.sql +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectConfig.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectConfigLine.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectConfigPage.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectConfigMapper.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectConfigLineMapper.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipInspectConfigService.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectConfigServiceImpl.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectConfigController.java +jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfigList.vue +jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.data.ts +jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.api.ts +jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipInspectConfigModal.vue +jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipmentLedgerSelectModal.vue +jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslInspectMaintainItemSelectModal.vue +-- author:jiangxh---date:20260519--for: 【MES】修复设备点检配置保存失败（Page VO 与主实体重复 lineList 导致编译错误）--- +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectConfigPage.java +-- author:jiangxh---date:20260519--for: 【MES】设备点检配置明细改为多选点检保养项目、禁用JVxe新增--- +jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipInspectConfigModal.vue +jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslInspectMaintainItemSelectModal.vue +jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.data.ts diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_78__mes_xsl_equip_inspect_config.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_78__mes_xsl_equip_inspect_config.sql new file mode 100644 index 0000000..4217b2f --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_78__mes_xsl_equip_inspect_config.sql @@ -0,0 +1,88 @@ +-- MES 设备点检配置（主子表）：与 jeecg-boot/db/mes-xsl-equip-inspect-config-menu-permission.sql 一致 +SET NAMES utf8mb4; + +CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_config` ( + `id` varchar(32) NOT NULL COMMENT '主键', + `equipment_ledger_id` varchar(32) NOT NULL COMMENT '设备台账主键 mes_xsl_equipment_ledger.id', + `equipment_name` varchar(500) DEFAULT NULL COMMENT '设备名称冗余', + `equipment_code` varchar(500) DEFAULT NULL COMMENT '设备编号冗余', + `config_type` varchar(500) NOT NULL COMMENT '配置类型（字典xslmes_im_item_category：inspect点检/maintain保养；同设备同类型唯一）', + `tenant_id` int DEFAULT NULL COMMENT '租户', + `sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门', + `create_by` varchar(500) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(500) DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）', + PRIMARY KEY (`id`), + KEY `idx_meic_tenant_equip_type` (`tenant_id`, `equipment_ledger_id`, `config_type`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备点检配置'; + +CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_config_line` ( + `id` varchar(32) NOT NULL COMMENT '主键', + `config_id` varchar(32) NOT NULL COMMENT '主表主键 mes_xsl_equip_inspect_config.id', + `inspect_maintain_item_id` varchar(32) NOT NULL COMMENT '点检及保养项目主键 mes_xsl_inspect_maintain_item.id', + `item_code` varchar(500) DEFAULT NULL COMMENT '点检项目编号冗余', + `item_name` varchar(500) DEFAULT NULL COMMENT '项目名称冗余', + `item_category` varchar(500) DEFAULT NULL COMMENT '项目类别冗余', + `item_type` varchar(500) DEFAULT NULL COMMENT '项目类型冗余', + `equipment_part_name` varchar(500) DEFAULT NULL COMMENT '设备部位名称冗余', + `equipment_sub_part_name` varchar(500) DEFAULT NULL COMMENT '设备小部位名称冗余', + `inspect_method` varchar(500) DEFAULT NULL COMMENT '点检方式冗余', + `judgment_criteria` varchar(500) DEFAULT NULL COMMENT '判断基准冗余', + `sort_no` int DEFAULT '0' COMMENT '排序号', + `create_by` varchar(500) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(500) DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + KEY `idx_meicl_config` (`config_id`), + KEY `idx_meicl_item` (`inspect_maintain_item_id`), + UNIQUE KEY `uk_meicl_config_item` (`config_id`, `inspect_maintain_item_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备点检配置明细'; + +SET @mes_tenant_id = 1002; + +SET @mes_equip_pid = ( + SELECT `id` FROM `sys_permission` + WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理' + LIMIT 1 +); +SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133'); + +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`) +VALUES ('1860000000000000148', @mes_equip_pid, '设备点检配置', '/xslmes/mesXslEquipInspectConfig', 'xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfigList', NULL, 1, NULL, '1', 12, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW()) +ON DUPLICATE KEY UPDATE +`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`), +`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`), +`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`), +`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:control-outlined'; + +UPDATE `sys_permission` SET `icon` = 'ant-design:control-outlined' WHERE `id` = '1860000000000000148' AND `del_flag` = 0; + +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES +('1860000000000000149', '1860000000000000148', '新增', 2, 'mes:mes_xsl_equip_inspect_config:add', '1', '1', 0, 'admin', NOW()), +('1860000000000000150', '1860000000000000148', '编辑', 2, 'mes:mes_xsl_equip_inspect_config:edit', '1', '1', 0, 'admin', NOW()), +('1860000000000000151', '1860000000000000148', '删除', 2, 'mes:mes_xsl_equip_inspect_config:delete', '1', '1', 0, 'admin', NOW()), +('1860000000000000152', '1860000000000000148', '批量删除', 2, 'mes:mes_xsl_equip_inspect_config:deleteBatch', '1', '1', 0, 'admin', NOW()), +('1860000000000000153', '1860000000000000148', '导出', 2, 'mes:mes_xsl_equip_inspect_config:exportXls', '1', '1', 0, 'admin', NOW()), +('1860000000000000154', '1860000000000000148', '导入', 2, 'mes:mes_xsl_equip_inspect_config:importExcel', '1', '1', 0, 'admin', NOW()) +ON DUPLICATE KEY UPDATE +`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), +`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`); + +INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`) +SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1' +FROM `sys_role` r +CROSS JOIN `sys_permission` p +WHERE r.`tenant_id` = @mes_tenant_id + AND r.`role_code` = 'admin' + AND p.`id` IN ( + '1860000000000000148', + '1860000000000000149', '1860000000000000150', '1860000000000000151', '1860000000000000152', + '1860000000000000153', '1860000000000000154' + ) + AND NOT EXISTS ( + SELECT 1 FROM `sys_role_permission` rp + WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id` + ); diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.api.ts b/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.api.ts new file mode 100644 index 0000000..027bb04 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.api.ts @@ -0,0 +1,51 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from '/@/hooks/web/useMessage'; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/xslmes/mesXslEquipInspectConfig/list', + save = '/xslmes/mesXslEquipInspectConfig/add', + edit = '/xslmes/mesXslEquipInspectConfig/edit', + deleteOne = '/xslmes/mesXslEquipInspectConfig/delete', + deleteBatch = '/xslmes/mesXslEquipInspectConfig/deleteBatch', + importExcel = '/xslmes/mesXslEquipInspectConfig/importExcel', + exportXls = '/xslmes/mesXslEquipInspectConfig/exportXls', + queryById = '/xslmes/mesXslEquipInspectConfig/queryById', + queryLineList = '/xslmes/mesXslEquipInspectConfig/queryLineListByConfigId', +} + +export const getExportUrl = Api.exportXls; +export const getImportUrl = Api.importExcel; + +export const list = (params) => defHttp.get({ url: Api.list, params }); + +export const queryById = (params: { id: string }) => defHttp.get({ url: Api.queryById, params }); + +export const queryLineListByConfigId = (params: { id: string }) => defHttp.get({ url: Api.queryLineList, params }); + +export const deleteOne = (params, handleSuccess) => { + return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => { + handleSuccess(); + }); +}; + +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => { + handleSuccess(); + }); + }, + }); +}; + +export const saveOrUpdate = (params, isUpdate) => { + const url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url, params }); +}; diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.data.ts b/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.data.ts new file mode 100644 index 0000000..d9c97f1 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.data.ts @@ -0,0 +1,86 @@ +import { BasicColumn, FormSchema } from '/@/components/Table'; +import { JVxeColumn, JVxeTypes } from '/@/components/jeecg/JVxeTable/types'; + +export const columns: BasicColumn[] = [ + { title: '设备名称', align: 'center', dataIndex: 'equipmentName', width: 160 }, + { title: '设备编号', align: 'center', dataIndex: 'equipmentCode', width: 140 }, + { title: '类型', align: 'center', dataIndex: 'configType_dictText', width: 90 }, + { title: '创建人', align: 'center', dataIndex: 'createBy', width: 100 }, + { + title: '创建时间', + align: 'center', + dataIndex: 'createTime', + width: 165, + customRender: ({ text }) => (!text ? '' : String(text).length > 19 ? String(text).substring(0, 19) : text), + }, +]; + +export const searchFormSchema: FormSchema[] = [ + { label: '设备名称', field: 'equipmentName', component: 'Input', colProps: { span: 6 } }, + { label: '设备编号', field: 'equipmentCode', component: 'Input', colProps: { span: 6 } }, + { + label: '类型', + field: 'configType', + component: 'JDictSelectTag', + componentProps: { dictCode: 'xslmes_im_item_category' }, + colProps: { span: 6 }, + }, +]; + +export const formSchema: FormSchema[] = [ + { label: '', field: 'id', component: 'Input', show: false }, + { label: '', field: 'equipmentLedgerId', component: 'Input', show: false }, + { + label: '设备名称', + field: 'equipmentName', + component: 'Input', + slot: 'equipmentLedgerPicker', + dynamicRules: () => [{ required: true, message: '请选择设备台账' }], + }, + { + label: '设备编号', + field: 'equipmentCode', + component: 'Input', + componentProps: { readonly: true, placeholder: '选择设备后自动带出' }, + }, + { + label: '类型', + field: 'configType', + component: 'JDictSelectTag', + required: true, + componentProps: { dictCode: 'xslmes_im_item_category', placeholder: '点检/保养' }, + }, +]; + +export const lineJVxeColumns: JVxeColumn[] = [ + { title: '', key: 'inspectMaintainItemId', type: JVxeTypes.hidden }, + { title: '点检项目编号', key: 'itemCode', type: JVxeTypes.normal, width: 130, disabled: true }, + { title: '项目名称', key: 'itemName', type: JVxeTypes.normal, width: 140, disabled: true }, + { + title: '项目类别', + key: 'itemCategory', + type: JVxeTypes.select, + width: 100, + disabled: true, + dictCode: 'xslmes_im_item_category', + }, + { + title: '项目类型', + key: 'itemType', + type: JVxeTypes.select, + width: 100, + disabled: true, + dictCode: 'xslmes_im_item_type', + }, + { title: '设备部位', key: 'equipmentPartName', type: JVxeTypes.normal, width: 120, disabled: true }, + { title: '设备小部位', key: 'equipmentSubPartName', type: JVxeTypes.normal, width: 120, disabled: true }, + { + title: '点检方式', + key: 'inspectMethod', + type: JVxeTypes.select, + width: 100, + disabled: true, + dictCode: 'xslmes_im_inspect_method', + }, + { title: '判断基准', key: 'judgmentCriteria', type: JVxeTypes.normal, width: 180, disabled: true }, +]; diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfigList.vue b/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfigList.vue new file mode 100644 index 0000000..8a7a751 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfigList.vue @@ -0,0 +1,132 @@ + + + diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipInspectConfigModal.vue b/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipInspectConfigModal.vue new file mode 100644 index 0000000..a3eed25 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipInspectConfigModal.vue @@ -0,0 +1,239 @@ + + + diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipmentLedgerSelectModal.vue b/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipmentLedgerSelectModal.vue new file mode 100644 index 0000000..023e99b --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipmentLedgerSelectModal.vue @@ -0,0 +1,93 @@ + + + diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslInspectMaintainItemSelectModal.vue b/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslInspectMaintainItemSelectModal.vue new file mode 100644 index 0000000..4e07ff2 --- /dev/null +++ b/jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslInspectMaintainItemSelectModal.vue @@ -0,0 +1,89 @@ + + +