From 8634cffaf7f433d8dbba073470226cd2846acbe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 29 Apr 2024 08:19:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20pbom=E5=AF=BC=E5=87=BA=E6=97=B6=E5=B0=86?= =?UTF-8?q?T=E7=B1=BB=E5=9E=8B=E7=9A=84=E7=BC=96=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=E5=9B=BE=E5=8F=B7=E7=BD=AE=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/pojo/vo/BomNewPbomWorkExcelVO.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomWorkExcelVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomWorkExcelVO.java index 2b2b01e9..b0d93a35 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomWorkExcelVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomWorkExcelVO.java @@ -1,6 +1,8 @@ package com.nflg.product.bomnew.pojo.vo; +import cn.hutool.core.util.StrUtil; import com.google.common.collect.ImmutableMap; +import com.nflg.product.bomnew.constant.BomConstant; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -33,12 +35,26 @@ public class BomNewPbomWorkExcelVO implements Serializable { @ExcelColumn(value = "物料编码") private String materialNo; + public String getMaterialNo() { + if (StrUtil.equals(projectType, BomConstant.PROJECT_TYPE_TEMPORARY)) { + return ""; + } + return materialNo; + } + @ExcelColumn("物料名称") private String materialName; @ExcelColumn(value = "图号") private String drawingNo; + public String getDrawingNo() { + if (StrUtil.equals(projectType, BomConstant.PROJECT_TYPE_TEMPORARY)) { + return ""; + } + return drawingNo; + } + @ExcelColumn(value = "版本号") private String currentVersion;