From 1c4311135628b53daa336821ff452292a9d063e9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 28 八月 2024 09:14:10 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
index fed1eb9..fded7cb 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
@@ -1,14 +1,13 @@
package com.ruoyi.management.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.management.domain.SlGoodsMaterials;
-import com.ruoyi.management.domain.SlGoodsShelf;
-import com.ruoyi.management.domain.SlStoreManagement;
-import com.ruoyi.management.domain.SlStoreManagementImg;
+import com.ruoyi.management.domain.*;
import com.ruoyi.management.domain.dto.*;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
+import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
import com.ruoyi.management.service.SlGoodsShelfService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -33,6 +32,8 @@
@Resource
private SlGoodsShelfService slGoodsShelfService;
+ @Resource
+ private SlVolumeProductionRkMapper slVolumeProductionRkMapper;
@PostMapping("/getGoodsShelfList")
@ApiOperation(value = "分页获货架表管理")
@@ -43,8 +44,7 @@
@PostMapping("/addSlGoodsShelf")
@ApiOperation(value = "添加/修改货架管理")
public R addSlGoodsShelf(@RequestBody SlGoodsShelfDTO slGoodsShelfDTO) {
- slGoodsShelfService.addSlGoodsShelf(slGoodsShelfDTO);
- return R.ok();
+ return slGoodsShelfService.addSlGoodsShelf(slGoodsShelfDTO);
}
@GetMapping("/SlGoodsShelf/{id}")
@@ -57,6 +57,14 @@
@DeleteMapping("/{id}")
public R<?> delStoreManagement(
@ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Long id) {
+ List<SlVolumeProductionRk> slVolumeProductionRks = slVolumeProductionRkMapper.selectList(new QueryWrapper<SlVolumeProductionRk>()
+ .eq("shelf_id", id)
+ .ge("repertory_zhai",0)
+ .isNotNull("new_add_time")
+ .eq("del_flag", "0"));
+ if (slVolumeProductionRks.size() > 0) {
+ return R.fail("删除失败,当前货架存有物资");
+ }
SlGoodsShelf byId = slGoodsShelfService.getById(id);
byId.setDelFlag("1");
slGoodsShelfService.updateById(byId);
@@ -64,11 +72,21 @@
}
@PostMapping("/wfanzGoodsShelfList")
- @ApiOperation(value = "货架获取未放置")
+ @ApiOperation(value = "货架获放置")
public R<List<SlGoodsShelf>> wfanzGoodsShelfList(@RequestBody GoodsShelfQuery goodsShelfQuery) {
return R.ok(slGoodsShelfService.wfanzGoodsShelfList(goodsShelfQuery));
}
+ @PostMapping("/wfanzGoodsShelfListDel/{id}")
+ @ApiOperation(value = "货架获放置删除")
+ public R wfanzGoodsShelfListDel(
+ @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Long id){
+ SlGoodsShelf byId = slGoodsShelfService.getById(id);
+ byId.setIsStoreManagement(1);
+ slGoodsShelfService.updateById(byId);
+ return R.ok();
+ }
+
@PostMapping("/fanzGoodsShelfList")
@ApiOperation(value = "货架放置到图片")
public R fanzGoodsShelfList(@RequestBody GoodsShelfDTO goodsShelfDTO) {
--
Gitblit v1.7.1