From ca0565e53494417b3779759f8d3898e07bfd5929 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 14:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index 1795c15..9ce1661 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -1,7 +1,11 @@
package com.ruoyi.procurementrecord.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
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.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -20,6 +24,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.UUID;
/**
* @author :yys
@@ -98,12 +103,22 @@
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));
+
+
+ @GetMapping("/detailManagementByCustom")
+ @ApiOperation(value = "鑷畾涔夊叆搴�-璇︽儏")
+ public AjaxResult detailManagementByCustom(ProcurementManagementUpdateDto procurementDto) {
+ return AjaxResult.success(procurementRecordService.detailManagementByCustom(procurementDto));
}
+
+ @ApiOperation(value = "閲囪喘鍏ュ簱-璇︽儏")
+ @GetMapping("/detail")
+ public AjaxResult detail(ProcurementUpdateDto procurementDto) {
+ return AjaxResult.success(procurementRecordService.detail(procurementDto));
+ }
+
+
+
@PostMapping("/del")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
@@ -129,6 +144,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);
}
@@ -226,5 +249,10 @@
util.exportExcel(response, customStorages, "鍏ュ簱鍙拌处");
}
-
+ @GetMapping("/listPageProductionStock")
+ @Log(title = "搴撳瓨绠＄悊-鎴愬搧搴撳瓨", businessType = BusinessType.OTHER)
+ public AjaxResult listPageProductionStock(Page page) {
+ IPage<ProductModel> result = procurementRecordService.listPageProductionStock(page);
+ return AjaxResult.success(result);
+ }
}
--
Gitblit v1.9.3