From 5053773565e4943a8a920470ae578473f80e5b16 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 15:08:19 +0800
Subject: [PATCH] yys 基础数据产品维护增加字段
---
src/main/java/com/ruoyi/common/enums/FileNameType.java | 3 ++-
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 1 +
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 30 ++++++++++++++++++++++++++++++
src/main/resources/application.yml | 4 ++++
src/main/resources/application-sqd.yml | 2 --
5 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 069b665..deea960 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -48,6 +48,36 @@
@Excel(name = "鐢熶骇鐐掓満")
private String speculativeTradingName;
+ /**
+ * 浜у搧鍥剧墖
+ */
+// @Excel(name = "浜у搧鍥剧墖")
+ private String url;
+
+ /**
+ * 浜у搧楂樺害
+ */
+ @Excel(name = "浜у搧楂樺害")
+ private String height;
+
+ /**
+ * 姣忎欢鏁伴噺/鏀�
+ */
+ @Excel(name = "姣忎欢鏁伴噺/鏀�")
+ private String boxNum;
+
+ /**
+ * 鍗曚环(缇庡厓)/浠�
+ */
+ @Excel(name = "鍗曚环(缇庡厓)/浠�")
+ private String dollarPrice;
+
+ /**
+ * 鍗曚环(鍏�)/浠�
+ */
+ @Excel(name = "鍗曚环(鍏�)/浠�")
+ private String taxInclusiveUnitPrice;
+
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
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 cf9ef84..2e26068 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -12,6 +12,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.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.uuid.IdUtils;
diff --git a/src/main/java/com/ruoyi/common/enums/FileNameType.java b/src/main/java/com/ruoyi/common/enums/FileNameType.java
index 7afc045..fbf9a6f 100644
--- a/src/main/java/com/ruoyi/common/enums/FileNameType.java
+++ b/src/main/java/com/ruoyi/common/enums/FileNameType.java
@@ -14,7 +14,8 @@
SHIP(9),//鍙戣揣鍙拌处
INSPECTION_PRODUCTION_BEFORE(10),
INSPECTION_PRODUCTION_AFTER(11),
- INSPECTION(12);//宸℃ 鐢熶骇鍓�
+ INSPECTION(12),//宸℃ 鐢熶骇鍓�
+ Inventory(13);//浜у搧鍥剧墖
private final int value;
diff --git a/src/main/resources/application-sqd.yml b/src/main/resources/application-sqd.yml
index 986d0ce..cc6129b 100644
--- a/src/main/resources/application-sqd.yml
+++ b/src/main/resources/application-sqd.yml
@@ -13,8 +13,6 @@
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
captchaType: math
- # 鍗忓悓瀹℃壒缂栧彿鍓嶇紑(閰嶇疆鏂囦欢鍚庣紑鍛藉悕)
- approvalNumberPrefix: SQD
# 寮�鍙戠幆澧冮厤缃�
server:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c79d967..a1b2ddf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,3 +2,7 @@
spring:
profiles:
active: dev
+# 椤圭洰鐩稿叧閰嶇疆
+ruoyi:
+ # 鍗忓悓瀹℃壒缂栧彿鍓嶇紑(閰嶇疆鏂囦欢鍚庣紑鍛藉悕)
+ approvalNumberPrefix: SQD
\ No newline at end of file
--
Gitblit v1.9.3