From 2c4bc1808f272b7d7282d1b8ba416d606ebc7df5 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期五, 18 九月 2026 15:25:31 +0800
Subject: [PATCH] refactor(生产核算): 成品/白盒归属改为按工序指定
---
src/main/java/com/ruoyi/production/controller/ProductionCostingController.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionCostingController.java b/src/main/java/com/ruoyi/production/controller/ProductionCostingController.java
index 7394c0c..af48b34 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionCostingController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionCostingController.java
@@ -7,7 +7,7 @@
import com.ruoyi.production.bean.dto.ProductionCostingQueryDto;
import com.ruoyi.production.bean.vo.ProductionCostingDetailVo;
import com.ruoyi.production.bean.vo.ProductionCostingSummaryVo;
-import com.ruoyi.production.pojo.ProductionCostingDept;
+import com.ruoyi.production.pojo.ProductionCostingProcess;
import com.ruoyi.production.pojo.ProductionCostingFactor;
import com.ruoyi.production.pojo.ProductionCostingStandard;
import com.ruoyi.production.pojo.ProductionCostingWorkday;
@@ -67,33 +67,33 @@
util.exportExcel(response, productionCostingService.detailList(dto), "鐢熶骇鏍哥畻鏄庣粏");
}
- /* ---------------- 閮ㄩ棬绫诲瀷閰嶇疆 ---------------- */
+ /* ---------------- 宸ュ簭绫诲瀷閰嶇疆 ---------------- */
- @GetMapping("/dept/list")
- @Operation(summary = "閮ㄩ棬绫诲瀷閰嶇疆鍒楄〃")
- public R<List<ProductionCostingDept>> deptList() {
- return R.ok(productionCostingService.listDept());
+ @GetMapping("/process/list")
+ @Operation(summary = "宸ュ簭绫诲瀷閰嶇疆鍒楄〃")
+ public R<List<ProductionCostingProcess>> processList(ProductionCostingProcess query) {
+ return R.ok(productionCostingService.listProcess(query));
}
- @PostMapping("/dept")
- @Log(title = "鐢熶骇鏍哥畻-閮ㄩ棬绫诲瀷閰嶇疆鏂板", businessType = BusinessType.INSERT)
- @Operation(summary = "鏂板閮ㄩ棬绫诲瀷閰嶇疆")
- public R<Boolean> deptAdd(@RequestBody ProductionCostingDept dept) {
- return R.ok(productionCostingService.saveDept(dept));
+ @PostMapping("/process")
+ @Log(title = "鐢熶骇鏍哥畻-宸ュ簭绫诲瀷閰嶇疆鏂板", businessType = BusinessType.INSERT)
+ @Operation(summary = "鏂板宸ュ簭绫诲瀷閰嶇疆")
+ public R<Boolean> processAdd(@RequestBody ProductionCostingProcess process) {
+ return R.ok(productionCostingService.saveProcess(process));
}
- @PutMapping("/dept")
- @Log(title = "鐢熶骇鏍哥畻-閮ㄩ棬绫诲瀷閰嶇疆淇敼", businessType = BusinessType.UPDATE)
- @Operation(summary = "淇敼閮ㄩ棬绫诲瀷閰嶇疆")
- public R<Boolean> deptEdit(@RequestBody ProductionCostingDept dept) {
- return R.ok(productionCostingService.updateDept(dept));
+ @PutMapping("/process")
+ @Log(title = "鐢熶骇鏍哥畻-宸ュ簭绫诲瀷閰嶇疆淇敼", businessType = BusinessType.UPDATE)
+ @Operation(summary = "淇敼宸ュ簭绫诲瀷閰嶇疆")
+ public R<Boolean> processEdit(@RequestBody ProductionCostingProcess process) {
+ return R.ok(productionCostingService.updateProcess(process));
}
- @DeleteMapping("/dept/{id}")
- @Log(title = "鐢熶骇鏍哥畻-閮ㄩ棬绫诲瀷閰嶇疆鍒犻櫎", businessType = BusinessType.DELETE)
- @Operation(summary = "鍒犻櫎閮ㄩ棬绫诲瀷閰嶇疆")
- public R<Boolean> deptRemove(@PathVariable Long id) {
- return R.ok(productionCostingService.removeDept(id));
+ @DeleteMapping("/process/{id}")
+ @Log(title = "鐢熶骇鏍哥畻-宸ュ簭绫诲瀷閰嶇疆鍒犻櫎", businessType = BusinessType.DELETE)
+ @Operation(summary = "鍒犻櫎宸ュ簭绫诲瀷閰嶇疆")
+ public R<Boolean> processRemove(@PathVariable Long id) {
+ return R.ok(productionCostingService.removeProcess(id));
}
/* ---------------- 鏍囧噯鏁伴噺閰嶇疆 ---------------- */
--
Gitblit v1.9.3