From 7c77e020b81e42fb65aa966742ff7c93e73668e1 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期一, 26 五月 2025 17:57:55 +0800
Subject: [PATCH] 设备调拨功能增加
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
index a1498cd..3b4b965 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.dnc.service.impl;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -63,6 +64,9 @@
private IDispatchFileService dispatchFileService;
@Autowired
private ISysParamsService sysParamsService;
+ @Autowired
+ @Lazy
+ private IComponentInfoService componentInfoService;
/*澶囦唤澶勭悊*/
@Override
@@ -99,6 +103,19 @@
docRelative.setAttributionType(uploadRequest.getAttributionType());
docRelative.setClassificationId(docClass.getClassificationId());
boolean b = docRelativeService.save(docRelative);
+ if (uploadRequest.getAttributionType()==2){
+ //鏌ヨ鍊熺敤鐨勯儴浠�
+ List<ComponentInfo> borrowComponentInfoList=componentInfoService.list(new QueryWrapper<ComponentInfo>().eq("borrow_id", uploadRequest.getAttributionId()));
+ if (!borrowComponentInfoList.isEmpty()) {
+ borrowComponentInfoList.forEach(item->{
+ DocRelative borrowDocRelative = new DocRelative();
+ BeanUtil.copyProperties(docRelative,borrowDocRelative);
+ borrowDocRelative.setAttributionId(item.getComponentId());
+ borrowDocRelative.setId(null);
+ docRelativeService.save(borrowDocRelative);
+ });
+ }
+ }
if(!b)
ExceptionCast.cast(DocumentCode.DOC_UPLOAD_ERROR);
DocFile docFile = new DocFile();
@@ -146,7 +163,7 @@
if (sysParams ==null){
throw new JeecgBootException("鏈厤缃鍏C涓庣數瀛愬浘鐗堟槸鍚﹁Е鍙戝绛炬祦绋嬶紝璇疯仈绯荤鐞嗗憳");
}else {
- if (saveBool&&sysParams.getSettingValue().equals("1")&&uploadRequest.getDocClassCode().equals("NC")){
+ if (saveBool&&sysParams.getSettingValue().equals("1")){
//瑙﹀彂瀹＄
DispatchFile dispatchFile = new DispatchFile();
dispatchFile.setDocId(docInfo.getDocId());
@@ -318,7 +335,7 @@
@Override
@Transactional(rollbackFor = {Exception.class})
- public boolean deleteDocInfo(String id) {
+ public boolean deleteDocInfo(String id,String attrType,String attrId) {
if(!ValidateUtil.validateString(id))
ExceptionCast.cast(CommonCode.INVALID_PARAM);
DocInfo en = super.getById(id);
@@ -326,6 +343,20 @@
ExceptionCast.cast(DocumentCode.DOC_NOT_EXIST);
if(en.getDocStatus() != 1)
ExceptionCast.cast(DocumentCode.DOC_DEL_ERROR);
+ //鏌ヨ瀵瑰簲鐨勫叧绯�
+ if ("2".equals(attrType)) {
+ //鍒ゆ柇閮ㄤ欢寮曠敤
+ ComponentInfo componentInfo=componentInfoService.getById(attrId);
+ if(componentInfo!=null&&componentInfo.getBorrowId()!=null){
+ //鍊熺敤鐨勯儴浠讹紝鍙垹闄よ嚜宸辩殑鍏崇郴
+ DocRelative docRelative=docRelativeService.getOne(new QueryWrapper<DocRelative>()
+ .eq("attribution_id", attrId).eq("attribution_type", 2).eq("doc_id",id));
+ if(docRelative!=null){
+ docRelativeService.removeById(docRelative.getId());
+ return true;
+ }
+ }
+ }
FileOperate operate = fileOperateService.getByDocId(id);
if(operate != null)
ExceptionCast.cast(DocumentCode.DOC_IS_OPERATING);
@@ -896,11 +927,11 @@
@Override
@Transactional(rollbackFor = {Exception.class})
- public boolean batchRemoveDocInfo(String[] docIds) {
+ public boolean batchRemoveDocInfo(String[] docIds,String attrType,String attrId) {
if(docIds == null || docIds.length < 1)
ExceptionCast.cast(CommonCode.INVALID_PARAM);
for(String docId : docIds) {
- this.deleteDocInfo(docId);
+ this.deleteDocInfo(docId,attrType,attrId);
}
return true;
}
--
Gitblit v1.9.3