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 | 72 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index f056f6d..9ce1661 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -3,6 +3,8 @@
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;
@@ -38,6 +40,18 @@
private ProcurementRecordService procurementRecordService;
+ /**
+ * 閫氳繃閿�鍞骇鍝乮d鑾峰彇鍏ュ簱鏁伴噺
+ * @param salesProductId
+ * @return
+ */
+ @GetMapping("/getProcurementAmount")
+ @ApiOperation(value = "閫氳繃閿�鍞骇鍝乮d鑾峰彇鍏ュ簱鏁伴噺")
+ public AjaxResult getProcurementAmount(@RequestParam("salesProductId") Long salesProductId) {
+ return AjaxResult.success(procurementRecordService.getProcurementAmount(salesProductId));
+ }
+
+
@GetMapping("/productlist")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鏂板鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult list(ProcurementDto procurementDto) {
@@ -68,7 +82,7 @@
return procurementRecordService.updateCustom(customStorage);
}
- @DeleteMapping("/deleteCustom")
+ @Delete("/delteCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
@Transactional
public AjaxResult deleteCustom(@RequestBody List<Long> ids) {
@@ -89,12 +103,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));
- }
+
@GetMapping("/detailManagementByCustom")
@ApiOperation(value = "鑷畾涔夊叆搴�-璇︽儏")
@@ -125,12 +134,24 @@
IPage<ProcurementPageDto> result = procurementRecordService.listPage(page, procurementDto);
return AjaxResult.success(result);
}
-
+ @GetMapping("/listReport")
+ @ApiOperation(value = "鏌ヨ搴撳瓨鍥捐〃鏁版嵁")
+ public AjaxResult listReport() {
+ return AjaxResult.success(procurementRecordService.getReportList());
+ }
@GetMapping("/listPageByProduction")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
@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);
}
@@ -222,35 +243,16 @@
* @param response
*/
@PostMapping("/exportTwo")
- public void exportTwo(HttpServletResponse response,@RequestBody List<CustomStorage> customStorage) {
- if(CollectionUtils.isEmpty(customStorage)){
- customStorage = customStorageMapper.selectList(null);
- }
- for (CustomStorage storage : customStorage) {
- // nginx 鍓嶇璁块棶鍥剧墖
- storage.setUrl("http://114.132.189.42:9044"+storage.getUrl());
- }
+ public void exportTwo(HttpServletResponse response) {
+ List<CustomStorage> customStorages = customStorageMapper.selectList(null);
ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);
- util.exportExcel(response, customStorage, "鍏ュ簱鍙拌处");
+ util.exportExcel(response, customStorages, "鍏ュ簱鍙拌处");
}
- /**
- * 鍏ュ簱锛屽嚭搴撶鐞嗚嚜瀹氫箟瀵煎嚭锛屼繚瀛樻枃浠跺埌鏈湴杩斿洖璺緞
- * @param customStorage
- */
- @PostMapping("/exportTwoSave")
- public AjaxResult exportTwoSave(@RequestBody List<CustomStorage> customStorage) {
- if(CollectionUtils.isEmpty(customStorage)){
- customStorage = customStorageMapper.selectList(null);
- }
- for (CustomStorage storage : customStorage) {
- // nginx 鍓嶇璁块棶鍥剧墖
- storage.setUrl("http://114.132.189.42:9044" + storage.getUrl());
- }
- ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);
-
- return util.exportExcel(customStorage,"鍏ュ簱鍙拌处" , "鍏ュ簱鍙拌处");
+ @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