From 8876b1b9cd27fad076ea9e5f3e04197b84ba02bd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 01 八月 2024 14:26:56 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 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 9f6313b..cda697e 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
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionCk;
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;
@@ -16,6 +17,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -32,17 +34,29 @@
@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 List<AddSlVolumeProductionCkDTO> addSlVolumeProductionCkDTO) {
+ slVolumeProductionCkService.addSlVolumeProductionCk(addSlVolumeProductionCkDTO);
+ return R.ok();
+ }
+
+ @PostMapping("/updSlVolumeProductionCk")
+ @ApiOperation(value = "修改出库")
+ public R updSlVolumeProductionCk(@RequestBody List<SlVolumeProductionCkDTO> slVolumeProductionCkDTO) {
+ slVolumeProductionCkService.updSlVolumeProductionCk(slVolumeProductionCkDTO);
return R.ok();
}
@@ -52,11 +66,19 @@
return R.ok(slVolumeProductionCkService.getSlVolumeProductionCkList(managementimgVolumeProductionCkQuery));
}
+ @PostMapping("/SlVolumeProductionCkList")
+ @ApiOperation(value = "不分页获取通过出库管理ID当前出库的物资")
+ public R<List<ManagementimgVolumeProductionCkVO>> SlVolumeProductionCkList(@RequestBody ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery) {
+ return R.ok(slVolumeProductionCkService.SlVolumeProductionCkList(managementimgVolumeProductionCkQuery));
+ }
+
@ApiOperation("删除出库批次")
@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