From 3504ed684a4e947787644c1003a2b7d40e684820 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 23 八月 2022 16:55:21 +0800
Subject: [PATCH] 产品bom审批更新
---
src/main/java/com/whyc/service/ProductBomApprovingService.java | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomApprovingService.java b/src/main/java/com/whyc/service/ProductBomApprovingService.java
index b9d5033..198ba4d 100644
--- a/src/main/java/com/whyc/service/ProductBomApprovingService.java
+++ b/src/main/java/com/whyc/service/ProductBomApprovingService.java
@@ -7,20 +7,15 @@
import com.whyc.mapper.ProductBomApprovingMapper;
import com.whyc.pojo.DocUser;
import com.whyc.pojo.ProductBomApproving;
-import com.whyc.pojo.WorksheetMain;
import com.whyc.util.*;
-import io.swagger.models.auth.In;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import javax.xml.crypto.Data;
import java.io.*;
-import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -143,8 +138,8 @@
List<FileUrlDTO> dwgExistsList = getDwgList(fileList);
for (int i = 0; i < fileList.size(); i++) {
String fileTempUrl = fileList.get(i);
- //鏌ヨ鍒伴渶涓婁紶鐨刡om鏁版嵁
- if(fileTempUrl.contains(".xls") && fileTempUrl.contains("(BOM)-erp")){
+ //鏌ヨ闇�涓婁紶鐨刡om鏁版嵁
+ if(fileTempUrl.contains(".xls") && fileTempUrl.contains("(BOM)")){
Workbook workbook = null;
InputStream inputStream = new FileInputStream(new File(fileTempUrl));
workbook = WorkbookFactory.create(inputStream);
@@ -226,7 +221,7 @@
bomList.add(bomApproving);
}
}
- //杩欎釜鏄瓙琛ㄦ暟鎹�,鐢ㄥ仛瀵规瘮鏍￠獙
+ /*//杩欎釜鏄瓙琛ㄦ暟鎹�,鐢ㄥ仛瀵规瘮鏍￠獙
else if(fileTempUrl.contains(".xls")){
File fileTemp = new File(fileTempUrl);
Workbook workbook = null;
@@ -326,7 +321,7 @@
}
list.add(bomApproving);
}
- }
+ }*/
}
/*String parentModel = list.get(0).getParentModel();
for (int i = 0; i < list.size(); i++) {
@@ -337,7 +332,7 @@
//閫氳繃鍖呭悕,鏌ヨ宸ュ崟娴佺▼瀹℃壒鏍囬
//String nextTitle = mainService.getNextTitle(originalFilename);
- //瀛愯〃,閫愭潯瀵规瘮bom琛�,瀛愭枡缂栫爜/瀛愭枡鍨嬪彿/瀛愭枡鏁伴噺
+ /*//瀛愯〃,閫愭潯瀵规瘮bom琛�,瀛愭枡缂栫爜/瀛愭枡鍨嬪彿/瀛愭枡鏁伴噺
for (ProductBomApproving sub:list){
String subCode = sub.getSubCode();
String subModel = sub.getSubModel();
@@ -361,8 +356,8 @@
if(!exists){
return response.set(1,false,excelName+"涓揣鍝佺紪鐮�:"+subCode+"鍦╞om琛ㄤ腑涓嶅瓨鍦�");
}
- }
- //澶勭悊鍚嶇О閲嶅鐨勫瓙浠�
+ }*/
+ /*//澶勭悊鍚嶇О閲嶅鐨勫瓙浠�
List<ProductBomApproving> newBomList = new LinkedList<>();
Map<String, List<ProductBomApproving>> subNameMap = bomList.stream().collect(Collectors.groupingBy(ProductBomApproving::getSubName));
subNameMap.forEach((subName,approvingList)->{
@@ -375,10 +370,10 @@
}else{
newBomList.addAll(approvingList);
}
- });
- List<ProductBomApproving> collect = newBomList.stream().sorted(Comparator.comparing(ProductBomApproving::getId)).collect(Collectors.toList());
+ });*/
+ List<ProductBomApproving> collect = bomList.stream().sorted(Comparator.comparing(ProductBomApproving::getId)).collect(Collectors.toList());
String nextTitle = originalFilename.substring(0,originalFilename.lastIndexOf("."));
- return response.setIII(1,true,collect,nextTitle,"瑙ｆ瀽瀹屾垚");
+ return response.setIII(1,true,collect,nextTitle,filePath);
}
private List<FileUrlDTO> getDwgList(List<String> fileList) {
@@ -411,16 +406,9 @@
return new Response().set(1,"doc_file"+dwgSubFileDirPath+File.separator+pdfFileName);
}
- public int getRejectVersion(Integer mainId) {
+ public List<ProductBomApproving> getList(Integer productApprovingId) {
QueryWrapper<ProductBomApproving> query = Wrappers.query();
- query.select("reject_version").eq("main_id",mainId).orderByDesc("id").last(" limit 1");
- ProductBomApproving bomApproving = mapper.selectOne(query);
- if(bomApproving==null){
- return -1;
- }else{
- //lxw娉ㄩ噴
- //return bomApproving.getRejectVersion();
- return 0;
- }
+ query.eq("product_approving_id",productApprovingId);
+ return mapper.selectList(query);
}
}
--
Gitblit v1.9.1