From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 08:59:57 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java
index 39f0544..c063e3c 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java
@@ -1,16 +1,22 @@
package com.ruoyi.management.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.collect.Lists;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.SlGoodsShelf;
import com.ruoyi.management.domain.SlVolumeProductionZy;
import com.ruoyi.management.domain.dto.*;
import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionZyVO;
import com.ruoyi.management.domain.vo.*;
+import com.ruoyi.management.service.SlGoodsShelfService;
+import com.ruoyi.management.service.SlStoreManagementService;
import com.ruoyi.management.service.SlVolumeProductionZyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -31,11 +37,26 @@
@Resource
private SlVolumeProductionZyService slVolumeProductionZyService;
+ @Autowired
+ private SlGoodsShelfService slGoodsShelfService;
+ @Autowired
+ private SlStoreManagementService storeManagementService;
@PostMapping("/getNumberAndShelfByManagementId")
@ApiOperation(value = "根据仓库id 查询楼层和货架")
public R<NumberAndShelfVO> getNumberAndShelfByManagementId(@RequestBody QueryDTO dto) {
return R.ok(slVolumeProductionZyService.getNumberAndShelfByManagementId(dto));
+ }
+ @GetMapping("/getNumberAndShelf")
+ @ApiOperation(value = "根据仓库Id 获取楼层数量和所有货架数组")
+ public R<GetNumberAndShelfVO> getNumberAndShelf(Long managementId) {
+ GetNumberAndShelfVO getNumberAndShelfVO = new GetNumberAndShelfVO();
+ getNumberAndShelfVO.setManagementNumber(storeManagementService.getById(managementId).getStoreManagementNumber());
+ List<SlGoodsShelf> list = slGoodsShelfService.list(new QueryWrapper<SlGoodsShelf>()
+ .eq("del_flag", 0)
+ .eq("store_management_id", managementId));
+ getNumberAndShelfVO.setList(list);
+ return R.ok(getNumberAndShelfVO);
}
@PostMapping("/getVolumeProductionzyCode")
@ApiOperation(value = "获取转移管理二维码")
@@ -49,6 +70,21 @@
slVolumeProductionZyService.addSlVolumeProductionZy(addzydto);
return R.ok();
}
+ @PostMapping("/deleteSlVolumeProductionZyUpdate")
+ @ApiOperation(value = "编辑时删除转移数据")
+ public R addSlVolumeProductionZy(@RequestBody DeleteCKDTO dto) {
+ QueryWrapper<SlVolumeProductionZy> slVolumeProductionZyQueryWrapper = new QueryWrapper<>();
+ slVolumeProductionZyQueryWrapper.eq("del_flag","0");
+ slVolumeProductionZyQueryWrapper.eq("rk_id",dto.getRkId());
+ slVolumeProductionZyQueryWrapper.eq("zygl_id",dto.getId());
+ slVolumeProductionZyQueryWrapper.eq("shelf_id",dto.getShelfId());
+ slVolumeProductionZyQueryWrapper.eq("store_management_number",dto.getStoreManagementNumber());
+ SlVolumeProductionZy one = slVolumeProductionZyService.getOne(slVolumeProductionZyQueryWrapper);
+ if (one!=null){
+ slVolumeProductionZyService.removeById(one.getId());
+ }
+ return R.ok();
+ }
@PostMapping("/updSlVolumeProductionZy")
@ApiOperation(value = "修改转移")
--
Gitblit v1.7.1