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/SlVolumeProductionCkglController.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
index b5b55c9..0284fbb 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
@@ -2,10 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.SlAudit;
+import com.ruoyi.management.domain.SlAuditRecord;
import com.ruoyi.management.domain.SlVolumeProductionCkgl;
import com.ruoyi.management.domain.SlVolumeProductionRkgl;
import com.ruoyi.management.domain.dto.VolumeProductionCkglDTO;
@@ -13,6 +16,7 @@
import com.ruoyi.management.domain.dto.getslVolumeProductionCkglQuery;
import com.ruoyi.management.domain.vo.*;
import com.ruoyi.management.mapper.SlAuditMapper;
+import com.ruoyi.management.mapper.SlAuditRecordMapper;
import com.ruoyi.management.service.SlVolumeProductionCkglService;
import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
import io.swagger.annotations.Api;
@@ -38,9 +42,12 @@
public class SlVolumeProductionCkglController {
@Resource
private SlVolumeProductionCkglService slVolumeProductionCkglService;
-
+ @Resource
+ private TokenService tokenService;
@Resource
private SlAuditMapper slAuditMapper;
+ @Resource
+ private SlAuditRecordMapper slAuditRecordMapper;
@PostMapping("/getslVolumeProductionCkglList")
@ApiOperation(value = "分页获取出库管理")
@@ -51,40 +58,40 @@
@PostMapping("/addslVolumeProductionCkgl")
@ApiOperation(value = "添加/修改出库管理")
public R addslVolumeProductionCkgl(@RequestBody VolumeProductionCkglDTO volumeProductionCkglDTO) {
- slVolumeProductionCkglService.addslVolumeProductionCkgl(volumeProductionCkglDTO);
- return R.ok();
+
+ return R.ok(slVolumeProductionCkglService.addslVolumeProductionCkgl(volumeProductionCkglDTO));
}
- @PostMapping("/getVolumeProductionCkglnfo")
+ @GetMapping("/getVolumeProductionCkglnfo/{id}")
@ApiOperation(value = "获取出库库管理详情")
- public R<VolumeProductionCkglInfoVO> getVolumeProductionCkglnfo(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Integer id) {
+ public R<VolumeProductionCkglInfoVO> getVolumeProductionCkglnfo(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Long id) {
return R.ok(slVolumeProductionCkglService.getVolumeProductionCkglnfo(id));
}
- @PostMapping("/getVolumeProductionCkglInventory")
+ @PostMapping("/getVolumeProductionCkglInventory/{id}")
@ApiOperation(value = "获取出库管理打印清单")
- public R<VolumeProductionCkglInventoryVO> getVolumeProductionCkglInventory(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Integer id) {
+ public R<VolumeProductionCkglInventoryVO> getVolumeProductionCkglInventory(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Long id) {
return R.ok(slVolumeProductionCkglService.getVolumeProductionCkglInventory(id));
}
@ApiOperation("出库管理出库")
- @DeleteMapping("/ck/{id}")
- public R<?> ck(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Integer id) {
+ @GetMapping("/ck/{id}")
+ public R<?> ck(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Long id) {
slVolumeProductionCkglService.ck(id);
return R.ok();
}
@ApiOperation("出库管理归还")
- @DeleteMapping("/gh/{id}")
- public R<?> gh(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Integer id) {
+ @GetMapping("/gh/{id}")
+ public R<?> gh(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Long id) {
slVolumeProductionCkglService.gh(id);
return R.ok();
}
@ApiOperation("取消出库管理")
- @DeleteMapping("/{id}")
+ @GetMapping("/{id}")
public R<?> delStoreManagement(
- @ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Integer id) {
+ @ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Long id) {
SlVolumeProductionCkgl byId = slVolumeProductionCkglService.getById(id);
byId.setPresentState(5);
byId.setAuditStatus(8);
@@ -95,6 +102,8 @@
wrapper.eq(SlAudit::getRkId,id);
SlAudit slAudit = slAuditMapper.selectOne(wrapper);
slAudit.setState(6);
+ slAuditRecordMapper.delete(new QueryWrapper<SlAuditRecord>()
+ .eq("audit_id",slAudit.getId()));
return R.ok();
}
--
Gitblit v1.7.1