From 671c15d828414effb772820ac71ba33ee91c0a6a Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 15 九月 2022 17:36:16 +0800
Subject: [PATCH] 下载加&&
---
src/main/java/com/whyc/service/ProductBomHistoryService.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomHistoryService.java b/src/main/java/com/whyc/service/ProductBomHistoryService.java
index aff6e73..c40704f 100644
--- a/src/main/java/com/whyc/service/ProductBomHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductBomHistoryService.java
@@ -116,7 +116,7 @@
qwrapper.last("limit 1");
AttachLock attachLock=attachLockMapper.selectOne(qwrapper);
if(attachLock!=null){
- bomH.setDwgUrl("");
+ bomH.setDwgUrl("&&");
}
}
});
@@ -162,6 +162,17 @@
//澶勭悊瀛樺湪鍏宠仈鍏崇郴鐨勭墿鏂�
List<ProductBomHistory> endList=new ArrayList<>();
list.stream().forEach(bomHistory -> {
+ if(bomHistory.getDwgUrl()!=null){
+ QueryWrapper qwrapper=new QueryWrapper();
+ qwrapper.eq("material_id",bomHistory.getMaterialId());
+ qwrapper.eq("attach_name",bomHistory.getDwgUrl().substring(bomHistory.getDwgUrl().lastIndexOf("\\")+1));
+ qwrapper.eq("lock_flag",1);
+ qwrapper.last("limit 1");
+ AttachLock attachLock=attachLockMapper.selectOne(qwrapper);
+ if(attachLock!=null){
+ bomHistory.setDwgUrl("&&");
+ }
+ }
bomHistory.setConnFlag(0);
endList.add(bomHistory);
if(bomHistory.getMaterials()!=null&&bomHistory.getMaterials().size()>0){
@@ -241,7 +252,7 @@
ProductBomHistory bomHistory= (ProductBomHistory) list.get(i);
String dwgUrl=bomHistory.getDwgUrl();
- if((dwgUrl!=null)&&(!dwgUrl.isEmpty())){
+ if((dwgUrl!=null)&&(!dwgUrl.isEmpty())&&(!dwgUrl.equals("&&"))){
File sourceFile=new File(fileDirName+ File.separator+dwgUrl);
bomService.copyFile(sourceFile,rootFace);
}
--
Gitblit v1.9.1