From d5e8cbc39a363ec8a6cdc80360e2112fb3b2a9c0 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 十一月 2026 11:25:42 +0800
Subject: [PATCH] fix: 生产订单领料台账和详情调整
---
src/main/java/com/ruoyi/production/controller/ProductionOrderPickController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderPickController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderPickController.java
index a8e2d2e..a819ce8 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderPickController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderPickController.java
@@ -1,5 +1,7 @@
package com.ruoyi.production.controller;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.ProductionOrderPickDto;
import com.ruoyi.production.bean.vo.ProductionOrderPickVo;
@@ -27,12 +29,14 @@
private final ProductionOrderPickService productionOrderPickService;
+ @Log(title = "棰嗘枡淇濆瓨鍒扮嚎杈逛粨", businessType = BusinessType.INSERT)
@PostMapping("/savePick")
@Operation(summary = "棰嗘枡淇濆瓨鍒扮嚎杈逛粨")
public R<Boolean> savePick(@RequestBody ProductionOrderPickDto dto) {
return R.ok(productionOrderPickService.savePick(dto));
}
+ @Log(title = "鍙樻洿棰嗘枡", businessType = BusinessType.UPDATE)
@PostMapping("/updatePick")
@Operation(summary = "鍙樻洿棰嗘枡")
public R<Boolean> updatePick(@RequestBody ProductionOrderPickDto dto) {
@@ -41,8 +45,12 @@
@GetMapping("/detail/{productionOrderId}")
@Operation(summary = "鏌ヨ宸查鏂欒鎯�")
- public R<List<ProductionOrderPickVo>> listPickedDetail(@PathVariable Long productionOrderId) {
- return R.ok(productionOrderPickService.listPickedDetail(productionOrderId));
+ public R<List<ProductionOrderPickVo>> listPickedDetail(
+ @PathVariable Long productionOrderId,
+ @RequestParam(defaultValue = "false") boolean records) {
+ return R.ok(records
+ ? productionOrderPickService.listPickedRecordDetail(productionOrderId)
+ : productionOrderPickService.listPickedDetail(productionOrderId));
}
}
--
Gitblit v1.9.3