From 5122701af4ecb76d6cc05655ba64ab07622eb51e Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 30 八月 2022 16:32:26 +0800
Subject: [PATCH] 历史版本查看需要加软件
---
src/main/java/com/whyc/service/ProductBomHistoryService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomHistoryService.java b/src/main/java/com/whyc/service/ProductBomHistoryService.java
index 0b39696..0887f3d 100644
--- a/src/main/java/com/whyc/service/ProductBomHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductBomHistoryService.java
@@ -122,8 +122,14 @@
HSSFFont font = wb.createFont();
font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
cellStyle.setFont(font);
+ String withOutDwg="doc_file/product"+File.separator+pHistory.getParentModel();
+ if(pHistory.getCustomCode()!=null&&!pHistory.getCustomCode().isEmpty()){
+ withOutDwg+=File.separator+pHistory.getCustomCode()+File.separator+version;
+ }else{
+ withOutDwg+=File.separator+"standard"+File.separator+version;
+ }
//鐢熸垚excel骞跺皢dwg鏂囦欢鏀惧湪鍚屼竴鎶ヤ笅鍘嬬缉
- creatBomHsitoryExcel(req,resp,pHistory,endList,wb);
+ creatBomHsitoryExcel(req,resp,pHistory,endList,wb,withOutDwg);
//璁板綍鏃ュ織
DocUser docUser= ActionUtil.getUser();
String operationDetail="鍏蜂綋浜у搧涓�:"+pHistory.toString();
@@ -132,7 +138,7 @@
logService.recordOperationLog(docUser.getId(),docUser.getName(), UserOperation.TYPE_DOWNLOAD.getType(),new Date(),terminalIp,opreationMsg,operationDetail);
}
//鏍规嵁浜у搧淇℃伅鍒涘缓excel琛ㄦ牸骞跺瓨鏀惧湪鎸囧畾鐩綍
- public void creatBomHsitoryExcel(HttpServletRequest req, HttpServletResponse resp,ProductHistory pHistory,List<ProductBomHistory> list, HSSFWorkbook wb){
+ public void creatBomHsitoryExcel(HttpServletRequest req, HttpServletResponse resp,ProductHistory pHistory,List<ProductBomHistory> list, HSSFWorkbook wb,String withOutDwg){
String fileDirName = FileDirPath.getFileDirName();
String rootFace="";
String excelName="";
@@ -174,6 +180,9 @@
if(!destfile.exists()) {
destfile.mkdir();
}
+ //灏嗘病鏈夌鐞咮OM鐨刣wg鏂囦欢鎷疯礉涓嬭浇
+ withOutDwg=fileDirName+File.separator+withOutDwg;
+ bomService.copyDir(withOutDwg,rootFace);
//灏嗛�変腑鐨勬枃浠跺瓨鍏ユ寚瀹氱洰褰曚笅鎵撳寘涓嬭浇
if(list!=null&&list.size()>0){
for (int i=0;i<list.size();i++) {
--
Gitblit v1.9.1