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/SlVolumeProductionZyglController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
index cce75fb..b84564d 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.*;
import com.ruoyi.management.domain.dto.*;
import com.ruoyi.management.domain.vo.*;
@@ -42,7 +43,8 @@
@Resource
private SlAuditMapper slAuditMapper;
-
+ @Resource
+ private TokenService tokenService;
@Resource
private SlVolumeProductionZyglService slVolumeProductionZyglService;
@Resource
@@ -56,12 +58,13 @@
@PostMapping("/getVolumeProductionZyglCode")
@ApiOperation(value = "获取转移管理打印二维码列表")
public R<PageDTO<getVolumeProductionRkgCodeVO>> getVolumeProductionRkgCode(@RequestBody VolumeProductionZyglCodeQuery volumeProductionRkgCodeQuery) {
+ tokenService.getLoginUser();
// 通过转移管理获取 转移列表 获取入库id
Page<SlVolumeProductionZy> page = new Page<>(volumeProductionRkgCodeQuery.getPageCurr(), volumeProductionRkgCodeQuery.getPageSize());
LambdaQueryWrapper< SlVolumeProductionZy> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(SlVolumeProductionZy::getZyglId,volumeProductionRkgCodeQuery.getVolumeProductionZyglId());
wrapper1.eq( SlVolumeProductionZy::getDelFlag,"0");
- if (volumeProductionRkgCodeQuery.getManagementNumber() != null){
+ if (volumeProductionRkgCodeQuery.getShelfId() != null){
wrapper1.eq(SlVolumeProductionZy::getShelfId,volumeProductionRkgCodeQuery.getShelfId());
}
if (volumeProductionRkgCodeQuery.getManagementNumber() != null){
@@ -98,6 +101,7 @@
@PostMapping("/updateQrCodeNum")
@ApiOperation(value = "批量修改转移二维码生成数量")
public R updateQrCodeNum(@RequestBody UpdateZyQrCodeDTO dto) {
+ tokenService.getLoginUser();
for (UpdateQrCodeNumDTO updateQrCodeNumDTO : dto.getList()) {
SlVolumeProductionZy byId = slVolumeProductionZyService.getById(updateQrCodeNumDTO.getId());
if (byId == null){
@@ -135,25 +139,28 @@
@PostMapping("/getVolumeProductionzZyglList")
@ApiOperation(value = "分页获取转移管理")
public R<PageDTO<VolumeProductionzZyglVO>> getVolumeProductionzZyglList(@RequestBody SlVolumeProductionZyQuery slVolumeProductionZyQuery) {
+ tokenService.getLoginUser();
return R.ok(slVolumeProductionZyglService.getVolumeProductionzZyglList(slVolumeProductionZyQuery));
}
@PostMapping("/addsVolumeProductionzZygl")
@ApiOperation(value = "添加/修改转移管理")
public R addsVolumeProductionzZygl(@RequestBody SlVolumeProductionZyDTO slVolumeProductionZyDTO) {
-
+ tokenService.getLoginUser();
return R.ok(slVolumeProductionZyglService.addsVolumeProductionzZygl(slVolumeProductionZyDTO));
}
@PostMapping("/getVolumeProductionzZyglnfo")
@ApiOperation(value = "获取转移管理详情")
public R<VolumeProductionZyglInfoVO> getVolumeProductionzZyglnfo(@RequestBody ManagementimgVolumeProductionZyQuery managementimgVolumeProductionZyQuery) {
+ tokenService.getLoginUser();
return R.ok(slVolumeProductionZyglService.getVolumeProductionzZyglnfo(managementimgVolumeProductionZyQuery));
}
@GetMapping("/getVolumeProductionZyglnventory/{id}")
@ApiOperation(value = "获取转移管理打印清单")
public R<VolumeProductionZyglInventoryVO> getVolumeProductionZyglnventory(@ApiParam(name = "id", value = "转移管理id", required = true) @PathVariable("id") String id) {
+ tokenService.getLoginUser();
return R.ok(slVolumeProductionZyglService.getVolumeProductionZyglnventory(id));
}
@@ -162,6 +169,7 @@
@GetMapping("/{id}")
public R<?> delStoreManagement(
@ApiParam(name = "id", value = "转移管理id", required = true) @PathVariable("id") Long id) {
+ tokenService.getLoginUser();
SlVolumeProductionZygl byId = slVolumeProductionZyglService.getById(id);
byId.setPresentState(5);
byId.setAuditStatus(7);
@@ -226,6 +234,7 @@
@ApiOperation("转移管理入库")
@PostMapping("/zy")
public R<?> zy(@RequestBody ZyRkDTO dto) {
+ tokenService.getLoginUser();
slVolumeProductionZyglService.zy(dto.getCkglId(),dto.getAuthorizationUrl());
return R.ok();
}
@@ -234,6 +243,7 @@
@ApiOperation("查询审核拒绝原因")
@GetMapping("/getRefuseReason")
public R<?> getRefuseReason(Long auditId) {
+ tokenService.getLoginUser();
SlAudit byId = slAuditRecordService.getById(auditId);
return R.ok(byId.getCause());
}
--
Gitblit v1.7.1