From 6149443e383fe700aec231bbdea6460230e75d9f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 14:58: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/SlVolumeProductionRkController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
index 00c71bf..c4e1f6f 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
@@ -3,10 +3,12 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.SlVolumeProductionRk;
import com.ruoyi.management.domain.dto.*;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
import com.ruoyi.management.domain.vo.VolumeProductionRkgInventoryVO;
import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO;
+import com.ruoyi.management.domain.vo.gethuojRkVO;
import com.ruoyi.management.service.SlVolumeProductionRkService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,6 +17,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -38,17 +41,27 @@
return R.ok(slVolumeProductionRkService.getSlGoodsMaterialsSlVolumeProductionRkList(slGoodsMaterialsSlVolumeProductionRkDTO));
}
+
+ @PostMapping("/gethuojRkList")
+ @ApiOperation(value = "分页获取通过货架来获取当前批次入库的物资")
+ public R<PageDTO<gethuojRkVO>> gethuojRkList(@RequestBody gethuojRkQuery gethuojRkQuery) {
+ return R.ok(slVolumeProductionRkService.gethuojRkList(gethuojRkQuery));
+ }
+
+
+
@PostMapping("/addSlVolumeProductionRk")
@ApiOperation(value = "添加入库批次管理")
- public R addVolumeProductionRkgl(@RequestBody SlVolumeProductionRkListDTO slVolumeProductionRkListDTO) {
- slVolumeProductionRkService.addVolumeProductionRkgl(slVolumeProductionRkListDTO);
+ public R addVolumeProductionRkgl(@RequestBody Map<String, List<SlVolumeProductionRkListDTO>> slVolumeProductionRkListDTO1) {
+ List<SlVolumeProductionRkListDTO> schools = slVolumeProductionRkListDTO1.get("slVolumeProductionRkListDTO");
+ slVolumeProductionRkService.addVolumeProductionRkgl(schools);
return R.ok();
}
@PostMapping("/uplSlVolumeProductionRk")
@ApiOperation(value = "修改入库批次管理")
- public R uplSlVolumeProductionRk(@RequestBody List<SlVolumeProductionRkDTO> SlVolumeProductionRkDTO) {
- slVolumeProductionRkService.uplSlVolumeProductionRk(SlVolumeProductionRkDTO);
+ public R uplSlVolumeProductionRk(@RequestBody UpdateRKDTO slVolumeProductionRkDTOS) {
+ slVolumeProductionRkService.uplSlVolumeProductionRk(slVolumeProductionRkDTOS.getSlVolumeProductionRkDTOS());
return R.ok();
}
@@ -56,7 +69,9 @@
@DeleteMapping("/{id}")
public R<?> delStoreManagement(
@ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Long id) {
- slVolumeProductionRkService.removeById(id);
+ SlVolumeProductionRk byId = slVolumeProductionRkService.getById(id);
+ byId.setDelFlag("1");
+ slVolumeProductionRkService.updateById(byId);
return R.ok();
}
--
Gitblit v1.7.1