From 1ab2b329a40decba8ff7eefbeb158ff259aceb6d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 14 七月 2026 15:23:34 +0800
Subject: [PATCH] 追溯+分类接口
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 96 insertions(+), 7 deletions(-)
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 736e3bd..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
@@ -6,8 +6,13 @@
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemPageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemSaveReqVO;
+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;
@@ -17,9 +22,11 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
+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;
@Tag(name = "绠＄悊鍚庡彴 - MDM 鐗╂枡涓绘暟鎹�")
@RestController
@@ -29,6 +36,12 @@
@Resource
private MdmItemService itemService;
+
+ @Resource
+ private MdmUnitMeasureService unitMeasureService;
+
+ @Resource
+ private MdmWarehouseService warehouseService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐗╂枡")
@@ -47,11 +60,9 @@
@PutMapping("/update-status")
@Operation(summary = "鏇存柊鐗╂枡鐘舵��")
- @Parameter(name = "id", description = "缂栧彿", required = true, example = "1")
- @Parameter(name = "status", description = "鐘舵��", required = true, example = "0")
@PreAuthorize("@ss.hasPermission('mdm:item:update')")
- public CommonResult<Boolean> updateItemStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
- itemService.updateItemStatus(id, status);
+ public CommonResult<Boolean> updateItemStatus(@RequestBody MdmItemStatusUpdateReqVO reqVO) {
+ itemService.updateItemStatus(reqVO.getId(), reqVO.getStatus());
return success(true);
}
@@ -70,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")
@@ -78,7 +93,47 @@
@PreAuthorize("@ss.hasPermission('mdm:item:query')")
public CommonResult<PageResult<MdmItemRespVO>> getItemPage(@Valid MdmItemPageReqVO pageReqVO) {
PageResult<MdmItemDO> pageResult = itemService.getItemPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, MdmItemRespVO.class));
+ // 鍏宠仈鏌ヨ璁￠噺鍗曚綅鍚嶇О
+ Map<Long, MdmUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
+ 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()));
}
@GetMapping("/list-by-ids")
@@ -90,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
--
Gitblit v1.9.3