From dac0fc7d2855d3477f8d440888b0883507537b1b Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:40:37 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 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 395a414..e01927c 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -87,33 +87,37 @@
private final PaymentRegistrationMapper paymentRegistrationMapper;
- private SysDeptMapper sysDeptMapper;
+ private final SysDeptMapper sysDeptMapper;
private final NoticeMapper noticeMapper;
-
+
private final ProductionOrderMapper productionOrderMapper;
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;
+
+ private final ProductionAccountMapper productionAccountMapper;
+
+ private final ProductionProductInputMapper productionProductInputMapper;
@Override
public HomeBusinessDto business() {
@@ -490,7 +494,7 @@
.reduce(BigDecimal.ZERO, BigDecimal::add);
}
-
+
private DeviceRepairMapper deviceRepairMapper;
@Override
@@ -1465,9 +1469,6 @@
return dto;
}
-
- private ProductionProductInputMapper productionProductInputMapper;
-
@Override
public List<InputOutputAnalysisDto> inputOutputAnalysis(Integer type) {
LocalDate today = LocalDate.now();
@@ -1498,7 +1499,8 @@
String endStr = endDate.atStartOfDay()
.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- List<Map<String, Object>> inputList = productionProductInputMapper.selectInputStats(startStr, endStr);
+// List<Map<String, Object>> inputList = productionProductInputMapper.selectInputStats(startStr, endStr);
+ List<Map<String, Object>> inputList = null;
List<Map<String, Object>> outputList = productionProductOutputMapper.selectDailyOutputStats(startStr, endStr);
Map<String, InputOutputAnalysisDto> dateMap = new HashMap<>();
@@ -1724,8 +1726,6 @@
.collect(Collectors.toList());
}
-
- private ProductionAccountMapper salesLedgerProductionAccountingMapper;
@Override
public List<ProductionAccountingDto> productionAccountingAnalysis(Integer type) {
@@ -1754,7 +1754,7 @@
String endStr = endDate.plusDays(1).atStartOfDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- List<Map<String, Object>> wagesList = salesLedgerProductionAccountingMapper.selectDailyWagesStats(startStr,
+ List<Map<String, Object>> wagesList = productionAccountMapper.selectDailyWagesStats(startStr,
endStr);
if (CollectionUtils.isEmpty(wagesList)) {
--
Gitblit v1.9.3