From ec8d7cbe79f8c012f0d855e19fee9dc8cd27608f Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 16:24:54 +0800
Subject: [PATCH] 1.各生产订单的完成进度统计接口 2.在制品周转情况接口 3.生产报工记录添加上生产时间字段
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 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 5630e84..58b6c06 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.home.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.collaborativeApproval.mapper.NoticeMapper;
@@ -22,6 +24,14 @@
import com.ruoyi.procurementrecord.pojo.CustomStorage;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
+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.ProductWorkOrderMapper;
+import com.ruoyi.production.mapper.ProductionProductMainMapper;
+import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
@@ -98,6 +108,12 @@
@Autowired
private NoticeMapper noticeMapper;
+ @Autowired
+ private ProductOrderMapper productOrderMapper;
+ @Autowired
+ private ProductionProductMainMapper productionProductMainMapper;
+ @Autowired
+ private ProductWorkOrderMapper productWorkOrderMapper;
@Override
public HomeBusinessDto business() {
@@ -490,4 +506,41 @@
.eq(Notice::getStatus, 1) // 1琛ㄧず鍙戝竷鐘舵��
.ge(Notice::getExpirationDate, new Date())); // 杩囨湡鏃堕棿澶т簬绛変簬褰撳墠鏃ユ湡
}
+
+ @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(BigDecimal.valueOf(productOrderDto.getPlanQuantity()-productOrderDto.getQuantity()).divide(BigDecimal.valueOf(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() == 0).count();
+
+ // 6. 璧嬪�兼眹鎬绘暟鎹�
+ productionProgressDto.setTotalOrderCount(totalCount);
+ productionProgressDto.setCompletedOrderCount(completedCount);
+ productionProgressDto.setUncompletedOrderCount(totalCount - completedCount);
+ productionProgressDto.setCompletedProgressCount(BigDecimal.valueOf(completedCount).divide(BigDecimal.valueOf(totalCount), 2, RoundingMode.HALF_UP));
+ 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;
+
+ }
}
--
Gitblit v1.9.3