From 8353919bb565899a535d1cd633dfa3fd87f629a2 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 25 八月 2022 09:20:16 +0800
Subject: [PATCH] 产品bom审批更新
---
src/main/java/com/whyc/service/WorksheetLinkService.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetLinkService.java b/src/main/java/com/whyc/service/WorksheetLinkService.java
index 3a35c0d..bb8d9ff 100644
--- a/src/main/java/com/whyc/service/WorksheetLinkService.java
+++ b/src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -164,9 +164,7 @@
//瀛樹簬浜у搧涓�,bom鍐呮病瀵瑰簲
List<String> productUrlList = new LinkedList<>();
- List<String> productUrlNameList = new LinkedList<>();
- List<String> materialUrlNameList = new LinkedList<>();
- List<String> picUrlNameList = new LinkedList<>();
+ List<Material> materialDwgUrlNameList = new LinkedList<>();
fileUrlList = FileUtil.getStaticFilePath(file,fileUrlList);
//鍥剧焊dwg 瀛愪欢/浜у搧
@@ -177,9 +175,16 @@
boolean existFlag = false;
for (ProductBomApproving approving :approvingList){
String filename = dwgUrl.substring(dwgUrl.lastIndexOf(File.separator) + 1, dwgUrl.length() - 4);
+ String fileFullName = dwgUrl.substring(dwgUrl.lastIndexOf(File.separator) + 1);
if(approving.getSubModel().toUpperCase().equals(filename.toUpperCase())){
materialUrlList.add(dwgUrl);
existFlag = true;
+
+ Material temp = new Material();
+ temp.setSubModel(approving.getSubModel());
+ temp.setNotes(CommonUtil.getProjectDir() + File.separator + "doc_file" + File.separator + "material"
+ + File.separator + fileFullName);
+ materialDwgUrlNameList.add(temp);
break;
}
}
@@ -192,8 +197,10 @@
picUrlList.forEach(picUrl->{
for (ProductBomApproving approving :approvingList){
String filename = picUrl.substring(picUrl.lastIndexOf(File.separator) + 1, picUrl.length() - 4);
+ String fileFullName = picUrl.substring(picUrl.lastIndexOf(File.separator) + 1);
if(approving.getSubModel().toUpperCase().equals(filename.toUpperCase())){
- picUrlNameList.add(picUrl);
+ approving.setPictureUrl(CommonUtil.getProjectDir() + File.separator + "doc_file" + File.separator + "material"
+ + File.separator + fileFullName);
break;
}
}
@@ -222,7 +229,7 @@
}
productUrlList.forEach(productUrl->{
String dwgName = productUrl.substring(productUrl.lastIndexOf(File.separator) + 1, productUrl.length() - 4);
- productUrlNameList.add(dwgName);
+
try {
FileCopyUtils.copy(new File(productUrl),new File(productDir+File.separator+dwgName+".dwg"));
} catch (IOException e) {
@@ -232,7 +239,6 @@
materialUrlList.forEach(materialUrl->{
String dwgName = materialUrl.substring(materialUrl.lastIndexOf(File.separator) + 1, materialUrl.length() - 4);
- materialUrlNameList.add(dwgName);
try {
FileCopyUtils.copy(new File(materialUrl),new File(materialDir+File.separator+dwgName+".dwg"));
} catch (IOException e) {
@@ -336,8 +342,8 @@
});
mService.insertBatch(materialList);
- //灏哾wg鍥剧焊鍜宲ic鍥剧墖,鍏ㄩ儴鏇存柊鍒板搴旂殑璁板綍url涓� TODO
-
+ //灏哾wg鍥剧焊,鍏ㄩ儴鏇存柊鍒板搴旂殑璁板綍url涓�
+ mService.updateDwgUrl(materialDwgUrlNameList);
/*List<ProductBomApproving> fileBomApprovingList = approvingList.stream()
.filter(productBomApproving ->
productBomApproving.getPictureUrl() != null || productBomApproving.getDwgUrl() != null
--
Gitblit v1.9.1