From 11f82e16d5154a91a20e3434f45afe784e1b5023 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期日, 20 九月 2026 09:35:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_玮苓乐器' into dev_天津_玮苓乐器
---
src/main/java/com/ruoyi/production/service/ProductionCostingService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/ProductionCostingService.java b/src/main/java/com/ruoyi/production/service/ProductionCostingService.java
index 843f2d8..6016596 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionCostingService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionCostingService.java
@@ -3,7 +3,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;
@@ -25,14 +25,14 @@
/** 鏈堜唤宸ヤ綔鏃ヤ俊鎭� */
Map<String, Object> workdayInfo(String yearMonth);
- /* ---------------- 閮ㄩ棬绫诲瀷閰嶇疆 ---------------- */
- List<ProductionCostingDept> listDept();
+ /* ---------------- 宸ュ簭绫诲瀷閰嶇疆 ---------------- */
+ List<ProductionCostingProcess> listProcess(ProductionCostingProcess query);
- boolean saveDept(ProductionCostingDept dept);
+ boolean saveProcess(ProductionCostingProcess process);
- boolean updateDept(ProductionCostingDept dept);
+ boolean updateProcess(ProductionCostingProcess process);
- boolean removeDept(Long id);
+ boolean removeProcess(Long id);
/* ---------------- 鏍囧噯鏁伴噺閰嶇疆 ---------------- */
List<ProductionCostingStandard> listStandard(ProductionCostingStandard query);
--
Gitblit v1.9.3