From 4a42e8745fe27cf8edf500eaa5b2d65e080c09b0 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 06 五月 2025 16:10:34 +0800
Subject: [PATCH] 住掉无用的仓库管理代码(防类名冲突)、start模块添加tms模块依赖
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 1dea4cc..b508ae8 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -103,6 +103,7 @@
@Override
public IPage<EamEquipment> queryPageList(IPage<EamEquipment> page, EamEquipmentQuery eamEquipment) {
QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0);
//鐢ㄦ埛鏁版嵁鏉冮檺
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
@@ -142,6 +143,9 @@
if (StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())) {
queryWrapper.like("e.equipment_category", eamEquipment.getEquipmentCategory());
}
+ if (StringUtils.isNotBlank(eamEquipment.getId())) {
+ queryWrapper.eq("e.id", eamEquipment.getId());
+ }
//鎺掑簭
if (StringUtils.isNotBlank(eamEquipment.getColumn()) && StringUtils.isNotBlank(eamEquipment.getOrder())) {
//queryWrapper.like("column", eamEquipment.getColumn());
@@ -166,7 +170,15 @@
}
@Override
- public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize) {
+ public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id) {
+ if (StringUtils.isNotBlank(id)) {
+ EamEquipment eamEquipment = eamEquipmentMapper.selectById(id);
+ if (eamEquipment != null) {
+ List<EquipmentSearchResult> resultList = new ArrayList<>();
+ resultList.add(new EquipmentSearchResult(eamEquipment));
+ return resultList;
+ }
+ }
IPage<EamEquipment> page = new Page<>(1, pageSize);
QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
//鐢ㄦ埛鏁版嵁鏉冮檺
@@ -186,6 +198,7 @@
queryWrapper.like("equipment_code", keyword);
queryWrapper.or().like("equipment_name", keyword);
}
+ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
IPage<EamEquipment> pageResult = eamEquipmentMapper.queryPageList(page, queryWrapper);
if (pageResult != null && CollectionUtil.isNotEmpty(pageResult.getRecords())) {
List<EquipmentSearchResult> resultList = new ArrayList<>();
@@ -197,6 +210,31 @@
return Collections.emptyList();
}
+ @Override
+ public EamEquipment selectByEquipmentCode(String equipmentCode) {
+ if (StringUtils.isBlank(equipmentCode)) {
+ return null;
+ }
+ QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return null;
+ }
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=org_id", sysUser.getId());
+ }
+ queryWrapper.eq("equipment_code", equipmentCode);
+ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+
+ return eamEquipmentMapper.selectOne(queryWrapper);
+ }
+
/**
* 鑾峰彇鎵�鏈夌殑浜х嚎id锛堝寘鍚墍鏈変笂绾э級
*/
--
Gitblit v1.9.3