From 5972ef211b65e28e692a4133eb3d165cdd6a01b9 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:59:44 +0800
Subject: [PATCH] 销售台账的合同号可以自定义
---
src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java | 29 +++++++++++++++++++++++------
1 files changed, 23 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 feabbf3..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,14 @@
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;
@@ -29,21 +31,36 @@
int deletePro(ProcurementUpdateDto procurementDto);
- void export(HttpServletResponse response);
+ void export(HttpServletResponse response,Integer type);
int updateManagement(ProcurementManagementUpdateDto procurementDto);
- void exportCopy(HttpServletResponse response);
+ void exportCopy(HttpServletResponse response,Integer type);
+
+ void exportCopyTwo(HttpServletResponse response,Integer type);
Map<String, Object> getReportList(Page page, ProcurementPageDto procurementDto);
IPage<ProcurementPageDto> listPageByProduction(Page page, ProcurementPageDto procurementDto);
- AjaxResult addCustom(List<CustomStorage> customStorage);
+ R<?> addCustom(List<CustomStorage> customStorage);
IPage<CustomStorage> listPageByCustom(Page page, CustomStorage customStorage);
IPage<ProcurementPageDtoCopy> listPageCopyByProduction(Page page, ProcurementPageDto procurementDto);
IPage<CustomStorage> listPageCopyByCustom(Page page, CustomStorage customStorage);
+
+ R<?> updateCustom(CustomStorage customStorage);
+
+ 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