From 11ecb9ee39fc61af04cd8d462faf9dce496d1773 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 11 九月 2025 15:19:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsTypeController.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 111 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsTypeController.java
index 43a7092..416a81d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsTypeController.java
@@ -1,8 +1,24 @@
package com.ruoyi.web.controller.api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.model.TErpGoods;
+import com.ruoyi.system.model.TErpGoodsType;
+import com.ruoyi.system.query.TErpGoodsTypeQuery;
+import com.ruoyi.system.service.TErpGoodsService;
+import com.ruoyi.system.service.TErpGoodsTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -12,9 +28,102 @@
* @author xiaochen
* @since 2025-08-20
*/
+@Api(tags = "erp商品类型")
@RestController
@RequestMapping("/t-erp-goods-type")
public class TErpGoodsTypeController {
+ private final TErpGoodsTypeService erpGoodsTypeService;
+ private final TErpGoodsService erpGoodsService;
+ @Autowired
+ public TErpGoodsTypeController(TErpGoodsTypeService erpGoodsTypeService, TErpGoodsService erpGoodsService) {
+ this.erpGoodsTypeService = erpGoodsTypeService;
+ this.erpGoodsService = erpGoodsService;
+ }
+
+ /**
+ * 获取erp商品类型管理列表
+ */
+ @ApiOperation(value = "获取erp商品类型分页列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<TErpGoodsType>> pageList(@RequestBody TErpGoodsTypeQuery query) {
+ return R.ok(erpGoodsTypeService.pageList(query));
+ }
+
+ /**
+ * 获取erp商品类型管理列表
+ */
+ @ApiOperation(value = "获取erp商品类型列表")
+ @PostMapping(value = "/list")
+ public R<List<TErpGoodsType>> list() {
+ return R.ok(erpGoodsTypeService.list(Wrappers.lambdaQuery(TErpGoodsType.class).orderByDesc(TErpGoodsType::getCreateTime)));
+ }
+
+ /**
+ * 添加erp商品类型管理
+ */
+ @Log(title = "erp商品类型信息-新增erp商品类型", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加erp商品类型")
+ @PostMapping(value = "/add")
+ public R<Boolean> add(@Validated @RequestBody TErpGoodsType dto) {
+ if (erpGoodsTypeService.isExit(dto)) {
+ return R.fail("erp商品类型名称已存在");
+ }
+ return R.ok(erpGoodsTypeService.save(dto));
+ }
+
+ /**
+ * 修改erp商品类型
+ */
+ @Log(title = "erp商品类型信息-修改erp商品类型", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改erp商品类型")
+ @PostMapping(value = "/update")
+ public R<Boolean> update(@Validated @RequestBody TErpGoodsType dto) {
+ if (erpGoodsTypeService.isExit(dto)) {
+ return R.fail("erp商品类型名称已存在");
+ }
+ return R.ok(erpGoodsTypeService.updateById(dto));
+ }
+
+ /**
+ * 查看erp商品类型详情
+ */
+ @ApiOperation(value = "查看erp商品类型详情")
+ @GetMapping(value = "/getDetailById")
+ public R<TErpGoodsType> getDetailById(@RequestParam String id) {
+ return R.ok(erpGoodsTypeService.getById(id));
+ }
+
+ /**
+ * 删除erp商品类型
+ */
+ @Log(title = "erp商品类型信息-删除erp商品类型", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除erp商品类型")
+ @DeleteMapping(value = "/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ long count = erpGoodsService.count(Wrappers.lambdaQuery(TErpGoods.class).eq(TErpGoods::getTypeId, id));
+ if (count>0) {
+ return R.fail("该商品分类下有商品，无法删除");
+ }
+ return R.ok(erpGoodsTypeService.removeById(id));
+ }
+
+ /**
+ * 批量删除erp商品类型
+ */
+ @Log(title = "erp商品类型信息-删除erp商品类型", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除erp商品类型")
+ @DeleteMapping(value = "/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ List<TErpGoods> items = erpGoodsService.list(Wrappers.lambdaQuery(TErpGoods.class).in(TErpGoods::getTypeId, ids));
+ for (String id : ids) {
+ if (items.stream().anyMatch(t -> t.getTypeId().equals(id))) {
+ TErpGoodsType itemType = erpGoodsTypeService.getById(id);
+ return R.fail("该商品分类["+itemType.getTypeName()+"]下有商品，无法删除");
+ }
+ }
+ return R.ok(erpGoodsTypeService.removeByIds(ids));
+ }
+
}
--
Gitblit v1.7.1