From b069101e1bf347ceab11e33d73b2fbb7f37d4686 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 17:15:53 +0800
Subject: [PATCH] feat(production): 生产订单的工艺路线和参数的增删改逻辑
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 110 +++++++++++++++++++++---------------------------------
1 files changed, 43 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index dc9c2b7..395a414 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -3,10 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.ruoyi.account.mapper.AccountExpenseMapper;
import com.ruoyi.account.mapper.AccountIncomeMapper;
import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.home.mapper.HomeMapper;
-import com.ruoyi.account.mapper.AccountExpenseMapper;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.basic.mapper.CustomerMapper;
@@ -25,12 +24,10 @@
import com.ruoyi.dto.MapDto;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.home.dto.*;
+import com.ruoyi.home.mapper.HomeMapper;
import com.ruoyi.home.service.HomeService;
-import com.ruoyi.production.mapper.ProductionOperationTaskMapper;
-import com.ruoyi.production.mapper.ProductionAccountMapper;
-import com.ruoyi.production.mapper.ProductionOrderMapper;
-import com.ruoyi.production.mapper.ProductionProductInputMapper;
-import com.ruoyi.production.mapper.ProductionProductOutputMapper;
+import com.ruoyi.production.bean.dto.ProductionProductOutputDto;
+import com.ruoyi.production.mapper.*;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
@@ -50,8 +47,8 @@
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.stock.mapper.StockInventoryMapper;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -71,73 +68,52 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class HomeServiceImpl implements HomeService {
- @Autowired
- private SalesLedgerMapper salesLedgerMapper;
+ private final SalesLedgerMapper salesLedgerMapper;
- @Autowired
- private PurchaseLedgerMapper purchaseLedgerMapper;
+ private final PurchaseLedgerMapper purchaseLedgerMapper;
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
- @Autowired
- private StockInventoryMapper stockInventoryMapper;
+ private final StockInventoryMapper stockInventoryMapper;
- @Autowired
- private QualityInspectMapper qualityStatisticsMapper;
+ private final QualityInspectMapper qualityStatisticsMapper;
- @Autowired
- private ApproveProcessMapper approveProcessMapper;
+ private final ApproveProcessMapper approveProcessMapper;
- @Autowired
- private ReceiptPaymentMapper receiptPaymentMapper;
+ private final ReceiptPaymentMapper receiptPaymentMapper;
- @Autowired
- private PaymentRegistrationMapper paymentRegistrationMapper;
+ private final PaymentRegistrationMapper paymentRegistrationMapper;
- @Autowired
- private SysDeptMapper sysDeptMapper;
+ private SysDeptMapper sysDeptMapper;
- @Autowired
- private NoticeMapper noticeMapper;
-
- @Autowired
- private ProductionOrderMapper productionOrderMapper;
-
- @Autowired
- private ProductMapper productMapper;
-
- @Autowired
- private StaffOnJobMapper staffOnJobMapper;
-
- @Autowired
- private CustomerMapper customerMapper;
-
- @Autowired
- private SupplierManageMapper supplierManageMapper;
-
- @Autowired
- private HomeMapper homeMapper;
-
- @Autowired
- private ProductionProductOutputMapper productionProductOutputMapper;
-
- @Autowired
- private QualityInspectMapper qualityInspectMapper;
-
- @Autowired
- private QualityUnqualifiedMapper qualityUnqualifiedMapper;
-
- @Autowired
- private ProductionOperationTaskMapper productionOperationTaskMapper;
+ private final NoticeMapper noticeMapper;
- @Autowired
- private AccountExpenseMapper accountExpenseMapper;
+ private final ProductionOrderMapper productionOrderMapper;
- @Autowired
- private AccountIncomeMapper accountIncomeMapper;
+ private final ProductMapper productMapper;
+
+ private final StaffOnJobMapper staffOnJobMapper;
+
+ private final CustomerMapper customerMapper;
+
+ private final SupplierManageMapper supplierManageMapper;
+
+ private final HomeMapper homeMapper;
+
+ private final ProductionProductOutputMapper productionProductOutputMapper;
+
+ private final QualityInspectMapper qualityInspectMapper;
+
+ private final QualityUnqualifiedMapper qualityUnqualifiedMapper;
+
+ private final ProductionOperationTaskMapper productionOperationTaskMapper;
+
+ private final AccountExpenseMapper accountExpenseMapper;
+
+ private final AccountIncomeMapper accountIncomeMapper;
@Override
public HomeBusinessDto business() {
@@ -514,7 +490,7 @@
.reduce(BigDecimal.ZERO, BigDecimal::add);
}
- @Autowired
+
private DeviceRepairMapper deviceRepairMapper;
@Override
@@ -1489,7 +1465,7 @@
return dto;
}
- @Autowired
+
private ProductionProductInputMapper productionProductInputMapper;
@Override
@@ -1655,7 +1631,7 @@
List<ProductionTaskStatisticsDto> startList = productionOperationTaskMapper.selectTaskStartStats(startStr, endStr);
- List<com.ruoyi.production.dto.ProductionProductOutputDto> outputList = productionProductOutputMapper
+ List<ProductionProductOutputDto> outputList = productionProductOutputMapper
.selectOutputStats(startStr, endStr);
Map<String, WorkOrderEfficiencyDto> dateMap = new HashMap<>();
@@ -1675,7 +1651,7 @@
// 瀹屽伐鏁伴噺鍜岃壇鍝佺巼
if (!CollectionUtils.isEmpty(outputList)) {
- for (com.ruoyi.production.dto.ProductionProductOutputDto item : outputList) {
+ for (ProductionProductOutputDto item : outputList) {
if (item.getCreateTime() != null) {
String date = item.getCreateTime().toLocalDate().toString();
WorkOrderEfficiencyDto dto = dateMap.getOrDefault(date, new WorkOrderEfficiencyDto());
@@ -1748,7 +1724,7 @@
.collect(Collectors.toList());
}
- @Autowired
+
private ProductionAccountMapper salesLedgerProductionAccountingMapper;
@Override
--
Gitblit v1.9.3