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/ProductBomService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomService.java b/src/main/java/com/whyc/service/ProductBomService.java
index a378c51..0b15430 100644
--- a/src/main/java/com/whyc/service/ProductBomService.java
+++ b/src/main/java/com/whyc/service/ProductBomService.java
@@ -299,7 +299,11 @@
sheet.getRow(rownum+i+1).createCell(4).setCellValue(bom.getParentModel());
sheet.getRow(rownum+i+1).createCell(5).setCellValue(bom.getCategory());
sheet.getRow(rownum+i+1).createCell(6).setCellValue(bom.getSubCode());
- sheet.getRow(rownum+i+1).createCell(7).setCellValue(bom.getSubName());
+ if(bom.getOldSubName()!=null&&!bom.getOldSubName().isEmpty()){
+ sheet.getRow(rownum+i+1).createCell(7).setCellValue(bom.getSubName()+"("+bom.getOldSubName()+")");
+ }else{
+ sheet.getRow(rownum+i+1).createCell(7).setCellValue(bom.getSubName());
+ }
sheet.getRow(rownum+i+1).createCell(8).setCellValue(bom.getSubModel());
sheet.getRow(rownum+i+1).createCell(9).setCellValue(bom.getUnit()==null?"":bom.getUnit());
sheet.getRow(rownum+i+1).createCell(10).setCellValue(bom.getQuantity());
--
Gitblit v1.9.1