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-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemUpdateReqDTO.java | 18 ++
yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java | 2
yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemCreateReqDTO.java | 18 ++
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemSaveReqVO.java | 18 ++
docs/mdm_item_aux_unit_warehouse.md | 158 ++++++++++++++++++++++
yudao-module-infra/pom.xml | 12 +
yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemRespDTO.java | 18 ++
docs/sql/mdm_schema.sql | 6
docs/sql/mdm_migration_05_item_aux_unit_warehouse.sql | 12 +
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java | 27 +++
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/dataobject/item/MdmItemDO.java | 40 +++++
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java | 78 ++++++++++
12 files changed, 403 insertions(+), 4 deletions(-)
diff --git a/docs/mdm_item_aux_unit_warehouse.md b/docs/mdm_item_aux_unit_warehouse.md
new file mode 100644
index 0000000..2acd738
--- /dev/null
+++ b/docs/mdm_item_aux_unit_warehouse.md
@@ -0,0 +1,158 @@
+# 鐗╂枡涓绘暟鎹柊澧炶緟鍗曚綅涓庨粯璁や粨搴撳瓧娈�
+
+## 娑夊強椤甸潰
+
+- 鐗╂枡涓绘暟鎹柊澧�/缂栬緫椤甸潰
+- 鐗╂枡涓绘暟鎹垪琛ㄩ〉闈�
+- 鐗╂枡璇︽儏椤甸潰
+
+## API
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| POST | /mdm/item/create | 鍒涘缓鐗╂枡锛堟柊澧炶緟鍗曚綅銆佷粨搴撳瓧娈碉級 |
+| PUT | /mdm/item/update | 鏇存柊鐗╂枡锛堟柊澧炶緟鍗曚綅銆佷粨搴撳瓧娈碉級 |
+| GET | /mdm/item/get | 鑾峰彇鐗╂枡璇︽儏锛堟柊澧炶緟鍗曚綅鍚嶇О銆佷粨搴撳悕绉帮級 |
+| GET | /mdm/item/page | 鑾峰彇鐗╂枡鍒嗛〉锛堟柊澧炶緟鍗曚綅鍚嶇О銆佷粨搴撳悕绉帮級 |
+
+**璇锋眰鍙傛暟锛堟柊澧炲瓧娈碉級锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭～ | 璇存槑 |
+|------|------|------|------|
+| unitMeasureId2 | Long | 鍚� | 杈呭崟浣�1缂栧彿锛屽叧鑱旇閲忓崟浣嶈〃 |
+| unitMeasureRate1 | BigDecimal | 鍚� | 杈呭崟浣�1鎹㈢畻姣旂巼锛堜富鍗曚綅涓庤緟鍗曚綅1鐨勬崲绠楁瘮鐜囷紝濡�1绠�=12涓紝鍒欐瘮鐜囦负12锛� |
+| unitMeasureId3 | Long | 鍚� | 杈呭崟浣�2缂栧彿锛屽叧鑱旇閲忓崟浣嶈〃 |
+| unitMeasureRate2 | BigDecimal | 鍚� | 杈呭崟浣�2鎹㈢畻姣旂巼 |
+| warehouseId | Long | 鍚� | 榛樿浠撳簱缂栧彿锛屽叧鑱斾粨搴撹〃 |
+| warehouseCode | String | 鍚� | 榛樿浠撳簱缂栫爜 |
+
+**鍝嶅簲锛堟柊澧炲瓧娈碉級锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| unitMeasureId2 | Long | 杈呭崟浣�1缂栧彿 |
+| unitMeasureName2 | String | 杈呭崟浣�1鍚嶇О |
+| unitMeasureRate1 | BigDecimal | 杈呭崟浣�1鎹㈢畻姣旂巼 |
+| unitMeasureId3 | Long | 杈呭崟浣�2缂栧彿 |
+| unitMeasureName3 | String | 杈呭崟浣�2鍚嶇О |
+| unitMeasureRate2 | BigDecimal | 杈呭崟浣�2鎹㈢畻姣旂巼 |
+| warehouseId | Long | 榛樿浠撳簱缂栧彿 |
+| warehouseCode | String | 榛樿浠撳簱缂栫爜 |
+| warehouseName | String | 榛樿浠撳簱鍚嶇О |
+
+## 鍓嶇淇敼鐐�
+
+### 1. 鏂板/缂栬緫琛ㄥ崟 - 娣诲姞杈呭崟浣嶅拰浠撳簱瀛楁
+
+```html
+<!-- 杈呭崟浣�1 -->
+<el-form-item label="杈呭崟浣�1" prop="unitMeasureId2">
+ <el-select v-model="form.unitMeasureId2" placeholder="璇烽�夋嫨杈呭崟浣�1" clearable>
+ <el-option
+ v-for="item in unitMeasureList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+</el-form-item>
+<el-form-item label="杈呭崟浣�1鎹㈢畻姣旂巼" prop="unitMeasureRate1">
+ <el-input-number v-model="form.unitMeasureRate1" :precision="6" :min="0" placeholder="璇疯緭鍏ユ崲绠楁瘮鐜�" />
+</el-form-item>
+
+<!-- 杈呭崟浣�2 -->
+<el-form-item label="杈呭崟浣�2" prop="unitMeasureId3">
+ <el-select v-model="form.unitMeasureId3" placeholder="璇烽�夋嫨杈呭崟浣�2" clearable>
+ <el-option
+ v-for="item in unitMeasureList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+</el-form-item>
+<el-form-item label="杈呭崟浣�2鎹㈢畻姣旂巼" prop="unitMeasureRate2">
+ <el-input-number v-model="form.unitMeasureRate2" :precision="6" :min="0" placeholder="璇疯緭鍏ユ崲绠楁瘮鐜�" />
+</el-form-item>
+
+<!-- 榛樿浠撳簱 -->
+<el-form-item label="榛樿浠撳簱" prop="warehouseId">
+ <el-select v-model="form.warehouseId" placeholder="璇烽�夋嫨榛樿浠撳簱" clearable
+ @change="handleWarehouseChange">
+ <el-option
+ v-for="item in warehouseList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+</el-form-item>
+```
+
+### 2. data 鏁版嵁
+
+```js
+data() {
+ return {
+ // ... 鍘熸湁鏁版嵁
+ form: {
+ // ... 鍘熸湁瀛楁
+ unitMeasureId2: undefined,
+ unitMeasureRate1: undefined,
+ unitMeasureId3: undefined,
+ unitMeasureRate2: undefined,
+ warehouseId: undefined,
+ warehouseCode: undefined,
+ },
+ warehouseList: [], // 浠撳簱涓嬫媺鍒楄〃
+ }
+}
+```
+
+### 3. 鍒楄〃琛ㄦ牸 - 娣诲姞鍒�
+
+```html
+<el-table-column label="杈呭崟浣�1" align="center" prop="unitMeasureName2" />
+<el-table-column label="杈呭崟浣�1鎹㈢畻姣旂巼" align="center" prop="unitMeasureRate1" width="140" />
+<el-table-column label="杈呭崟浣�2" align="center" prop="unitMeasureName3" />
+<el-table-column label="杈呭崟浣�2鎹㈢畻姣旂巼" align="center" prop="unitMeasureRate2" width="140" />
+<el-table-column label="榛樿浠撳簱" align="center" prop="warehouseName" />
+```
+
+### 4. 鏂规硶
+
+```js
+// 浠撳簱閫夋嫨鍙樻洿鏃讹紝鍚屾璁剧疆浠撳簱缂栫爜
+handleWarehouseChange(warehouseId) {
+ const warehouse = this.warehouseList.find(w => w.id === warehouseId);
+ this.form.warehouseCode = warehouse ? warehouse.code : undefined;
+},
+
+// 鎵撳紑鏂板/缂栬緫寮圭獥鏃讹紝鍔犺浇浠撳簱涓嬫媺鍒楄〃
+async openForm(id) {
+ // ... 鍘熸湁閫昏緫
+ this.warehouseList = await getWarehouseSimpleList();
+ // ...
+}
+```
+
+### 5. API 鎺ュ彛璋冪敤
+
+```js
+// 闇�瑕佸紩鍏ヤ粨搴� API
+import { getWarehouseSimpleList } from '@/api/mdm/warehouse';
+
+// 鎴栧湪鐗╂枡 API 鏂囦欢涓柊澧炰粨搴撶畝鍗曞垪琛ㄦ帴鍙�
+// api/mdm/warehouse.js
+export function getWarehouseSimpleList() {
+ return request({ url: '/mdm/warehouse/simple-list', method: 'get' });
+}
+```
+
+## 娉ㄦ剰浜嬮」
+
+- 杈呭崟浣�1鍜岃緟鍗曚綅2鍧囧叧鑱旇閲忓崟浣嶈〃锛坢dm_unit_measure锛夛紝涓嬫媺閫夐」涓庝富鍗曚綅鍏辩敤鍚屼竴鏁版嵁婧�
+- 鎹㈢畻姣旂巼涓� BigDecimal(24,6)锛屽墠绔娇鐢� `el-input-number` 缁勪欢鏃堕渶璁剧疆 `:precision="6"` 淇濇寔绮惧害涓�鑷�
+- 榛樿浠撳簱缂栫爜锛坵arehouseCode锛変负鍐椾綑瀛楁锛岄�夋嫨浠撳簱鍚庤嚜鍔ㄥ～鍏咃紝鏃犻渶鐢ㄦ埛鎵嬪姩杈撳叆
+- 杈呭崟浣嶅拰榛樿浠撳簱鍧囦负闈炲繀濉瓧娈�
+- 鍒楄〃椤靛瀛楁杈冨锛屽彲鑰冭檻灏嗚緟鍗曚綅淇℃伅鎶樺彔灞曠ず鎴栦粎鍦ㄨ鎯呴〉鏄剧ず
diff --git a/docs/sql/mdm_migration_05_item_aux_unit_warehouse.sql b/docs/sql/mdm_migration_05_item_aux_unit_warehouse.sql
new file mode 100644
index 0000000..c226165
--- /dev/null
+++ b/docs/sql/mdm_migration_05_item_aux_unit_warehouse.sql
@@ -0,0 +1,12 @@
+-- =====================================================
+-- mdm_item 琛ㄦ柊澧炲瓧娈碉細杈呭崟浣嶃�侀粯璁や粨搴�
+-- 鎵ц鏃堕棿锛�2026-07-01
+-- =====================================================
+
+ALTER TABLE `mdm_item`
+ ADD COLUMN `unit_measure_id2` bigint DEFAULT NULL COMMENT '杈呭崟浣�1缂栧彿' AFTER `unit_measure_id`,
+ ADD COLUMN `unit_measure_rate1` decimal(24,6) DEFAULT NULL COMMENT '杈呭崟浣�1鎹㈢畻姣旂巼' AFTER `unit_measure_id2`,
+ ADD COLUMN `unit_measure_id3` bigint DEFAULT NULL COMMENT '杈呭崟浣�2缂栧彿' AFTER `unit_measure_rate1`,
+ ADD COLUMN `unit_measure_rate2` decimal(24,6) DEFAULT NULL COMMENT '杈呭崟浣�2鎹㈢畻姣旂巼' AFTER `unit_measure_id3`,
+ ADD COLUMN `warehouse_id` bigint DEFAULT NULL COMMENT '榛樿浠撳簱缂栧彿' AFTER `unit_measure_rate2`,
+ ADD COLUMN `warehouse_code` varchar(50) DEFAULT NULL COMMENT '榛樿浠撳簱缂栫爜' AFTER `warehouse_id`;
diff --git a/docs/sql/mdm_schema.sql b/docs/sql/mdm_schema.sql
index 0a6b5df..058def5 100644
--- a/docs/sql/mdm_schema.sql
+++ b/docs/sql/mdm_schema.sql
@@ -80,6 +80,12 @@
`specification` varchar(200) DEFAULT NULL COMMENT '瑙勬牸鍨嬪彿',
`category_id` bigint DEFAULT NULL COMMENT '鐗╂枡鍒嗙被缂栧彿',
`unit_measure_id` bigint DEFAULT NULL COMMENT '璁￠噺鍗曚綅缂栧彿',
+ `unit_measure_id2` bigint DEFAULT NULL COMMENT '杈呭崟浣�1缂栧彿',
+ `unit_measure_rate1` decimal(24,6) DEFAULT NULL COMMENT '杈呭崟浣�1鎹㈢畻姣旂巼',
+ `unit_measure_id3` bigint DEFAULT NULL COMMENT '杈呭崟浣�2缂栧彿',
+ `unit_measure_rate2` decimal(24,6) DEFAULT NULL COMMENT '杈呭崟浣�2鎹㈢畻姣旂巼',
+ `warehouse_id` bigint DEFAULT NULL COMMENT '榛樿浠撳簱缂栧彿',
+ `warehouse_code` varchar(50) DEFAULT NULL COMMENT '榛樿浠撳簱缂栫爜',
`item_type` tinyint NOT NULL DEFAULT 1 COMMENT '鐗╂枡绫诲瀷锛�1:鐗╂枡 2:浜у搧 3:鍗婃垚鍝侊級',
`status` tinyint NOT NULL DEFAULT 0 COMMENT '鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�',
`purchase_price` decimal(24,2) DEFAULT NULL COMMENT '閲囪喘浠�',
diff --git a/yudao-module-infra/pom.xml b/yudao-module-infra/pom.xml
index bd0e6c7..184abaa 100644
--- a/yudao-module-infra/pom.xml
+++ b/yudao-module-infra/pom.xml
@@ -7,6 +7,18 @@
<artifactId>yudao</artifactId>
<version>${revision}</version>
</parent>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>9</source>
+ <target>9</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<modelVersion>4.0.0</modelVersion>
<artifactId>yudao-module-infra</artifactId>
<packaging>jar</packaging>
diff --git a/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemCreateReqDTO.java b/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemCreateReqDTO.java
index 51bc623..eb29f85 100644
--- a/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemCreateReqDTO.java
+++ b/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemCreateReqDTO.java
@@ -27,6 +27,24 @@
@Schema(description = "璁￠噺鍗曚綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long unitMeasureId;
+ @Schema(description = "杈呭崟浣�1缂栧彿", example = "2")
+ private Long unitMeasureId2;
+
+ @Schema(description = "杈呭崟浣�1鎹㈢畻姣旂巼", example = "12")
+ private BigDecimal unitMeasureRate1;
+
+ @Schema(description = "杈呭崟浣�2缂栧彿", example = "3")
+ private Long unitMeasureId3;
+
+ @Schema(description = "杈呭崟浣�2鎹㈢畻姣旂巼", example = "100")
+ private BigDecimal unitMeasureRate2;
+
+ @Schema(description = "榛樿浠撳簱缂栧彿", example = "1")
+ private Long warehouseId;
+
+ @Schema(description = "榛樿浠撳簱缂栫爜", example = "WH001")
+ private String warehouseCode;
+
@Schema(description = "鍝佺墝缂栧彿", example = "1")
private Long brandId;
diff --git a/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemRespDTO.java b/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemRespDTO.java
index 5cd624c..db505c1 100644
--- a/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemRespDTO.java
+++ b/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemRespDTO.java
@@ -30,6 +30,24 @@
@Schema(description = "璁￠噺鍗曚綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long unitMeasureId;
+ @Schema(description = "杈呭崟浣�1缂栧彿", example = "2")
+ private Long unitMeasureId2;
+
+ @Schema(description = "杈呭崟浣�1鎹㈢畻姣旂巼", example = "12")
+ private BigDecimal unitMeasureRate1;
+
+ @Schema(description = "杈呭崟浣�2缂栧彿", example = "3")
+ private Long unitMeasureId3;
+
+ @Schema(description = "杈呭崟浣�2鎹㈢畻姣旂巼", example = "100")
+ private BigDecimal unitMeasureRate2;
+
+ @Schema(description = "榛樿浠撳簱缂栧彿", example = "1")
+ private Long warehouseId;
+
+ @Schema(description = "榛樿浠撳簱缂栫爜", example = "WH001")
+ private String warehouseCode;
+
@Schema(description = "鍝佺墝缂栧彿", example = "1")
private Long brandId;
diff --git a/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemUpdateReqDTO.java b/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemUpdateReqDTO.java
index 1f1fdf1..ca2d98e 100644
--- a/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemUpdateReqDTO.java
+++ b/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/api/item/dto/MdmItemUpdateReqDTO.java
@@ -30,6 +30,24 @@
@Schema(description = "璁￠噺鍗曚綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long unitMeasureId;
+ @Schema(description = "杈呭崟浣�1缂栧彿", example = "2")
+ private Long unitMeasureId2;
+
+ @Schema(description = "杈呭崟浣�1鎹㈢畻姣旂巼", example = "12")
+ private BigDecimal unitMeasureRate1;
+
+ @Schema(description = "杈呭崟浣�2缂栧彿", example = "3")
+ private Long unitMeasureId3;
+
+ @Schema(description = "杈呭崟浣�2鎹㈢畻姣旂巼", example = "100")
+ private BigDecimal unitMeasureRate2;
+
+ @Schema(description = "榛樿浠撳簱缂栧彿", example = "1")
+ private Long warehouseId;
+
+ @Schema(description = "榛樿浠撳簱缂栫爜", example = "WH001")
+ private String warehouseCode;
+
@Schema(description = "鍝佺墝缂栧彿", example = "1")
private Long brandId;
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
index f12ff9e..fee0f83 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
@@ -9,8 +9,10 @@
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemStatusUpdateReqVO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
+import cn.iocoder.yudao.module.mdm.dal.dataobject.warehouse.MdmWarehouseDO;
import cn.iocoder.yudao.module.mdm.service.item.MdmItemService;
import cn.iocoder.yudao.module.mdm.service.unit.MdmUnitMeasureService;
+import cn.iocoder.yudao.module.mdm.service.warehouse.MdmWarehouseService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -20,8 +22,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -37,6 +39,9 @@
@Resource
private MdmUnitMeasureService unitMeasureService;
+
+ @Resource
+ private MdmWarehouseService warehouseService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐗╂枡")
@@ -76,7 +81,11 @@
@PreAuthorize("@ss.hasPermission('mdm:item:query')")
public CommonResult<MdmItemRespVO> getItem(@RequestParam("id") Long id) {
MdmItemDO item = itemService.getItem(id);
- return success(BeanUtils.toBean(item, MdmItemRespVO.class));
+ MdmItemRespVO resp = BeanUtils.toBean(item, MdmItemRespVO.class);
+ if (resp != null) {
+ enrichItemRespVO(resp);
+ }
+ return success(resp);
}
@GetMapping("/page")
@@ -89,10 +98,39 @@
convertSet(pageResult.getList(), MdmItemDO::getUnitMeasureId));
// 杞崲
List<MdmItemRespVO> respList = BeanUtils.toBean(pageResult.getList(), MdmItemRespVO.class);
+ // 鎵归噺鍏宠仈鏌ヨ杈呭崟浣嶅悕绉�
+ Set<Long> unitIds = new HashSet<>();
+ respList.forEach(resp -> {
+ if (resp.getUnitMeasureId2() != null) unitIds.add(resp.getUnitMeasureId2());
+ if (resp.getUnitMeasureId3() != null) unitIds.add(resp.getUnitMeasureId3());
+ });
+ Map<Long, MdmUnitMeasureDO> auxUnitMap = unitIds.isEmpty() ?
+ Collections.emptyMap() : unitMeasureService.getUnitMeasureMap(unitIds);
+ // 鎵归噺鍏宠仈鏌ヨ浠撳簱鍚嶇О
+ Set<Long> warehouseIds = new HashSet<>();
+ respList.forEach(resp -> {
+ if (resp.getWarehouseId() != null) warehouseIds.add(resp.getWarehouseId());
+ });
+ Map<Long, MdmWarehouseDO> warehouseMap = warehouseIds.isEmpty() ?
+ Collections.emptyMap() : warehouseService.getWarehouseList(warehouseIds).stream()
+ .collect(Collectors.toMap(MdmWarehouseDO::getId, w -> w));
+ // 璧嬪��
respList.forEach(resp -> {
MdmUnitMeasureDO unit = unitMap.get(resp.getUnitMeasureId());
if (unit != null) {
resp.setUnitMeasureName(unit.getName());
+ }
+ MdmUnitMeasureDO auxUnit1 = auxUnitMap.get(resp.getUnitMeasureId2());
+ if (auxUnit1 != null) {
+ resp.setUnitMeasureName2(auxUnit1.getName());
+ }
+ MdmUnitMeasureDO auxUnit2 = auxUnitMap.get(resp.getUnitMeasureId3());
+ if (auxUnit2 != null) {
+ resp.setUnitMeasureName3(auxUnit2.getName());
+ }
+ MdmWarehouseDO warehouse = warehouseMap.get(resp.getWarehouseId());
+ if (warehouse != null) {
+ resp.setWarehouseName(warehouse.getName());
}
});
return success(new PageResult<>(respList, pageResult.getTotal()));
@@ -107,4 +145,38 @@
return success(BeanUtils.toBean(list, MdmItemRespVO.class));
}
+ /**
+ * 濉厖鐗╂枡鍝嶅簲 VO 鐨勫叧鑱斿悕绉帮紙涓诲崟浣嶃�佽緟鍗曚綅銆佷粨搴撳悕绉帮級
+ */
+ private void enrichItemRespVO(MdmItemRespVO resp) {
+ // 涓诲崟浣嶅悕绉�
+ if (resp.getUnitMeasureId() != null) {
+ MdmUnitMeasureDO unit = unitMeasureService.getUnitMeasure(resp.getUnitMeasureId());
+ if (unit != null) {
+ resp.setUnitMeasureName(unit.getName());
+ }
+ }
+ // 杈呭崟浣�1鍚嶇О
+ if (resp.getUnitMeasureId2() != null) {
+ MdmUnitMeasureDO unit2 = unitMeasureService.getUnitMeasure(resp.getUnitMeasureId2());
+ if (unit2 != null) {
+ resp.setUnitMeasureName2(unit2.getName());
+ }
+ }
+ // 杈呭崟浣�2鍚嶇О
+ if (resp.getUnitMeasureId3() != null) {
+ MdmUnitMeasureDO unit3 = unitMeasureService.getUnitMeasure(resp.getUnitMeasureId3());
+ if (unit3 != null) {
+ resp.setUnitMeasureName3(unit3.getName());
+ }
+ }
+ // 榛樿浠撳簱鍚嶇О
+ if (resp.getWarehouseId() != null) {
+ MdmWarehouseDO warehouse = warehouseService.getWarehouse(resp.getWarehouseId());
+ if (warehouse != null) {
+ resp.setWarehouseName(warehouse.getName());
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java
index 35723c4..b3bbafa 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java
@@ -37,6 +37,33 @@
@Schema(description = "璁￠噺鍗曚綅鍚嶇О", example = "涓�")
private String unitMeasureName;
+ @Schema(description = "杈呭崟浣�1缂栧彿", example = "2")
+ private Long unitMeasureId2;
+
+ @Schema(description = "杈呭崟浣�1鍚嶇О")
+ private String unitMeasureName2;
+
+ @Schema(description = "杈呭崟浣�1鎹㈢畻姣旂巼", example = "12")
+ private BigDecimal unitMeasureRate1;
+
+ @Schema(description = "杈呭崟浣�2缂栧彿", example = "3")
+ private Long unitMeasureId3;
+
+ @Schema(description = "杈呭崟浣�2鍚嶇О")
+ private String unitMeasureName3;
+
+ @Schema(description = "杈呭崟浣�2鎹㈢畻姣旂巼", example = "100")
+ private BigDecimal unitMeasureRate2;
+
+ @Schema(description = "榛樿浠撳簱缂栧彿", example = "1")
+ private Long warehouseId;
+
+ @Schema(description = "榛樿浠撳簱缂栫爜", example = "WH001")
+ private String warehouseCode;
+
+ @Schema(description = "榛樿浠撳簱鍚嶇О", example = "鍘熸枡浠�")
+ private String warehouseName;
+
@Schema(description = "鍝佺墝缂栧彿", example = "1")
private Long brandId;
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemSaveReqVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemSaveReqVO.java
index c241974..54e0da8 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemSaveReqVO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemSaveReqVO.java
@@ -30,6 +30,24 @@
@Schema(description = "璁￠噺鍗曚綅缂栧彿", example = "1")
private Long unitMeasureId;
+ @Schema(description = "杈呭崟浣�1缂栧彿", example = "2")
+ private Long unitMeasureId2;
+
+ @Schema(description = "杈呭崟浣�1鎹㈢畻姣旂巼", example = "12")
+ private BigDecimal unitMeasureRate1;
+
+ @Schema(description = "杈呭崟浣�2缂栧彿", example = "3")
+ private Long unitMeasureId3;
+
+ @Schema(description = "杈呭崟浣�2鎹㈢畻姣旂巼", example = "100")
+ private BigDecimal unitMeasureRate2;
+
+ @Schema(description = "榛樿浠撳簱缂栧彿", example = "1")
+ private Long warehouseId;
+
+ @Schema(description = "榛樿浠撳簱缂栫爜", example = "WH001")
+ private String warehouseCode;
+
@Schema(description = "鐗╂枡绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer itemType;
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 d231469..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
@@ -164,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;
diff --git a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
index bdcb861..6b2b128 100644
--- a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
+++ b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
@@ -38,7 +38,7 @@
@RestController
@RequestMapping("/member/user")
@Validated
-public class MemberUserController {
+public class MemberUserController {
@Resource
private MemberUserService memberUserService;
--
Gitblit v1.9.3