From 1f1ef0f62c4953e3ff9c610cda8f3c4f8a45c025 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 20 一月 2026 14:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into hsxny-new
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 134 +++++++++++++++++++++++++++++---------------
1 files changed, 87 insertions(+), 47 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 848670b..5cc269c 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -2,9 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.collaborativeApproval.mapper.NoticeMapper;
import com.ruoyi.collaborativeApproval.pojo.Notice;
import com.ruoyi.common.utils.SecurityUtils;
@@ -24,13 +27,16 @@
import com.ruoyi.procurementrecord.pojo.CustomStorage;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
+import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductWorkOrderDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.mapper.ProductOrderMapper;
+import com.ruoyi.production.mapper.ProductProcessMapper;
import com.ruoyi.production.mapper.ProductWorkOrderMapper;
import com.ruoyi.production.mapper.ProductionProductMainMapper;
import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.pojo.ProductProcess;
import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
@@ -59,6 +65,7 @@
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
@@ -113,10 +120,13 @@
@Autowired
private ProductOrderMapper productOrderMapper;
@Autowired
- private ProductionProductMainMapper productionProductMainMapper;
+ private ProductProcessMapper productProcessMapper;
@Autowired
private ProductWorkOrderMapper productWorkOrderMapper;
-
+ @Autowired
+ private ProductModelMapper productModelMapper;
+ @Autowired
+ private StockUtils stockUtils;
@Override
public HomeBusinessDto business() {
// 鏋勫缓缁撴灉
@@ -169,23 +179,35 @@
homeBusinessDto.setMonthPurchaseHaveMoney(unReceiptPaymentAmount.setScale(2, RoundingMode.HALF_UP).toString());
}
// 缁熻搴撳瓨
- List<ProcurementRecordStorage> procurementRecordStorages = procurementRecordStorageMapper.selectList(null);
- BigDecimal stockAmount = procurementRecordStorages.stream()
- .map(ProcurementRecordStorage::getInboundNum)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- // 鑷畾涔夊簱瀛�
- List<CustomStorage> customStorages = customStorageMapper.selectList(null);
- BigDecimal customStockAmount = customStorages.stream()
- .map(CustomStorage::getInboundNum)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- List<ProcurementRecordOut> procurementRecordOuts = procurementRecordOutMapper.selectList(null);
- BigDecimal outboundAmount = procurementRecordOuts.stream()
- .map(ProcurementRecordOut::getInboundNum)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal stock = stockAmount.add(customStockAmount).subtract(outboundAmount);
+// List<ProcurementRecordStorage> procurementRecordStorages = procurementRecordStorageMapper.selectList(null);
+// BigDecimal stockAmount = procurementRecordStorages.stream()
+// .map(ProcurementRecordStorage::getInboundNum)
+// .filter(Objects::nonNull)
+// .reduce(BigDecimal.ZERO, BigDecimal::add);
+// // 鑷畾涔夊簱瀛�
+// List<CustomStorage> customStorages = customStorageMapper.selectList(null);
+// BigDecimal customStockAmount = customStorages.stream()
+// .map(CustomStorage::getInboundNum)
+// .filter(Objects::nonNull)
+// .reduce(BigDecimal.ZERO, BigDecimal::add);
+// List<ProcurementRecordOut> procurementRecordOuts = procurementRecordOutMapper.selectList(null);
+// BigDecimal outboundAmount = procurementRecordOuts.stream()
+// .map(ProcurementRecordOut::getInboundNum)
+// .filter(Objects::nonNull)
+// .reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal stock = stockAmount.add(customStockAmount).subtract(outboundAmount);
+ IPage<ProductModel> productModelIPage = productModelMapper.listPageProductModel(new Page<>(1, -1), new ProductModel());
+ if(!CollectionUtils.isEmpty(productModelIPage.getRecords())){
+ //鑾峰彇瑙勬牸id
+ List<Long> modelIds = productModelIPage.getRecords().stream().map(ProductModel::getId).collect(Collectors.toList());
+ BigDecimal stockQuantityTotal = modelIds.stream()
+ .map(stockUtils::getStockQuantity)
+ .map(map -> map.get("stockQuantity"))
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ homeBusinessDto.setInventoryNum(stockQuantityTotal.setScale(2, RoundingMode.HALF_UP).toString());
+ }
+
// 鑾峰彇褰撳ぉ鍏ュ簱鏁伴噺
LambdaQueryWrapper<ProcurementRecordStorage> procurementRecordStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordStorageLambdaQueryWrapper.ge(ProcurementRecordStorage::getCreateTime, now) // 澶т簬绛変簬褰撳ぉ
@@ -195,7 +217,7 @@
.map(ProcurementRecordStorage::getInboundNum)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- homeBusinessDto.setInventoryNum(stock.setScale(2, RoundingMode.HALF_UP).toString());
+// homeBusinessDto.setInventoryNum(stock.setScale(2, RoundingMode.HALF_UP).toString());
homeBusinessDto.setTodayInventoryNum(stockAmount1.setScale(2, RoundingMode.HALF_UP).toString());
return homeBusinessDto;
}
@@ -512,37 +534,55 @@
@Override
public ProductionProgressDto productionProgress() {
ProductionProgressDto productionProgressDto = new ProductionProgressDto();
- List<ProductOrder> productOrderList = productOrderMapper.selectList(new LambdaQueryWrapper<ProductOrder>());
- List<ProductOrderDto> productOrderDtoList = new ArrayList<>();
- productOrderList.forEach(productOrder -> {
- ProductOrderDto productOrderDto = productOrderMapper.productMainByOrderId(productOrder);
-// if (productOrderDto != null && productOrderDto.getPlanQuantity() != null && productOrderDto.getQuantity() != null) {
-// productOrderDto.setCompletionStatus((productOrderDto.getPlanQuantity().subtract(productOrderDto.getQuantity())).divide(productOrderDto.getPlanQuantity(), 2, RoundingMode.HALF_UP));
-// }
- productOrderDtoList.add(productOrderDto);
- });
- productionProgressDto.setCompletedOrderDetails(productOrderDtoList);
- // 1. 鏌ヨ鎵�鏈夌敓浜ц鍗曪紙鍙牴鎹渶姹傛坊鍔犺繃婊ゆ潯浠讹紝濡傛帓闄ゅ凡鍒犻櫎銆佸凡鍙栨秷鐨勮鍗曪級
- IPage<ProductOrderDto> productOrderDtoIPage = productOrderMapper.pageProductOrder(new Page<>(1, -1), new ProductOrderDto());
-
- // 2. 鍒濆鍖栨眹鎬绘暟鎹�
- int totalCount = productOrderDtoIPage.getRecords().size();
- int completedCount = (int) productOrderDtoIPage.getRecords().stream().map(productOrderDto -> productOrderMapper.productMainByOrderId(productOrderDto)).filter(productOrderDto1 -> productOrderDto1.getQuantity() != null && productOrderDto1.getQuantity().compareTo(BigDecimal.ZERO) == 0).count();
-
- // 6. 璧嬪�兼眹鎬绘暟鎹�
+ ProductOrderDto orderDto = new ProductOrderDto();
+ orderDto.setStartTime(LocalDateTime.now().minusMonths(1));
+ orderDto.setEndTime(LocalDateTime.now());
+ List<ProductOrderDto> productOrderDtos = productOrderMapper.pageProductOrder(new Page<>(1, -1), orderDto).getRecords();
+ productionProgressDto.setCompletedOrderDetails(productOrderDtos);
+ long totalCount = productOrderDtos.size();
+ long count = productOrderDtos.stream().filter(productOrderDto -> productOrderDto.getCompleteQuantity().compareTo(productOrderDto.getQuantity()) >= 0).count();
+ long count2 = productOrderDtos.stream().filter(productOrderDto -> productOrderDto.getCompleteQuantity().compareTo(BigDecimal.ZERO) == 0).count();
productionProgressDto.setTotalOrderCount(totalCount);
- productionProgressDto.setCompletedOrderCount(completedCount);
- productionProgressDto.setUncompletedOrderCount(totalCount - completedCount);
- productionProgressDto.setCompletedProgressCount(BigDecimal.valueOf(completedCount).divide(BigDecimal.valueOf(totalCount), 2, RoundingMode.HALF_UP));
+ productionProgressDto.setCompletedOrderCount(count);
+ productionProgressDto.setUncompletedOrderCount(count2);
+ productionProgressDto.setPartialCompletedOrderCount(totalCount-count-count2);
return productionProgressDto;
}
@Override
- public Map<Integer, List<ProductWorkOrderDto>> workInProcessTurnover() {
- List<ProductWorkOrderDto> productWorkOrderDtoList = productWorkOrderMapper.selectProductWorkOrderDtoList();
- //鏍规嵁鐘舵�佸尯鍒嗗伐鍗曠殑鍚勪釜鐘舵��
- Map<Integer, List<ProductWorkOrderDto>> productWorkOrderDtoMap = productWorkOrderDtoList.stream().collect(Collectors.groupingBy(ProductWorkOrderDto::getStatus));
-
- return productWorkOrderDtoMap;
+ public ProductionTurnoverDto workInProcessTurnover() {
+ ProductionTurnoverDto productionTurnoverDto = new ProductionTurnoverDto();
+ ProductWorkOrderDto workOrder = new ProductWorkOrderDto();
+ workOrder.setPlanStartTime(LocalDate.now().minusMonths(1));
+ workOrder.setPlanEndTime(LocalDate.now());
+ List<ProductWorkOrderDto> productWorkOrders = productWorkOrderMapper.pageProductWorkOrder(new Page<>(1, -1), workOrder).getRecords();
+ long sum = productWorkOrders.stream()
+ .filter(productWorkOrder -> productWorkOrder.getPlanQuantity().compareTo(productWorkOrder.getCompleteQuantity()) > 0)
+ .map(ProductWorkOrder::getPlanQuantity)
+ .mapToLong(BigDecimal::longValue)
+ .sum();
+ if (sum == 0)return null;
+ productionTurnoverDto.setTotalOrderCount(sum);//鎬诲湪鍒跺搧鏁伴噺
+ productionTurnoverDto.setAverageTurnoverDays(BigDecimal.valueOf(sum).divide(BigDecimal.valueOf(ChronoUnit.DAYS.between(LocalDateTime.now().minusMonths(1), LocalDateTime.now())),2,RoundingMode.HALF_UP));
+ long completeQuantity = productWorkOrders.stream()
+ .filter(productWorkOrder -> productWorkOrder.getCompleteQuantity().compareTo(productWorkOrder.getPlanQuantity()) >= 0)
+ .map(ProductWorkOrder::getCompleteQuantity)
+ .mapToLong(BigDecimal::longValue)
+ .sum();
+ productionTurnoverDto.setTurnoverEfficiency(BigDecimal.valueOf(completeQuantity).divide(BigDecimal.valueOf(sum),2,RoundingMode.HALF_UP));
+ Map<String, List<ProductWorkOrderDto>> map = productWorkOrders.stream()
+ .filter(productWorkOrder -> productWorkOrder.getPlanQuantity().compareTo(productWorkOrder.getCompleteQuantity()) > 0)
+ .collect(Collectors.groupingBy(ProductWorkOrderDto::getProcessName));
+ List<String> strings = new ArrayList<>();
+ List<Long> processQuantityDetails = new ArrayList<>();
+ map.entrySet().stream().forEach(entry -> {
+ String key = entry.getKey();
+ long completeSum = entry.getValue().stream().map(ProductWorkOrderDto::getCompleteQuantity).mapToLong(BigDecimal::longValue).sum();
+ strings.add(key);
+ processQuantityDetails.add(completeSum);
+ });
+ productionTurnoverDto.setProcessDetails(strings);
+ productionTurnoverDto.setProcessQuantityDetails(processQuantityDetails);
+ return productionTurnoverDto;
}
--
Gitblit v1.9.3