From db0b39fdde2904e31b7cd07e7a353cf537421b0c Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 26 七月 2024 09:44:29 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
index b6820fa..892691d 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
@@ -3,11 +3,11 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
-import com.ruoyi.management.domain.dto.SlVolumeProductionRkDTO;
-import com.ruoyi.management.domain.dto.SlVolumeProductionRkListDTO;
-import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO;
+import com.ruoyi.management.domain.SlVolumeProductionRk;
+import com.ruoyi.management.domain.dto.*;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
+import com.ruoyi.management.domain.vo.VolumeProductionRkgInventoryVO;
+import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO;
import com.ruoyi.management.service.SlVolumeProductionRkService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,6 +15,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -40,14 +42,15 @@
@PostMapping("/addSlVolumeProductionRk")
@ApiOperation(value = "添加入库批次管理")
- public R addVolumeProductionRkgl(@RequestBody SlVolumeProductionRkListDTO slVolumeProductionRkListDTO) {
- slVolumeProductionRkService.addVolumeProductionRkgl(slVolumeProductionRkListDTO);
+ public R addVolumeProductionRkgl(@RequestBody Map<String, List<SlVolumeProductionRkListDTO>> slVolumeProductionRkListDTO1) {
+ List<SlVolumeProductionRkListDTO> schools = slVolumeProductionRkListDTO1.get("slVolumeProductionRkListDTO");
+ slVolumeProductionRkService.addVolumeProductionRkgl(schools);
return R.ok();
}
@PostMapping("/uplSlVolumeProductionRk")
@ApiOperation(value = "修改入库批次管理")
- public R uplSlVolumeProductionRk(@RequestBody SlVolumeProductionRkDTO SlVolumeProductionRkDTO) {
+ public R uplSlVolumeProductionRk(@RequestBody List<SlVolumeProductionRkDTO> SlVolumeProductionRkDTO) {
slVolumeProductionRkService.uplSlVolumeProductionRk(SlVolumeProductionRkDTO);
return R.ok();
}
@@ -55,9 +58,37 @@
@ApiOperation("删除入库批次")
@DeleteMapping("/{id}")
public R<?> delStoreManagement(
- @ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Integer id) {
- slVolumeProductionRkService.removeById(id);
+ @ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Long id) {
+ SlVolumeProductionRk byId = slVolumeProductionRkService.getById(id);
+ byId.setDelFlag("1");
+ slVolumeProductionRkService.updateById(byId);
return R.ok();
}
+ @PostMapping("/getVolumeProductionRkgCode")
+ @ApiOperation(value = "获取入库管理二维码")
+ public R<PageDTO<getVolumeProductionRkgCodeVO>> getVolumeProductionRkgCode(@RequestBody VolumeProductionRkgCodeQuery volumeProductionRkgCodeQuery) {
+ return R.ok(slVolumeProductionRkService.getVolumeProductionRkgCode(volumeProductionRkgCodeQuery));
+ }
+
+ @PostMapping("/codeInfo/{id}")
+ @ApiOperation(value = "获取二维码样式")
+ public R<ManagementimgVolumeProductionRkVO> codeInfo( @ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Long id){
+ return R.ok(slVolumeProductionRkService.codeInfo(id));
+ }
+
+ @PostMapping("/getSlvolumeVolumeProductionRkList")
+ @ApiOperation(value = "分页获取通过入库管理ID当前批次入库的物资")
+ public R<PageDTO<ManagementimgVolumeProductionRkVO>> getSlvolumeVolumeProductionRkList(@RequestBody ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO) {
+ return R.ok(slVolumeProductionRkService.getManagementimgVolumeProductionList(managementimgVolumeProductionRkDTO));
+ }
+
+
+ @PostMapping("/getroductionRkList")
+ @ApiOperation(value = "分页获取通过仓库管理ID和仓库层数和货架获取前批次入库的物资")
+ public R<PageDTO<ManagementimgVolumeProductionRkVO>> getroductionRkList(@RequestBody umeProductionRkQuery meProductionRkQuery) {
+ return R.ok(slVolumeProductionRkService.getroductionRkList(meProductionRkQuery));
+ }
+
+
}
--
Gitblit v1.7.1