From 407a9d87ba0bd58e7795ff5387b0cb005d630bed Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 16:45:30 +0800
Subject: [PATCH] 生产入库逻辑修改，只有最后一道工序的报工才会入库，只有成品检验和原材料检验入库
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 12 ++++++++++--
1 files changed, 10 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..879b328 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 = "鍏ュ簱鏌ヨ")
@@ -229,8 +237,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