From a08dce3de307ce138396db5fe7274ead2ef5c573 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 17:12:08 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index 9ce1661..6cdd36b 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -1,11 +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.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;
@@ -24,7 +24,6 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
-import java.util.UUID;
/**
* @author :yys
@@ -102,21 +101,6 @@
public AjaxResult updateManagement(@RequestBody ProcurementManagementUpdateDto procurementDto) {
return AjaxResult.success(procurementRecordService.updateManagement(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));
- }
-
@@ -251,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