From 3066a8f5c1f475997bfe23857ba4bae9395900c4 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 13 八月 2026 10:19:24 +0800
Subject: [PATCH] fix: 领料功能修改，移除订单领料，添加工序领料功能，支持按工序查询物料与已领料记录
---
src/main/java/com/ruoyi/production/controller/ProductionOrderPickController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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..aab2662 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) {
@@ -44,5 +48,24 @@
public R<List<ProductionOrderPickVo>> listPickedDetail(@PathVariable Long productionOrderId) {
return R.ok(productionOrderPickService.listPickedDetail(productionOrderId));
}
+
+ @GetMapping("/taskMaterials/{productionOperationTaskId}")
+ @Operation(summary = "鏌ヨ宸ュ簭宸ュ崟鐨勫彲棰嗙敤鐗╂枡涓庡凡棰嗘枡璁板綍")
+ public R<List<ProductionOrderPickVo>> listTaskMaterials(@PathVariable Long productionOperationTaskId) {
+ return R.ok(productionOrderPickService.listTaskMaterials(productionOperationTaskId));
+ }
+
+ @Log(title = "宸ュ簭棰嗘枡", businessType = BusinessType.INSERT)
+ @PostMapping("/savePickByTask")
+ @Operation(summary = "宸ュ簭缁熶竴棰嗘枡骞剁珛鍗虫墸鍑忓簱瀛�")
+ public R<Boolean> savePickByTask(@RequestBody ProductionOrderPickDto dto) {
+ return R.ok(productionOrderPickService.savePickByTask(dto));
+ }
+
+ @GetMapping("/taskPicked/{productionOperationTaskId}")
+ @Operation(summary = "鏌ヨ宸ュ簭宸ュ崟鏄惁宸插瓨鍦ㄦ湁鏁堥鏂�")
+ public R<Boolean> hasEffectivePick(@PathVariable Long productionOperationTaskId) {
+ return R.ok(productionOrderPickService.hasEffectivePick(productionOperationTaskId));
+ }
}
--
Gitblit v1.9.3