From 4eb44a10c9424133c223b5af776ee9a6aeebcec3 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 11 八月 2022 10:06:05 +0800
Subject: [PATCH] 产品版本管理下载时加入替换的散装件一起下载
---
src/main/java/com/whyc/service/ProductBomHistoryService.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomHistoryService.java b/src/main/java/com/whyc/service/ProductBomHistoryService.java
index b207e8f..78d0aac 100644
--- a/src/main/java/com/whyc/service/ProductBomHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductBomHistoryService.java
@@ -6,6 +6,7 @@
import com.whyc.dto.FileDirPath;
import com.whyc.dto.Response;
import com.whyc.dto.ZipUtils;
+import com.whyc.mapper.ComponentMapper;
import com.whyc.mapper.ProductBomHistoryMapper;
import com.whyc.pojo.DocUser;
import com.whyc.pojo.ProductBom;
@@ -29,6 +30,8 @@
public class ProductBomHistoryService {
@Autowired(required = false)
private ProductBomHistoryMapper mapper;
+ @Autowired(required = false)
+ private ComponentMapper cponentMapper;
@Autowired
private DocLogService logService;
@@ -75,6 +78,16 @@
wrapper.le("s_version",version);
wrapper.ge("e_version",version);
List<ProductBomHistory> list=mapper.selectList(wrapper);
+ //鏌ヨ鍑哄瓨鍦ㄦ浛鎹㈠叧绯诲緱鏁ｈ浠�
+ List<ProductBomHistory> replaceBomHis=cponentMapper.getReplaceHisComponent(parentModel,version);
+ //涓や釜闆嗗悎鍚堝苟鎵嶆槸鏈�缁堢殑BOM
+ if(list!=null&&list.size()>0){
+ if(replaceBomHis!=null&&replaceBomHis.size()>0){
+ replaceBomHis.stream().forEach(replaceBom->{
+ list.add(replaceBom);
+ });
+ }
+ }
HSSFWorkbook wb = new HSSFWorkbook();
//瀛椾綋鏍煎紡-鍔犵矖
HSSFCellStyle cellStyle = wb.createCellStyle();
@@ -146,7 +159,11 @@
sheet.getRow(rownum+i+1).createCell(4).setCellValue(bomHistory.getParentModel());
sheet.getRow(rownum+i+1).createCell(5).setCellValue(bomHistory.getCategory());
sheet.getRow(rownum+i+1).createCell(6).setCellValue(bomHistory.getSubCode());
- sheet.getRow(rownum+i+1).createCell(7).setCellValue(bomHistory.getSubName());
+ if(bomHistory.getOldSubName()!=null&&!bomHistory.getOldSubName().isEmpty()){
+ sheet.getRow(rownum+i+1).createCell(7).setCellValue(bomHistory.getSubName()+"("+bomHistory.getOldSubName()+")");
+ }else{
+ sheet.getRow(rownum+i+1).createCell(7).setCellValue(bomHistory.getSubName());
+ }
sheet.getRow(rownum+i+1).createCell(8).setCellValue(bomHistory.getSubModel());
sheet.getRow(rownum+i+1).createCell(9).setCellValue(bomHistory.getUnit()==null?"":bomHistory.getUnit());
sheet.getRow(rownum+i+1).createCell(10).setCellValue(bomHistory.getQuantity());
--
Gitblit v1.9.1