diff --git a/jeecg-boot/db/mes-xsl-equipment-part-menu-permission.sql b/jeecg-boot/db/mes-xsl-equipment-part-menu-permission.sql index 0263963..24a2dc9 100644 --- a/jeecg-boot/db/mes-xsl-equipment-part-menu-permission.sql +++ b/jeecg-boot/db/mes-xsl-equipment-part-menu-permission.sql @@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_part` ( `id` varchar(32) NOT NULL COMMENT '主键', `equipment_category_id` varchar(32) NOT NULL COMMENT '所属设备类别主键 mes_xsl_equipment_category.id', `equipment_category_name` varchar(128) DEFAULT NULL COMMENT '设备类别名称冗余展示', - `dept_name` varchar(128) NOT NULL COMMENT '部门名称', + `part_name` varchar(128) NOT NULL COMMENT '部位名称', `part_code` varchar(64) NOT NULL COMMENT '部位代码（同租户未删除数据中唯一）', `part_description` varchar(500) DEFAULT NULL COMMENT '部位描述', `enable_status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_unit_status：0启用1停用）', diff --git a/jeecg-boot/db/mes-xsl-equipment-part.sql b/jeecg-boot/db/mes-xsl-equipment-part.sql index 2bc229a..087561f 100644 --- a/jeecg-boot/db/mes-xsl-equipment-part.sql +++ b/jeecg-boot/db/mes-xsl-equipment-part.sql @@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_part` ( `id` varchar(32) NOT NULL COMMENT '主键', `equipment_category_id` varchar(32) NOT NULL COMMENT '所属设备类别主键 mes_xsl_equipment_category.id', `equipment_category_name` varchar(128) DEFAULT NULL COMMENT '设备类别名称冗余展示', - `dept_name` varchar(128) NOT NULL COMMENT '部门名称', + `part_name` varchar(128) NOT NULL COMMENT '部位名称', `part_code` varchar(64) NOT NULL COMMENT '部位代码（同租户未删除数据中唯一）', `part_description` varchar(500) DEFAULT NULL COMMENT '部位描述', `enable_status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_unit_status：0启用1停用）', diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentPartController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentPartController.java index 355c25e..1a1314d 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentPartController.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentPartController.java @@ -195,8 +195,8 @@ public class MesXslEquipmentPartController extends JeecgControllerpart_name，实体partName） --- +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipmentPart.java +jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentPartController.java +jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_58__mes_xsl_equipment_part_dept_name_to_part_name.sql +jeecg-boot/db/mes-xsl-equipment-part.sql +jeecg-boot/db/mes-xsl-equipment-part-menu-permission.sql +jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPart.data.ts diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_58__mes_xsl_equipment_part_dept_name_to_part_name.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_58__mes_xsl_equipment_part_dept_name_to_part_name.sql new file mode 100644 index 0000000..a2b6a54 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_58__mes_xsl_equipment_part_dept_name_to_part_name.sql @@ -0,0 +1,16 @@ +-- 设备部位：部门名称字段更名为部位名称（dept_name -> part_name） +SET @col_exists := ( + SELECT COUNT(1) + FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME = 'mes_xsl_equipment_part' + AND COLUMN_NAME = 'dept_name' +); +SET @ddl_sql := IF( + @col_exists > 0, + 'ALTER TABLE `mes_xsl_equipment_part` CHANGE COLUMN `dept_name` `part_name` varchar(128) NOT NULL COMMENT ''部位名称''', + 'SELECT 1' +); +PREPARE stmt_mep_part_name FROM @ddl_sql; +EXECUTE stmt_mep_part_name; +DEALLOCATE PREPARE stmt_mep_part_name; diff --git a/jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPart.data.ts b/jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPart.data.ts index 370f455..0a787c9 100644 --- a/jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPart.data.ts +++ b/jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPart.data.ts @@ -4,7 +4,7 @@ import { checkPartCode } from './MesXslEquipmentPart.api'; export const columns: BasicColumn[] = [ { title: '部位代码', align: 'center', dataIndex: 'partCode', width: 120 }, { title: '类别名称', align: 'center', dataIndex: 'equipmentCategoryName', width: 160 }, - { title: '部门名称', align: 'center', dataIndex: 'deptName', width: 140 }, + { title: '部位名称', align: 'center', dataIndex: 'partName', width: 140 }, { title: '部位描述', align: 'center', dataIndex: 'partDescription', width: 200, ellipsis: true }, { title: '是否启用', align: 'center', dataIndex: 'enableStatus_dictText', width: 100 }, { title: '创建人', align: 'center', dataIndex: 'createBy', width: 100 }, @@ -21,7 +21,7 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { label: '部位代码', field: 'partCode', component: 'Input', colProps: { span: 6 } }, { label: '类别名称', field: 'equipmentCategoryName', component: 'Input', colProps: { span: 6 } }, - { label: '部门名称', field: 'deptName', component: 'Input', colProps: { span: 6 } }, + { label: '部位名称', field: 'partName', component: 'Input', colProps: { span: 6 } }, { label: '是否启用', field: 'enableStatus', @@ -66,11 +66,11 @@ export const formSchema: FormSchema[] = [ slot: 'equipmentCategoryPicker', }, { - label: '部门名称', - field: 'deptName', + label: '部位名称', + field: 'partName', required: true, component: 'Input', - componentProps: { placeholder: '请输入部门名称' }, + componentProps: { placeholder: '请输入部位名称' }, }, { label: '部位描述', field: 'partDescription', component: 'InputTextArea', componentProps: { rows: 3 } }, {