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/impl/ProductionCostingServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionCostingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionCostingServiceImpl.java
index bd9d2d7..c674548 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionCostingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionCostingServiceImpl.java
@@ -5,12 +5,12 @@
import com.ruoyi.production.bean.vo.ProductionCostingDetailVo;
import com.ruoyi.production.bean.vo.ProductionCostingRawVo;
import com.ruoyi.production.bean.vo.ProductionCostingSummaryVo;
-import com.ruoyi.production.mapper.ProductionCostingDeptMapper;
+import com.ruoyi.production.mapper.ProductionCostingProcessMapper;
import com.ruoyi.production.mapper.ProductionCostingFactorMapper;
import com.ruoyi.production.mapper.ProductionCostingMapper;
import com.ruoyi.production.mapper.ProductionCostingStandardMapper;
import com.ruoyi.production.mapper.ProductionCostingWorkdayMapper;
-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;
@@ -51,7 +51,7 @@
private final ProductionCostingMapper productionCostingMapper;
private final ProductionCostingStandardMapper standardMapper;
private final ProductionCostingFactorMapper factorMapper;
- private final ProductionCostingDeptMapper deptMapper;
+ private final ProductionCostingProcessMapper processMapper;
private final ProductionCostingWorkdayMapper workdayMapper;
@Override
@@ -230,23 +230,23 @@
/* ================= 閰嶇疆 CRUD ================= */
@Override
- public List<ProductionCostingDept> listDept() {
- return deptMapper.selectDeptConfigs();
+ public List<ProductionCostingProcess> listProcess(ProductionCostingProcess query) {
+ return processMapper.selectProcessList(query == null ? new ProductionCostingProcess() : query);
}
@Override
- public boolean saveDept(ProductionCostingDept dept) {
- return deptMapper.insert(dept) > 0;
+ public boolean saveProcess(ProductionCostingProcess process) {
+ return processMapper.insert(process) > 0;
}
@Override
- public boolean updateDept(ProductionCostingDept dept) {
- return deptMapper.updateById(dept) > 0;
+ public boolean updateProcess(ProductionCostingProcess process) {
+ return processMapper.updateById(process) > 0;
}
@Override
- public boolean removeDept(Long id) {
- return deptMapper.deleteById(id) > 0;
+ public boolean removeProcess(Long id) {
+ return processMapper.deleteById(id) > 0;
}
@Override
--
Gitblit v1.9.3