From 103f52ade0f77e420dec306ea3b51d0a3c0ac3ee Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 19 三月 2025 13:23:12 +0800
Subject: [PATCH] art: 设备管理-系统业务编码生成，工艺参数维护功能修改
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java | 181 +++++++++++++++++----------------------------
1 files changed, 69 insertions(+), 112 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
index 7b67da4..ef03230 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
@@ -1,12 +1,13 @@
package org.jeecg.modules.dnc.service.impl;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections4.ListUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
-
+import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.exception.ExceptionCast;
import org.jeecg.modules.dnc.mapper.ComponentInfoMapper;
import org.jeecg.modules.dnc.mapper.PartsInfoMapper;
@@ -15,18 +16,11 @@
import org.jeecg.modules.dnc.response.PartsInfoCode;
import org.jeecg.modules.dnc.response.ProductInfoCode;
import org.jeecg.modules.dnc.response.UcenterCode;
-
import org.jeecg.modules.dnc.service.*;
-import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.dnc.utils.ValidateUtil;
-
-import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;
-import org.apache.commons.collections4.ListUtils;
-
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -44,16 +38,17 @@
@Autowired
private IPartsPermissionService partsPermissionService;
@Autowired
- private IPermissionStreamService permissionStreamService;
+ private IPermissionStreamNewService permissionStreamNewService;
@Autowired
private IPartsDepartmentService partsDepartmentService;
@Autowired
- @Lazy
- private IProcessStreamService processStreamService;
+ private IProcessSpecVersionService processSpecVersionService;
@Autowired
- private IDocInfoService docInfoService;
+ private IDocRelativeService iDocRelativeService;
@Autowired
- private INcLogInfoService iNcLogInfoService;
+ private IProductPermissionService productPermissionService;
+ @Autowired
+ private IProductMixService productMixService;
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addPartsInfo(PartsInfo partsInfo) {
@@ -81,30 +76,20 @@
if(componentInfo == null)
ExceptionCast.cast(PartsInfoCode.PARTS_COMPONENT_NONE);
partsInfo.setPartsStatus(1);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(2);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("闆朵欢鍚嶇О锛�"+partsInfo.getPartsName()+"锛岄浂浠朵唬鍙凤細"+partsInfo.getPartsCode());
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
boolean b = super.save(partsInfo);
- List<PermissionStream> oldDepartPermList = permissionStreamService.getByComponentId(componentInfo.getProductId(), componentInfo.getComponentId());
+ List<PermissionStreamNew> oldDepartPermList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(componentInfo.getComponentId(),"2","1");
if(oldDepartPermList != null && !oldDepartPermList.isEmpty()) {
List<PartsDepartment> partsDepartmentList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
oldDepartPermList.forEach(item -> {
PartsDepartment pd = new PartsDepartment();
pd.setDepartId(item.getDepartId());
pd.setPartsId(partsInfo.getPartsId());
partsDepartmentList.add(pd);
- PermissionStream perm = new PermissionStream();
+ PermissionStreamNew perm = new PermissionStreamNew();
perm.setDepartId(item.getDepartId());
- perm.setProductId(partsInfo.getProductId());
- perm.setComponentId(partsInfo.getComponentId());
- perm.setPartsId(partsInfo.getPartsId());
+ perm.setBusinessId(partsInfo.getPartsId());
+ perm.setBusinessType("3");
permissionStreamList.add(perm);
});
if(!partsDepartmentList.isEmpty()) {
@@ -113,37 +98,27 @@
ExceptionCast.cast(CommonCode.FAIL);
}
if(!permissionStreamList.isEmpty()) {
- b = permissionStreamService.saveBatch(permissionStreamList);
+ b = permissionStreamNewService.saveBatch(permissionStreamList);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
}
}
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
- PartsPermission permission = new PartsPermission();
- permission.setPartsId(partsInfo.getPartsId());
- permission.setUserId(userId);
- b = partsPermissionService.save(permission);
- if(!b)
- ExceptionCast.cast(CommonCode.FAIL);
-// if(!b)
-// ExceptionCast.cast(CommonCode.FAIL);
+ b = productPermissionService.add(partsInfo.getPartsId(), userId,"3");
+ if (!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
+ }
+ //娣诲姞缁撴瀯鏍�
+ ProductMix productMix = new ProductMix(Long.parseLong(partsInfo.getPartsId()),Long.parseLong(partsInfo.getComponentId())
+ ,partsInfo.getPartsName(),partsInfo.getPartsCode(),3);
+ productMixService.save(productMix);
//娣诲姞鐢ㄦ埛鏉冮檺
- PermissionStream stream = new PermissionStream();
- stream.setProductId(partsInfo.getProductId());
- stream.setComponentId(partsInfo.getComponentId());
- stream.setPartsId(partsInfo.getPartsId());
+ PermissionStreamNew stream = new PermissionStreamNew();
+ stream.setBusinessId(partsInfo.getPartsId());
+ stream.setBusinessType("3");
stream.setUserId(userId);
-// //娣诲姞鏃ュ織
-// NcLogInfo ncLogInfogx = new NcLogInfo();
-// //妯″潡
-// ncLogInfogx.setModuleInfo("浜у搧缁撴瀯鏍�");
-// //绫诲瀷
-// ncLogInfogx.setOperateType(2);
-// //鏃ュ織鍐呭
-// ncLogInfogx.setLogContent("闆朵欢鍚嶇О锛�"+partsInfo.getPartsName()+"鐢熸垚榛樿宸ュ簭锛屽伐搴忓彿锛�"+processStream.getProcessCode());
-// iNcLogInfoService.saveLogNcInfos(ncLogInfogx);
- return permissionStreamService.save(stream);
+ return permissionStreamNewService.save(stream);
}
@Override
@@ -162,18 +137,12 @@
partsInfo.setPartsStatus(null);
partsInfo.setProductId(null);
partsInfo.setComponentId(null);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(3);
- //淇敼淇濆瓨澶囨敞
- ncLogInfo.setRemark(JSONObject.toJSONString(en));
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("淇敼閮ㄤ欢鍚嶇О锛�"+productInfoMapper.selectById(en.getProductId()).getProductName()+"瀛愰泦闆朵欢");
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
boolean b = super.updateById(partsInfo);
+ //鍚屾淇敼缁撴瀯鏍�
+ ProductMix productMix = productMixService.getById(Long.parseLong(id));
+ productMix.setName(partsInfo.getPartsName());
+ productMix.setCode(partsInfo.getPartsCode());
+ productMixService.updateById(productMix);
if(!b)
return false;
PartsPermission permission = partsPermissionService.getByPartsIdAndUserId(id, userId);
@@ -185,14 +154,13 @@
if(!b)
return false;
}
- PermissionStream stream = permissionStreamService.getByPartsIdAndUserId(en.getProductId(), en.getComponentId(), id, userId);
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId( id, userId,"3");
if(stream == null) {
- stream = new PermissionStream();
- stream.setProductId(en.getProductId());
- stream.setComponentId(en.getComponentId());
- stream.setPartsId(id);
+ stream = new PermissionStreamNew();
+ stream.setBusinessId(id);
+ stream.setBusinessType("3");
stream.setUserId(userId);
- return permissionStreamService.save(stream);
+ return permissionStreamNewService.save(stream);
}
return b;
}
@@ -248,10 +216,10 @@
b = partsDepartmentService.deleteByPartsId(item.getPartsId());
if(!b)
ExceptionCast.cast(PartsInfoCode.PARTS_DELETE_ERROR);
- b = permissionStreamService.deleteUserPermsByPartsId(item.getProductId(), item.getComponentId(), item.getPartsId());
+ b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(item.getPartsId(),"3","0");
if(!b)
ExceptionCast.cast(PartsInfoCode.PARTS_DELETE_ERROR);
- b = permissionStreamService.deleteDepartPermsByPartsId(item.getProductId(), item.getComponentId(), item.getPartsId());
+ b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(item.getPartsId(),"3","1");
if(!b)
ExceptionCast.cast(PartsInfoCode.PARTS_DELETE_ERROR);
b = super.removeById(item.getPartsId());
@@ -269,34 +237,30 @@
PartsInfo partsInfo = super.getById(partsId);
if(partsInfo == null)
ExceptionCast.cast(PartsInfoCode.PARTS_NOT_EXIST);
- List<ProcessStream> processStreams = processStreamService.findByPartsId(partsId);
- if(processStreams != null && !processStreams.isEmpty())
+ List<ProcessSpecVersion> processSpecVersions = processSpecVersionService.getByPartsId(partsId);
+ if(processSpecVersions != null && !processSpecVersions.isEmpty())
ExceptionCast.cast(PartsInfoCode.PARTS_PROCESS_EXIST);
boolean b = partsPermissionService.deleteByPartsId(partsInfo.getPartsId());
+ //楠岃瘉鏄惁瀛樺湪鏂囨。
+ List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type","3").eq("attribution_id",partsId));
+ if (!docRelativeList.isEmpty()){
+ ExceptionCast.cast(PartsInfoCode.PARTS_DOC_EXIST);
+ }
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
b = partsDepartmentService.deleteByPartsId(partsInfo.getPartsId());
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
- b = permissionStreamService.deleteUserPermsByPartsId(partsInfo.getProductId(), partsInfo.getComponentId(), partsInfo.getPartsId());
+ b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(partsId,"3","0");
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
- b = permissionStreamService.deleteDepartPermsByPartsId(partsInfo.getProductId(), partsInfo.getComponentId(), partsInfo.getPartsId());
+ b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(partsId,"3","1");
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
- b = docInfoService.deleteByPartsId(partsInfo.getPartsId());
- if(!b)
+ b = productMixService.removeById(partsId);
+ if (!b)
ExceptionCast.cast(CommonCode.FAIL);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(4);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("闆朵欢鍚嶇О锛�"+partsInfo.getPartsName());
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
- return super.removeById(partsInfo.getPartsId());
+ return super.removeById(partsId);
}
@Override
@@ -305,7 +269,7 @@
if(partsInfo == null || userList == null || userList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<PartsPermission> permissionList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
userList.forEach(item -> {
PartsPermission en = partsPermissionService.getByPartsIdAndUserId(partsInfo.getPartsId(), item.getId());
if(en == null) {
@@ -314,13 +278,12 @@
en.setPartsId(partsInfo.getPartsId());
permissionList.add(en);
}
- PermissionStream stream = permissionStreamService.getByPartsIdAndUserId(partsInfo.getProductId(), partsInfo.getComponentId(), partsInfo.getPartsId(), item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(partsInfo.getPartsId(), item.getId(),"3");
if(stream == null) {
- stream = new PermissionStream();
+ stream = new PermissionStreamNew();
stream.setUserId(item.getId());
- stream.setProductId(partsInfo.getProductId());
- stream.setComponentId(partsInfo.getComponentId());
- stream.setPartsId(partsInfo.getPartsId());
+ stream.setBusinessId(partsInfo.getPartsId());
+ stream.setBusinessType("3");
permissionStreamList.add(stream);
}
});
@@ -331,7 +294,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.saveBatch(permissionStreamList);
+ boolean b = permissionStreamNewService.saveBatch(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
@@ -345,21 +308,18 @@
if(partsInfo == null || userList == null || userList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<PartsPermission> permissionList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
userList.forEach(item -> {
PartsPermission en = partsPermissionService.getByPartsIdAndUserId(partsInfo.getPartsId(), item.getId());
if(en != null) {
permissionList.add(en);
}
- PermissionStream stream = permissionStreamService.getByPartsIdAndUserId(partsInfo.getProductId(), partsInfo.getComponentId(), partsInfo.getPartsId(), item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(partsInfo.getPartsId(), item.getId(),"3");
if(stream != null) {
permissionStreamList.add(stream);
}
});
//娓呯┖鐢ㄦ埛鏉冮檺鏍￠獙
- /*List<PartsPermission> exitsList = partsPermissionService.getByPartsId(partsInfo.getPartsId());
- if(exitsList.size() <= permissionList.size())
- ExceptionCast.cast(PartsInfoCode.PARTS_USER_NONE);*/
if(!permissionList.isEmpty()) {
boolean b = partsPermissionService.removeByCollection(permissionList);
if(!b) {
@@ -367,7 +327,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.removeByCollection(permissionStreamList);
+ boolean b = permissionStreamNewService.deletePermissionStreamNewByList(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
@@ -381,7 +341,7 @@
if(partsInfo == null || departmentList == null || departmentList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<PartsDepartment> partsDepartments = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
departmentList.forEach(item -> {
PartsDepartment en = partsDepartmentService.getByPartsIdAndDepartId(partsInfo.getPartsId(), item.getId());
if(en == null) {
@@ -390,14 +350,12 @@
en.setPartsId(partsInfo.getPartsId());
partsDepartments.add(en);
}
- PermissionStream stream = permissionStreamService.getByPartsIdAndDepartId(partsInfo.getProductId(), partsInfo.getComponentId(),
- partsInfo.getPartsId(), item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(partsInfo.getPartsId(), item.getId(),"3");
if(stream == null) {
- stream = new PermissionStream();
+ stream = new PermissionStreamNew();
stream.setDepartId(item.getId());
- stream.setProductId(partsInfo.getProductId());
- stream.setComponentId(partsInfo.getComponentId());
- stream.setPartsId(partsInfo.getPartsId());
+ stream.setBusinessId(partsInfo.getPartsId());
+ stream.setBusinessType("3");
permissionStreamList.add(stream);
}
});
@@ -408,7 +366,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.saveBatch(permissionStreamList);
+ boolean b = permissionStreamNewService.saveBatch(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
@@ -422,14 +380,13 @@
if(partsInfo == null || departmentList == null || departmentList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<PartsDepartment> partsDepartments = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
departmentList.forEach(item -> {
PartsDepartment en = partsDepartmentService.getByPartsIdAndDepartId(partsInfo.getPartsId(), item.getId());
if(en != null) {
partsDepartments.add(en);
}
- PermissionStream stream = permissionStreamService.getByPartsIdAndDepartId(partsInfo.getProductId(), partsInfo.getComponentId(),
- partsInfo.getPartsId(), item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(partsInfo.getPartsId(), item.getId(),"3");
if(stream != null) {
permissionStreamList.add(stream);
}
@@ -441,7 +398,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.removeByCollection(permissionStreamList);
+ boolean b = permissionStreamNewService.deletePermissionStreamNewByList(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
--
Gitblit v1.9.3