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/SlVolumeProductionRkglController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 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 c7d4c08..34a74ad 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
@@ -1,8 +1,14 @@
package com.ruoyi.management.controller;
+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.SlVolumeProductionRkgl;
import com.ruoyi.management.domain.dto.SlGoodsShelfDTO;
import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery;
@@ -10,6 +16,8 @@
import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO;
import com.ruoyi.management.domain.vo.VolumeProductionRkgInfoVO;
import com.ruoyi.management.domain.vo.VolumeProductionRkgInventoryVO;
+import com.ruoyi.management.mapper.SlAuditMapper;
+import com.ruoyi.management.mapper.SlAuditRecordMapper;
import com.ruoyi.management.service.SlVolumeProductionRkglService;
import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
import io.swagger.annotations.Api;
@@ -35,53 +43,80 @@
@Resource
private SlVolumeProductionRkglService slVolumeProductionRkglService;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private SlAuditMapper slAuditMapper;
+ @Resource
+ private SlAuditRecordMapper slAuditRecordMapper;
+
+
+
@PostMapping("/getSupplierVolumeProductionRkglList")
@ApiOperation(value = "分页获取供应商关联入库")
public R<PageDTO<SupplierVolumeProductionRkglVO>> getSupplierVolumeProductionRkglList(@RequestBody SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery) {
+ tokenService.getLoginUser();
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) {
+ tokenService.getLoginUser();
return R.ok(slVolumeProductionRkglService.getVolumeProductionRkgInfo(id));
}
@PostMapping("/getslVolumeProductionRkglList")
@ApiOperation(value = "分页获取入库管理")
public R<PageDTO<SupplierVolumeProductionRkglVO>> getslVolumeProductionRkglList(@RequestBody getVolumeProductionRkQuery getVolumeProductionRkQuery) {
+ tokenService.getLoginUser();
return R.ok(slVolumeProductionRkglService.getslVolumeProductionRkglList(getVolumeProductionRkQuery));
}
@PostMapping("/addVolumeProductionRkgl")
@ApiOperation(value = "添加/修改入库管理")
- public R addVolumeProductionRkgl(@RequestBody VolumeProductionRkglDTO volumeProductionRkglDTO) {
- slVolumeProductionRkglService.addVolumeProductionRkgl(volumeProductionRkglDTO);
- return R.ok();
+ public R<Long> addVolumeProductionRkgl(@RequestBody VolumeProductionRkglDTO volumeProductionRkglDTO) {
+ tokenService.getLoginUser();
+ return R.ok(slVolumeProductionRkglService.addVolumeProductionRkgl(volumeProductionRkglDTO));
}
@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) {
+ tokenService.getLoginUser();
SlVolumeProductionRkgl byId = slVolumeProductionRkglService.getById(id);
byId.setPresentState(5);
byId.setAuditStatus(7);
slVolumeProductionRkglService.updateById(byId);
+
+ LambdaQueryWrapper<SlAudit> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlAudit::getType,1);
+ wrapper.eq( SlAudit::getDelFlag,0);
+ wrapper.eq(SlAudit::getRkId,id);
+ SlAudit slAudit = slAuditMapper.selectOne(wrapper);
+ if (slAudit!=null){
+ slAudit.setState(6);
+ slAuditMapper.updateById(slAudit);
+ slAuditRecordMapper.delete(new QueryWrapper<SlAuditRecord>()
+ .eq("audit_id",slAudit.getId()));
+ }
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) {
+ tokenService.getLoginUser();
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) {
+ tokenService.getLoginUser();
slVolumeProductionRkglService.rk(id);
return R.ok();
}
--
Gitblit v1.7.1