From 5081b38abd5056a7951c229818455b14275ec7ef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 27 三月 2026 16:26:29 +0800
Subject: [PATCH] yys 1.修改bug
---
src/main/java/com/ruoyi/production/dto/BomImportDto.java | 1 +
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 3 ++-
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 2 ++
3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index d98d0de..9c17885 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -11,6 +11,7 @@
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductModelService;
+import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
@@ -82,6 +83,7 @@
product1.setProductName(productModelDto.getProductName());
productMapper.updateById(product1);
}
+ commonFileService.deleteByBusinessIds(Collections.singletonList(productModelDto.getId()), FileNameType.PRODUCT_MODEL.getValue());
if(CollectionUtils.isNotEmpty(productModelDto.getTempFileIds())){
commonFileService.migrateTempFilesToFormal(productModelDto.getId(), productModelDto.getTempFileIds());
}
diff --git a/src/main/java/com/ruoyi/production/dto/BomImportDto.java b/src/main/java/com/ruoyi/production/dto/BomImportDto.java
index 0cea81a..2c4a047 100644
--- a/src/main/java/com/ruoyi/production/dto/BomImportDto.java
+++ b/src/main/java/com/ruoyi/production/dto/BomImportDto.java
@@ -2,6 +2,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
import java.math.BigDecimal;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index 4c70400..8f38511 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -48,7 +48,7 @@
/**
* 宸ヨ祫瀹氶
*/
- @Excel(name = "宸ヨ祫瀹氶")
+// @Excel(name = "宸ヨ祫瀹氶")
private BigDecimal salaryQuota;
/**
@@ -74,6 +74,7 @@
private Long tenantId;
@ApiModelProperty(value ="鏄惁璐ㄦ")
+ @Excel(name = "鏄惁璐ㄦ", readConverterExp = "0=鍚�,1=鏄�")
private Boolean isQuality;
--
Gitblit v1.9.3