From d5bd77f78ac51618a70352ff49d362b111f85871 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期六, 26 八月 2023 18:26:07 +0800
Subject: [PATCH] 设备分类表引用源头更新为mom_eam_equipment_category
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml | 4 ++--
db/eam/eam_permission.sql | 25 -------------------------
2 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/db/eam/eam_permission.sql b/db/eam/eam_permission.sql
index 34b4d36..665b156 100644
--- a/db/eam/eam_permission.sql
+++ b/db/eam/eam_permission.sql
@@ -304,31 +304,6 @@
ALTER TABLE [dbo].[mom_base_enterprise_administrator] SET (LOCK_ESCALATION = TABLE)
GO
-CREATE TABLE [dbo].[mom_base_equipment_category] (
- [id] nvarchar(32) COLLATE Chinese_PRC_CI_AS NOT NULL,
- [code] nvarchar(32) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- [name] nvarchar(64) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- [parent_id] nvarchar(64) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- [remark] nvarchar(255) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- [equipment_category_uda1] nvarchar(64) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- [equipment_category_uda2] nvarchar(64) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- [equipment_category_uda3] nvarchar(64) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- [equipment_category_uda4] nvarchar(64) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- [equipment_category_uda5] nvarchar(64) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- [create_by] nvarchar(32) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- [create_time] datetime2(0) DEFAULT NULL NULL,
- [update_by] nvarchar(32) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- [update_time] datetime2(0) DEFAULT NULL NULL,
- [del_flag] nvarchar(32) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- [enterprise_id] nvarchar(32) COLLATE Chinese_PRC_CI_AS DEFAULT NULL NULL,
- CONSTRAINT [PK_mom_base_equipment_category_id] PRIMARY KEY CLUSTERED ([id])
- WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
- ON [PRIMARY]
- )
- GO
-
-ALTER TABLE [dbo].[mom_base_equipment_category] SET (LOCK_ESCALATION = TABLE)
- GO
CREATE TABLE [dbo].[mom_base_equipment_supplier] (
[id] nvarchar(64) COLLATE Chinese_PRC_CI_AS NOT NULL,
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml
index 3514df8..1d2d2bc 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml
@@ -24,7 +24,7 @@
t1.remark remark,
t1.parent_factory_model_id parentFactoryModelId
from mom_base_work_center t1 left join
- (select * from mom_base_equipment_category where del_flag=0) t2
+ (select * from mom_eam_equipment_category where del_flag=0) t2
on t1.equipment_team_id = t2.id
left join(select * from mom_sys_data_version where del_flag=0) t3
on t1.data_version_id = t3.id
@@ -73,7 +73,7 @@
id id,
code code,
name name
- from mom_base_equipment_category
+ from mom_eam_equipment_category
where enterprise_id=#{enterpriseId}
and del_flag = 0
</select>
--
Gitblit v1.9.3