From 5d9865a1b1d48cb3192ecce036f706ef582c1424 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 19 八月 2022 09:47:17 +0800
Subject: [PATCH] 去掉所有的报错正常运行
---
src/main/java/com/whyc/service/ProductBomHistoryService.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomHistoryService.java b/src/main/java/com/whyc/service/ProductBomHistoryService.java
index 77b69c3..5bd9f8b 100644
--- a/src/main/java/com/whyc/service/ProductBomHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductBomHistoryService.java
@@ -6,10 +6,9 @@
import com.whyc.dto.FileDirPath;
import com.whyc.dto.Response;
import com.whyc.dto.ZipUtils;
-import com.whyc.mapper.ComponentMapper;
+import com.whyc.mapper.MaterialMapper;
import com.whyc.mapper.ProductBomHistoryMapper;
import com.whyc.pojo.DocUser;
-import com.whyc.pojo.ProductBom;
import com.whyc.pojo.ProductBomHistory;
import com.whyc.util.ActionUtil;
import org.apache.poi.hssf.usermodel.*;
@@ -31,7 +30,7 @@
@Autowired(required = false)
private ProductBomHistoryMapper mapper;
@Autowired(required = false)
- private ComponentMapper cponentMapper;
+ private MaterialMapper cponentMapper;
@Autowired
private DocLogService logService;
@@ -70,7 +69,7 @@
wrapper.ge("e_version",version);
List<ProductBomHistory> list=mapper.selectList(wrapper);
//鏌ヨ鍑哄瓨鍦ㄦ浛鎹㈠叧绯诲緱鏁ｈ浠�
- List<ProductBomHistory> replaceBomHis=cponentMapper.getReplaceHisComponent(parentModel,version);
+ List<ProductBomHistory> replaceBomHis=cponentMapper.getReplaceHisMaterial(parentModel,version);
//涓や釜闆嗗悎鍚堝苟鎵嶆槸鏈�缁堢殑BOM
if(list!=null&&list.size()>0){
if(replaceBomHis!=null&&replaceBomHis.size()>0){
@@ -90,7 +89,7 @@
wrapper.ge("e_version",version);
List<ProductBomHistory> list=mapper.selectList(wrapper);
//鏌ヨ鍑哄瓨鍦ㄦ浛鎹㈠叧绯诲緱鏁ｈ浠�
- List<ProductBomHistory> replaceBomHis=cponentMapper.getReplaceHisComponent(parentModel,version);
+ List<ProductBomHistory> replaceBomHis=cponentMapper.getReplaceHisMaterial(parentModel,version);
//涓や釜闆嗗悎鍚堝苟鎵嶆槸鏈�缁堢殑BOM
if(list!=null&&list.size()>0){
if(replaceBomHis!=null&&replaceBomHis.size()>0){
@@ -156,7 +155,7 @@
ProductBomHistory bomHistory= (ProductBomHistory) list.get(i);
String dwgUrl=bomHistory.getDwgUrl();
if(i==0){
- excelName=bomHistory.getParentCode()+"_"+bomHistory.getParentModel()+"_"+version;
+ //excelName=bomHistory.getParentCode()+"_"+bomHistory.getParentModel()+"_"+version;
rootFace=fileDirName+ File.separator+excelName;
File destfile = new File(rootFace);
if(!destfile.exists()) {
@@ -170,9 +169,9 @@
Row row=sheet.createRow(rownum+i+1);
//row.setHeight((short)(1500));
sheet.getRow(rownum+i+1).createCell(1).setCellValue(i+1);
- sheet.getRow(rownum+i+1).createCell(2).setCellValue(bomHistory.getParentCode());
- sheet.getRow(rownum+i+1).createCell(3).setCellValue(bomHistory.getParentName());
- sheet.getRow(rownum+i+1).createCell(4).setCellValue(bomHistory.getParentModel());
+ //sheet.getRow(rownum+i+1).createCell(2).setCellValue(bomHistory.getParentCode());
+ //sheet.getRow(rownum+i+1).createCell(3).setCellValue(bomHistory.getParentName());
+ //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());
if(bomHistory.getOldSubName()!=null&&!bomHistory.getOldSubName().isEmpty()){
--
Gitblit v1.9.1