From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 08:59:57 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
index 7cb8514..46f6bfa 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
@@ -4,15 +4,19 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionCk;
+import com.ruoyi.management.domain.SlVolumeProductionCkgl;
import com.ruoyi.management.domain.dto.*;
+import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO;
import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionCkVO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
import com.ruoyi.management.service.SlVolumeProductionCkService;
+import com.ruoyi.management.service.SlVolumeProductionCkglService;
import com.ruoyi.management.service.impl.SlVolumeProductionCkServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -33,17 +37,47 @@
@Resource
private SlVolumeProductionCkService slVolumeProductionCkService;
-
+ @PostMapping("/getMaterialByManagementIdList")
+ @ApiOperation(value = "发起出库 根据仓库Id 选择物资")
+ public R<PageDTO<InventoriesSuppliesInfoVO>> getMaterialByManagementIdList(@RequestBody GetMaterialsByManagementIdQuery query) {
+ return R.ok(slVolumeProductionCkService.getMaterialByManagementIdList(query));
+ }
@PostMapping("/getManagementimgSlVolumeProductionCkList")
@ApiOperation(value = "分页获取通过物资来获取当前批次出库的物资")
public R<PageDTO<ManagementimgSlVolumeProductionCkVO>> getManagementimgSlVolumeProductionCkList(@RequestBody SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery) {
return R.ok(slVolumeProductionCkService.getManagementimgSlVolumeProductionCkList(slGoodsMaterialsSlVolumeProductionRkQuery));
}
+
@PostMapping("/addSlVolumeProductionCk")
- @ApiOperation(value = "添加/修改出库")
- public R addSlVolumeProductionCk(@RequestBody SlVolumeProductionCkDTO slVolumeProductionCkDTO) {
- slVolumeProductionCkService.addSlVolumeProductionCk(slVolumeProductionCkDTO);
+ @ApiOperation(value = "添加出库")
+ public R addSlVolumeProductionCk(@RequestBody ADDCKGLDTO addckgldto ) {
+ slVolumeProductionCkService.addSlVolumeProductionCk(addckgldto.getAddSlVolumeProductionCkDTO());
+ return R.ok();
+ }
+
+ @PostMapping("/updSlVolumeProductionCk")
+ @ApiOperation(value = "修改出库")
+ public R updSlVolumeProductionCk(@RequestBody ADDCKGLDTO addckgldto ) {
+ slVolumeProductionCkService.updSlVolumeProductionCk(addckgldto.getAddSlVolumeProductionCkDTO());
+ return R.ok();
+ }
+ @Autowired
+ private SlVolumeProductionCkglService ckglService;
+ @GetMapping("/auditAgain")
+ @ApiOperation(value = "出库管理重新审核")
+ public R auditAgain(Long ckglId) {
+ SlVolumeProductionCkgl byId1 = ckglService.getById(ckglId);
+ byId1.setAuditStatus(1);
+ byId1.setPresentState(1);
+ byId1.setReasonsRefusal("");
+ ckglService.updateById(byId1);
+ return R.ok();
+ }
+ @PostMapping("/updSlVolumeProductionCk1")
+ @ApiOperation(value = "修改出库 不变更状态")
+ public R updSlVolumeProductionCk1(@RequestBody ADDCKGLDTO addckgldto ) {
+ slVolumeProductionCkService.updSlVolumeProductionCk1(addckgldto.getAddSlVolumeProductionCkDTO());
return R.ok();
}
@@ -63,7 +97,9 @@
@DeleteMapping("/{id}")
public R<?> delStoreManagement(
@ApiParam(name = "id", value = "出库批次id", required = true) @PathVariable("id") Integer id) {
- slVolumeProductionCkService.removeById(id);
+ SlVolumeProductionCk byId = slVolumeProductionCkService.getById(id);
+ byId.setDelFlag("1");
+ slVolumeProductionCkService.updateById(byId);
return R.ok();
}
}
--
Gitblit v1.7.1