From 438b6be5ea9ed484b50a45a0f210b80180473491 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 11 二月 2025 11:51:45 +0800
Subject: [PATCH] dnc与mdc部门进行整合 使用Mdc部门进行处理 修改所属部门为所属车间 修改yml文件数据库地址
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocRelativeServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocRelativeServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocRelativeServiceImpl.java
index 2944228..2463c9b 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocRelativeServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocRelativeServiceImpl.java
@@ -19,6 +19,9 @@
import org.jeecg.modules.dnc.utils.file.FileUtilS;
import org.apache.commons.lang3.StringUtils;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -39,6 +42,10 @@
private String localFilePath;
@Autowired
private IDncPassLogService dncPassLogService;
+ @Autowired
+ private IMdcEquipmentService iMdcEquipmentService;
+ @Autowired
+ private IMdcProductionService iMdcProductionService;
@Override
@@ -80,6 +87,7 @@
if (b && docRel) {
DocInfo info = docInfoMapper.selectById(docId);
+ //todo 淇敼涓簃dc璁惧
DeviceInfo deviceInfo = deviceInfoService.getById(attrId);
List<String> strings = deviceGroupService.findListParentTreeAll(deviceInfo.getGroupId());
if (strings != null && !strings.isEmpty()) {
@@ -150,7 +158,7 @@
@Override
@Transactional(rollbackFor = {Exception.class})
- public List<DeviceInfo> findDeviceByDocId(String docId) {
+ public List<MdcEquipment> findDeviceByDocId(String docId) {
if(!ValidateUtil.validateString(docId))
ExceptionCast.cast(CommonCode.INVALID_PARAM);
return super.getBaseMapper().findDeviceByDocId(docId);
--
Gitblit v1.9.3