From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java b/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java
index 8e68c64..b7d9cad 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java
@@ -3,12 +3,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.procurementrecord.dto.*;
+import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.procurementrecord.bean.dto.*;
import com.ruoyi.procurementrecord.pojo.CustomStorage;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -42,7 +43,7 @@
IPage<ProcurementPageDto> listPageByProduction(Page page, ProcurementPageDto procurementDto);
- AjaxResult addCustom(List<CustomStorage> customStorage);
+ R<?> addCustom(List<CustomStorage> customStorage);
IPage<CustomStorage> listPageByCustom(Page page, CustomStorage customStorage);
@@ -50,12 +51,16 @@
IPage<CustomStorage> listPageCopyByCustom(Page page, CustomStorage customStorage);
- AjaxResult updateCustom(CustomStorage customStorage);
+ R<?> updateCustom(CustomStorage customStorage);
- AjaxResult deleteCustom(List<Long> ids);
+ R<?> deleteCustom(List<Long> ids);
int updateManagementByCustom(ProcurementManagementUpdateDto procurementDto);
BigDecimal getProcurementAmount(Long salesProductId);
InventoryInformationDto getReportList();
+
+ IPage<ProductModel> listPageProductionStock(Page page, ProcurementPageDto procurementDto);
+
+ IPage<ProcurementPageDto> listPageByProductProduction(Page page, ProcurementPageDto procurementDto);
}
--
Gitblit v1.9.3