From 0d217eeff1f9d23844a54e8dd2ffebd8b4c2c1c7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 16:20:30 +0800
Subject: [PATCH] feat(production): 迁移生产管控
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index 4a15307..6cdd36b 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -99,12 +102,7 @@
return AjaxResult.success(procurementRecordService.updateManagement(procurementDto));
}
- @PostMapping("/updateManagementByCustom")
- @Log(title = "鑷畾涔夊叆搴�-搴撳瓨鍙拌处-淇敼", businessType = BusinessType.UPDATE)
- @Transactional
- public AjaxResult updateManagementByCustom(@RequestBody ProcurementManagementUpdateDto procurementDto) {
- return AjaxResult.success(procurementRecordService.updateManagementByCustom(procurementDto));
- }
+
@PostMapping("/del")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
@@ -130,6 +128,14 @@
@ApiOperation(value = "鍏ュ簱鏌ヨ")
public AjaxResult listPageByProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> result = procurementRecordService.listPageByProduction(page, procurementDto);
+ return AjaxResult.success(result);
+ }
+
+ @GetMapping("/listPageByProductProduction")
+ @Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鐢熶骇鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
+ @ApiOperation(value = "鍏ュ簱鏌ヨ")
+ public AjaxResult listPageByProductProduction(Page page, ProcurementPageDto procurementDto) {
+ IPage<ProcurementPageDto> result = procurementRecordService.listPageByProductProduction(page, procurementDto);
return AjaxResult.success(result);
}
@@ -229,8 +235,8 @@
@GetMapping("/listPageProductionStock")
@Log(title = "搴撳瓨绠＄悊-鎴愬搧搴撳瓨", businessType = BusinessType.OTHER)
- public AjaxResult listPageProductionStock(Page page) {
- IPage<ProductModel> result = procurementRecordService.listPageProductionStock(page);
+ public AjaxResult listPageProductionStock(Page page, ProcurementPageDto procurementDto) {
+ IPage<ProductModel> result = procurementRecordService.listPageProductionStock(page,procurementDto);
return AjaxResult.success(result);
}
}
--
Gitblit v1.9.3