From 1c215236bcaafd414a1f47e71338fe9c1bbcfb3a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 一月 2026 13:45:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index 4a15307..8aeb44d 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -133,6 +133,14 @@
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);
+ }
+
@GetMapping("/listPageByCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation(value = "鍏ュ簱鏌ヨ")
@@ -146,6 +154,26 @@
public AjaxResult listPageCopy(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopy(page, procurementDto);
return AjaxResult.success(result);
+ }
+
+ @PostMapping("frozenQuality")
+ @Log(title = "閲囪喘鍏ュ簱-搴撳瓨绠＄悊-鍐荤粨涓嶅悎鏍间骇鍝�", businessType = BusinessType.UPDATE)
+ public AjaxResult frozenQuality(@RequestBody List<Integer> frozenIds) {
+ boolean result = procurementRecordService.frozenQuality(frozenIds);
+ if (result) {
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
+ }
+
+ @PostMapping("thawQuality")
+ @Log(title = "閲囪喘鍏ュ簱-搴撳瓨绠＄悊-瑙ｅ喕涓嶅悎鏍间骇鍝�", businessType = BusinessType.UPDATE)
+ public AjaxResult thawQuality(@RequestBody List<Integer> thawIds) {
+ boolean result = procurementRecordService.thawQuality(thawIds);
+ if (result) {
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
}
@GetMapping("/listPageCopyByProduction")
@@ -229,8 +257,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