From 56dfe0d4bf81262622a1919cceb2b039fd356209 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 16:52:49 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 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 00c71bf..dea6920 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,10 +3,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.common.security.service.TokenService;
+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.*;
import com.ruoyi.management.service.SlVolumeProductionRkService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,6 +15,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -31,24 +32,37 @@
@Resource
private SlVolumeProductionRkService slVolumeProductionRkService;
-
+ @Resource
+ private TokenService tokenService;
@PostMapping("/getSlGoodsMaterialsSlVolumeProductionRkList")
@ApiOperation(value = "分页获取通过物资来获取当前批次入库的物资")
public R<PageDTO<ManagementimgVolumeProductionRkVO>> getSlGoodsMaterialsSlVolumeProductionRkList(@RequestBody SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkDTO) {
+ tokenService.getLoginUser();
return R.ok(slVolumeProductionRkService.getSlGoodsMaterialsSlVolumeProductionRkList(slGoodsMaterialsSlVolumeProductionRkDTO));
}
+
+ @PostMapping("/gethuojRkList")
+ @ApiOperation(value = "分页获取通过货架来获取当前批次入库的物资")
+ public R<PageDTO<gethuojRkVO>> gethuojRkList(@RequestBody gethuojRkQuery gethuojRkQuery) {
+ tokenService.getLoginUser();
+ return R.ok(slVolumeProductionRkService.gethuojRkList(gethuojRkQuery));
+ }
+
+
+
@PostMapping("/addSlVolumeProductionRk")
@ApiOperation(value = "添加入库批次管理")
- public R addVolumeProductionRkgl(@RequestBody SlVolumeProductionRkListDTO slVolumeProductionRkListDTO) {
- slVolumeProductionRkService.addVolumeProductionRkgl(slVolumeProductionRkListDTO);
+ public R addVolumeProductionRkgl(@RequestBody Map<String, List<SlVolumeProductionRkListDTO>> slVolumeProductionRkListDTO1) {tokenService.getLoginUser();
+ List<SlVolumeProductionRkListDTO> schools = slVolumeProductionRkListDTO1.get("slVolumeProductionRkListDTO");
+ slVolumeProductionRkService.addVolumeProductionRkgl(schools);
return R.ok();
}
@PostMapping("/uplSlVolumeProductionRk")
@ApiOperation(value = "修改入库批次管理")
- public R uplSlVolumeProductionRk(@RequestBody List<SlVolumeProductionRkDTO> SlVolumeProductionRkDTO) {
- slVolumeProductionRkService.uplSlVolumeProductionRk(SlVolumeProductionRkDTO);
+ public R uplSlVolumeProductionRk(@RequestBody UpdateRKDTO slVolumeProductionRkDTOS) {tokenService.getLoginUser();
+ slVolumeProductionRkService.uplSlVolumeProductionRk(slVolumeProductionRkDTOS.getSlVolumeProductionRkDTOS());
return R.ok();
}
@@ -56,25 +70,37 @@
@DeleteMapping("/{id}")
public R<?> delStoreManagement(
@ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Long id) {
- slVolumeProductionRkService.removeById(id);
+ tokenService.getLoginUser();
+ 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) {
+ tokenService.getLoginUser();
return R.ok(slVolumeProductionRkService.getVolumeProductionRkgCode(volumeProductionRkgCodeQuery));
}
- @PostMapping("/codeInfo/{id}")
+ @GetMapping("/codeInfo")
@ApiOperation(value = "获取二维码样式")
- public R<ManagementimgVolumeProductionRkVO> codeInfo( @ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Long id){
- return R.ok(slVolumeProductionRkService.codeInfo(id));
+ public R<List<QRCodeVO>> codeInfo(Long id,Integer count) throws Exception {
+ tokenService.getLoginUser();
+ return R.ok(slVolumeProductionRkService.codeInfo(id,count));
+ }
+ @PostMapping("/codeInfo1")
+ @ApiOperation(value = "转移数据获取二维码样式")
+ public R<List<QRCodeVO>> codeInfo( Long id,Long zyglId) throws Exception {
+ tokenService.getLoginUser();
+ return R.ok(slVolumeProductionRkService.codeInfo1(id,zyglId));
}
@PostMapping("/getSlvolumeVolumeProductionRkList")
@ApiOperation(value = "分页获取通过入库管理ID当前批次入库的物资")
public R<PageDTO<ManagementimgVolumeProductionRkVO>> getSlvolumeVolumeProductionRkList(@RequestBody ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO) {
+ tokenService.getLoginUser();
return R.ok(slVolumeProductionRkService.getManagementimgVolumeProductionList(managementimgVolumeProductionRkDTO));
}
@@ -82,8 +108,15 @@
@PostMapping("/getroductionRkList")
@ApiOperation(value = "分页获取通过仓库管理ID和仓库层数和货架获取前批次入库的物资")
public R<PageDTO<ManagementimgVolumeProductionRkVO>> getroductionRkList(@RequestBody umeProductionRkQuery meProductionRkQuery) {
+ tokenService.getLoginUser();
return R.ok(slVolumeProductionRkService.getroductionRkList(meProductionRkQuery));
}
+ @PostMapping("/getroductionRkList1")
+ @ApiOperation(value = "分页获取通过仓库管理ID和仓库层数和货架获取前批次入库的物资")
+ public R<PageDTO<ManagementimgVolumeProductionRkVO>> getroductionRkList1(@RequestBody umeProductionRkQueryA meProductionRkQuery) {
+ tokenService.getLoginUser();
+ return R.ok(slVolumeProductionRkService.getroductionRkList1(meProductionRkQuery));
+ }
}
--
Gitblit v1.7.1