From 6149443e383fe700aec231bbdea6460230e75d9f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 14:58:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFirePrevention
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java | 83 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 13 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 ee819dc..c4e1f6f 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,20 +3,21 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionRkQuery;
-import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
+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.domain.vo.gethuojRkVO;
import com.ruoyi.management.service.SlVolumeProductionRkService;
-import com.ruoyi.management.service.SlVolumeProductionRkglService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -32,11 +33,7 @@
public class SlVolumeProductionRkController {
@Resource
private SlVolumeProductionRkService slVolumeProductionRkService;
- @PostMapping("/getManagementimgVolumeProductionList")
- @ApiOperation(value = "分页获取通过入库管理来获取当前批次入库的物资")
- public R<PageDTO<ManagementimgVolumeProductionRkVO>> getManagementimgVolumeProductionList(@RequestBody ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO) {
- return R.ok(slVolumeProductionRkService.getManagementimgVolumeProductionList(managementimgVolumeProductionRkDTO));
- }
+
@PostMapping("/getSlGoodsMaterialsSlVolumeProductionRkList")
@ApiOperation(value = "分页获取通过物资来获取当前批次入库的物资")
@@ -44,4 +41,64 @@
return R.ok(slVolumeProductionRkService.getSlGoodsMaterialsSlVolumeProductionRkList(slGoodsMaterialsSlVolumeProductionRkDTO));
}
+
+ @PostMapping("/gethuojRkList")
+ @ApiOperation(value = "分页获取通过货架来获取当前批次入库的物资")
+ public R<PageDTO<gethuojRkVO>> gethuojRkList(@RequestBody gethuojRkQuery gethuojRkQuery) {
+ return R.ok(slVolumeProductionRkService.gethuojRkList(gethuojRkQuery));
+ }
+
+
+
+ @PostMapping("/addSlVolumeProductionRk")
+ @ApiOperation(value = "添加入库批次管理")
+ 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 UpdateRKDTO slVolumeProductionRkDTOS) {
+ slVolumeProductionRkService.uplSlVolumeProductionRk(slVolumeProductionRkDTOS.getSlVolumeProductionRkDTOS());
+ return R.ok();
+ }
+
+ @ApiOperation("删除入库批次")
+ @DeleteMapping("/{id}")
+ public R<?> delStoreManagement(
+ @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