From 455b965c6435b5359bb5c25f2b6810dbc06f5481 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 13 二月 2026 17:56:39 +0800
Subject: [PATCH] Merge branch 'dev_New_kthg' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_kthg
---
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index e27be8d..7f398b6 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -1,15 +1,18 @@
package com.ruoyi.production.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.service.ProductionProductMainService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
@RequestMapping("productionProductMain")
@RestController
@@ -41,8 +44,26 @@
}
@ApiOperation("鍒犻櫎鎶ュ伐")
- @DeleteMapping("/{ids}")
- public R delete(@PathVariable("ids") Long[] ids) {
- return R.ok(productionProductMainService.removeBatchByIds(Arrays.asList(ids)));
+ @DeleteMapping("/delete")
+ @Transactional(rollbackFor = Exception.class)
+ public R delete(@RequestBody ProductionProductMainDto productionProductMainDto) {
+
+ return R.ok(productionProductMainService.removeProductMain(productionProductMainDto.getId()));
+ }
+
+ /**
+ * 瀵煎嚭
+ */
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ProductionProductMainDto productionProductMainDto) {
+ List<ProductionProductMainDto> list;
+ list = productionProductMainService.listPageProductionProductMainDto(new Page<>(1, -1), productionProductMainDto).getRecords();
+ ExcelUtil<ProductionProductMainDto> util = new ExcelUtil<ProductionProductMainDto>(ProductionProductMainDto.class);
+ util.exportExcel(response, list, "鐢熶骇鎶ュ伐鏁版嵁");
+ }
+
+ @GetMapping("/queryProductInputAndOutput")
+ public R queryProductInputAndOutput(Page page, ProductionProductMainDto productionProductMainDto) {
+ return R.ok(productionProductMainService.queryProductInputAndOutput(page, productionProductMainDto));
}
}
--
Gitblit v1.9.3