From 8a7af3c27dca7eb50898995d5f64547beccc9e24 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 七月 2026 10:25:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/dataobject/item/MdmItemDO.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/dataobject/item/MdmItemDO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/dataobject/item/MdmItemDO.java
index 5786294..85753d5 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/dataobject/item/MdmItemDO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/dataobject/item/MdmItemDO.java
@@ -19,8 +19,8 @@
*
* @author 鑺嬮亾婧愮爜
*/
-@TableName("md_item")
-@KeySequence("md_item_seq")
+@TableName("mdm_item")
+@KeySequence("mdm_item_seq")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@@ -80,10 +80,9 @@
* 鐗╂枡绫诲瀷
*
* 鏋氫妇 {@link MdmItemTypeEnum}
- * 1: 鍘熸枡
- * 2: 鍗婃垚鍝�
- * 3: 鎴愬搧
- * 4: 杈呮枡
+ * 1: 鐗╂枡
+ * 2: 浜у搧
+ * 3: 鍗婃垚鍝�
*/
private Integer itemType;
@@ -165,6 +164,46 @@
private Boolean highValue;
/**
+ * 杈呭崟浣�1缂栧彿
+ *
+ * 鍏宠仈 {@link MdmUnitMeasureDO#getId()}
+ */
+ private Long unitMeasureId2;
+
+ /**
+ * 杈呭崟浣�1鎹㈢畻姣旂巼
+ *
+ * 涓诲崟浣嶄笌杈呭崟浣�1鐨勬崲绠楁瘮鐜囷紝渚嬪 1绠�=12涓紝鍒欐瘮鐜囦负12
+ */
+ private BigDecimal unitMeasureRate1;
+
+ /**
+ * 杈呭崟浣�2缂栧彿
+ *
+ * 鍏宠仈 {@link MdmUnitMeasureDO#getId()}
+ */
+ private Long unitMeasureId3;
+
+ /**
+ * 杈呭崟浣�2鎹㈢畻姣旂巼
+ *
+ * 涓诲崟浣嶄笌杈呭崟浣�2鐨勬崲绠楁瘮鐜�
+ */
+ private BigDecimal unitMeasureRate2;
+
+ /**
+ * 榛樿浠撳簱缂栧彿
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mdm.dal.dataobject.warehouse.MdmWarehouseDO#getId()}
+ */
+ private Long warehouseId;
+
+ /**
+ * 榛樿浠撳簱缂栫爜
+ */
+ private String warehouseCode;
+
+ /**
* 閲嶉噺(kg)
*/
private BigDecimal weight;
--
Gitblit v1.9.3