From 17d65c77c6fedf1b51afec166c5a9735c6e4d38e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 一月 2026 16:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index 1795c15..195b9c2 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -132,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 +155,48 @@
IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopy(page, procurementDto);
return AjaxResult.success(result);
}
+
+ @PostMapping("frozenStorageQuality")
+ @Log(title = "閲囪喘鍏ュ簱-搴撳瓨绠＄悊-鍐荤粨涓嶅悎鏍间骇鍝�", businessType = BusinessType.UPDATE)
+ public AjaxResult frozenStorageQuality(@RequestBody List<Integer> frozenIds) {
+ boolean result = procurementRecordService.frozenStorageQuality(frozenIds);
+ if (result) {
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
+ }
+
+ @PostMapping("thawStorageQuality")
+ @Log(title = "閲囪喘鍏ュ簱-搴撳瓨绠＄悊-瑙ｅ喕涓嶅悎鏍间骇鍝�", businessType = BusinessType.UPDATE)
+ public AjaxResult thawStorageQuality(@RequestBody List<Integer> thawIds) {
+ boolean result = procurementRecordService.thawStorageQuality(thawIds);
+ if (result) {
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
+ }
+
+ @PostMapping("frozenFinishedQuality")
+ @Log(title = "閲囪喘鍏ュ簱-搴撳瓨绠＄悊-鍐荤粨涓嶅悎鏍间骇鍝�", businessType = BusinessType.UPDATE)
+ public AjaxResult frozenFinishedQuality(@RequestBody List<Integer> frozenIds) {
+ boolean result = procurementRecordService.frozenFinishedQuality(frozenIds);
+ if (result) {
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
+ }
+
+ @PostMapping("thawFinishedQuality")
+ @Log(title = "閲囪喘鍏ュ簱-搴撳瓨绠＄悊-瑙ｅ喕涓嶅悎鏍间骇鍝�", businessType = BusinessType.UPDATE)
+ public AjaxResult thawFinishedQuality(@RequestBody List<Integer> thawIds) {
+ boolean result = procurementRecordService.thawFinishedQuality(thawIds);
+ if (result) {
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
+ }
+
+
@GetMapping("/listPageCopyByProduction")
@Log(title = "鐢熶骇鍏ュ簱-搴撳瓨绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@@ -226,5 +277,10 @@
util.exportExcel(response, customStorages, "鍏ュ簱鍙拌处");
}
-
+ @GetMapping("/listPageProductionStock")
+ @Log(title = "搴撳瓨绠＄悊-鎴愬搧搴撳瓨", businessType = BusinessType.OTHER)
+ public AjaxResult listPageProductionStock(Page page, ProcurementPageDto procurementDto) {
+ IPage<ProductModel> result = procurementRecordService.listPageProductionStock(page,procurementDto);
+ return AjaxResult.success(result);
+ }
}
--
Gitblit v1.9.3