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/ProductionBomStructureController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionBomStructureController.java b/src/main/java/com/ruoyi/production/controller/ProductionBomStructureController.java
index 2ff08ba..86566f9 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionBomStructureController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionBomStructureController.java
@@ -1,14 +1,14 @@
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.ProductionBomStructureDto;
import com.ruoyi.production.bean.vo.ProductionBomStructureVo;
import com.ruoyi.production.service.ProductionBomStructureService;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -28,9 +28,22 @@
private ProductionBomStructureService productionBomStructureService;
@GetMapping("/listByBomId/{bomId}")
- @Operation(summary = "鏍规嵁BOM鏌ヨ鐢熶骇璁㈠崟BOM缁撴瀯鏍�")
+ @Operation(summary = "鏍规嵁璁㈠崟BOM鏌ヨ鎵佸钩鐗╂枡鏄庣粏")
public R<List<ProductionBomStructureVo>> listByBomId(@PathVariable Long bomId) {
return R.ok(productionBomStructureService.listByBomId(bomId));
}
+ @GetMapping("/listByOrderId/{productionOrderId}")
+ @Operation(summary = "鏍规嵁鐢熶骇璁㈠崟鏌ヨ璁㈠崟BOM蹇収鐨勬墎骞崇墿鏂欐槑缁�")
+ public R<List<ProductionBomStructureVo>> listByOrderId(@PathVariable Long productionOrderId) {
+ return R.ok(productionBomStructureService.listByOrderId(productionOrderId));
+ }
+
+ @Log(title = "鍏ㄩ噺淇濆瓨璁㈠崟BOM鎵佸钩鐗╂枡鏄庣粏", businessType = BusinessType.UPDATE)
+ @PostMapping("/addOrUpdateBomStructs")
+ @Operation(summary = "鍏ㄩ噺淇濆瓨璁㈠崟BOM鎵佸钩鐗╂枡鏄庣粏")
+ public R addProductionBomStructure(@RequestBody ProductionBomStructureDto productionBomStructureDto) {
+ return R.ok(productionBomStructureService.addProductionBomStructure(productionBomStructureDto));
+ }
+
}
--
Gitblit v1.9.3