From 87e07ac8b8f1868eb4302fac73dfc93c5417f977 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 11:06: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/SlVolumeProductionRkglController.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
index 732f579..a6cdd2f 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
@@ -39,8 +39,11 @@
@Resource
private SlVolumeProductionRkglService slVolumeProductionRkglService;
+
@Resource
private SlAuditMapper slAuditMapper;
+
+
@PostMapping("/getSupplierVolumeProductionRkglList")
@@ -49,9 +52,9 @@
return R.ok(slVolumeProductionRkglService.getSupplierVolumeProductionRkglList(supplierVolumeProductionRkglQuery));
}
- @PostMapping("/getVolumeProductionRkgInfo")
+ @GetMapping("/getVolumeProductionRkgInfo/{id}")
@ApiOperation(value = "获取入库管理详情")
- public R<VolumeProductionRkgInfoVO> getVolumeProductionRkgInfo(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Integer id) {
+ public R<VolumeProductionRkgInfoVO> getVolumeProductionRkgInfo(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Long id) {
return R.ok(slVolumeProductionRkglService.getVolumeProductionRkgInfo(id));
}
@@ -64,15 +67,15 @@
@PostMapping("/addVolumeProductionRkgl")
@ApiOperation(value = "添加/修改入库管理")
- public R addVolumeProductionRkgl(@RequestBody VolumeProductionRkglDTO volumeProductionRkglDTO) {
+ public R<Long> addVolumeProductionRkgl(@RequestBody VolumeProductionRkglDTO volumeProductionRkglDTO) {
slVolumeProductionRkglService.addVolumeProductionRkgl(volumeProductionRkglDTO);
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) {
SlVolumeProductionRkgl byId = slVolumeProductionRkglService.getById(id);
byId.setPresentState(5);
byId.setAuditStatus(7);
@@ -83,20 +86,22 @@
wrapper.eq( SlAudit::getDelFlag,0);
wrapper.eq(SlAudit::getRkId,id);
SlAudit slAudit = slAuditMapper.selectOne(wrapper);
- slAudit.setState(6);
-
+ if (slAudit!=null){
+ slAudit.setState(6);
+ slAuditMapper.updateById(slAudit);
+ }
return R.ok();
}
- @PostMapping("/getVolumeProductionRkgInventory")
+ @GetMapping("/getVolumeProductionRkgInventory/{id}")
@ApiOperation(value = "获取入库管理打印清单")
- public R<VolumeProductionRkgInventoryVO> getVolumeProductionRkgInventory(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Integer id) {
+ public R<VolumeProductionRkgInventoryVO> getVolumeProductionRkgInventory(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Long id) {
return R.ok(slVolumeProductionRkglService.getVolumeProductionRkgInventory(id));
}
@ApiOperation("入库管理入库")
- @DeleteMapping("/rk/{id}")
- public R<?> rk(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Integer id) {
+ @GetMapping("/rk/{id}")
+ public R<?> rk(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Long id) {
slVolumeProductionRkglService.rk(id);
return R.ok();
}
--
Gitblit v1.7.1