From 5d4ebe6d0b7dda230b19f4913bdeb60556b46678 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 13 十月 2025 18:33:47 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsUnitController.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 110 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsUnitController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsUnitController.java
index ee47b92..4872d08 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsUnitController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsUnitController.java
@@ -1,8 +1,23 @@
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.TErpGoodsUnit;
+import com.ruoyi.system.query.TErpGoodsUnitQuery;
+import com.ruoyi.system.service.TErpGoodsService;
+import com.ruoyi.system.service.TErpGoodsUnitService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -12,9 +27,102 @@
* @author xiaochen
* @since 2025-08-20
*/
+@Api(tags = "erp商品单位管理")
@RestController
@RequestMapping("/t-erp-goods-unit")
public class TErpGoodsUnitController {
+ private final TErpGoodsUnitService erpGoodsUnitService;
+ private final TErpGoodsService erpGoodsService;
+ @Autowired
+ public TErpGoodsUnitController(TErpGoodsUnitService erpGoodsUnitService, TErpGoodsService erpGoodsService) {
+ this.erpGoodsUnitService = erpGoodsUnitService;
+ this.erpGoodsService = erpGoodsService;
+ }
+
+ /**
+ * 获取erp商品单位管理列表
+ */
+ @ApiOperation(value = "获取erp商品单位分页列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<TErpGoodsUnit>> pageList(@RequestBody TErpGoodsUnitQuery query) {
+ return R.ok(erpGoodsUnitService.pageList(query));
+ }
+
+ /**
+ * 获取erp商品单位管理列表
+ */
+ @ApiOperation(value = "获取erp商品单位列表")
+ @PostMapping(value = "/list")
+ public R<List<TErpGoodsUnit>> list() {
+ return R.ok(erpGoodsUnitService.list(Wrappers.lambdaQuery(TErpGoodsUnit.class).orderByDesc(TErpGoodsUnit::getCreateTime)));
+ }
+
+ /**
+ * 添加erp商品单位管理
+ */
+ @Log(title = "erp商品单位信息-新增erp商品单位", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加erp商品单位")
+ @PostMapping(value = "/add")
+ public R<Boolean> add(@Validated @RequestBody TErpGoodsUnit dto) {
+ if (erpGoodsUnitService.isExit(dto)) {
+ return R.fail("erp商品单位名称已存在");
+ }
+ return R.ok(erpGoodsUnitService.save(dto));
+ }
+
+ /**
+ * 修改erp商品单位
+ */
+ @Log(title = "erp商品单位信息-修改erp商品单位", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改erp商品单位")
+ @PostMapping(value = "/update")
+ public R<Boolean> update(@Validated @RequestBody TErpGoodsUnit dto) {
+ if (erpGoodsUnitService.isExit(dto)) {
+ return R.fail("erp商品单位名称已存在");
+ }
+ return R.ok(erpGoodsUnitService.updateById(dto));
+ }
+
+ /**
+ * 查看erp商品单位详情
+ */
+ @ApiOperation(value = "查看erp商品单位详情")
+ @GetMapping(value = "/getDetailById")
+ public R<TErpGoodsUnit> getDetailById(@RequestParam String id) {
+ return R.ok(erpGoodsUnitService.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(erpGoodsUnitService.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))) {
+ TErpGoodsUnit itemType = erpGoodsUnitService.getById(id);
+ return R.fail("该商品单位["+itemType.getUnitName()+"]下有商品，无法删除");
+ }
+ }
+ return R.ok(erpGoodsUnitService.removeByIds(ids));
+ }
+
}
--
Gitblit v1.7.1