From f350465db70d6f9db9494483ee0cec7793a9007b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 17:47:57 +0800
Subject: [PATCH] feat(approve): 实现审批流程或签会签功能并优化数据库配置
---
src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
index 81ac09e..b7063e4 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
@@ -1,5 +1,7 @@
package com.ruoyi.production.service.impl;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,16 +17,22 @@
import com.ruoyi.production.service.ProductOrderService;
import com.ruoyi.production.service.ProductProcessService;
import com.ruoyi.production.service.ProductWorkOrderService;
+import com.ruoyi.production.service.ProductionPrintOrderService;
+import com.ruoyi.production.service.ProductionProductMainService;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.Function;
import java.util.stream.Collectors;
@Service
@@ -33,6 +41,10 @@
private final ProductWorkOrderService productWorkOrderService;
private final ProductProcessService productProcessService;
+
+ @Autowired
+ @Lazy
+ private ProductionPrintOrderService productionPrintOrderService;
@Autowired
private ProductOrderMapper productOrderMapper;
@Autowired
@@ -57,10 +69,26 @@
private SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
@Autowired
private StockUtils stockUtils;
+ @Autowired
+ private ProductionProductMainService productionProductMainService;
@Override
public IPage<ProductOrderDto> pageProductOrder(Page page, ProductOrderDto productOrder) {
- return productOrderMapper.pageProductOrder(page, productOrder);
+ IPage<ProductOrderDto> productOrderDtoIPage = productOrderMapper.pageProductOrder(page, productOrder);
+ // 濉厖鍗板埛鍗曚俊鎭�
+ List<ProductOrderDto> records = productOrderDtoIPage.getRecords();
+ if (CollUtil.isNotEmpty(records)) {
+ List<Long> orderIds = records.stream().map(ProductOrderDto::getId).collect(Collectors.toList());
+ Map<Long, ProductionPrintOrder> collect = productionPrintOrderService.getListByOrders(orderIds).stream().collect(Collectors.toMap(ProductionPrintOrder::getProductOrderId, Function.identity()));
+ records.forEach(record -> {
+ ProductionPrintOrder productionPrintOrder = collect.get(record.getId());
+ if (productionPrintOrder != null) {
+ productionPrintOrder.convertProductOrderDto(record);
+ }
+ });
+ }
+
+ return productOrderDtoIPage;
}
@Override
@@ -75,11 +103,14 @@
productProcessRouteMapper.insert(productProcessRoute);
//鏂板鐢熶骇璁㈠崟涓嬬殑宸ヨ壓璺嚎瀛愯〃
List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRoute.getId()));
- Map<Long, ProductProcess> productProcessMap = productProcessService
- .list(new LambdaQueryWrapper<ProductProcess>().in(ProductProcess::getId, processRouteItems.stream().map(ProcessRouteItem::getProcessId).collect(Collectors.toList())))
- .stream()
- .collect(Collectors.toMap(ProductProcess::getId, productProcess -> productProcess));
+ Map<Long, ProductProcess> productProcessMap = new HashMap<>();
+ if(CollUtil.isNotEmpty(processRouteItems)){
+ productProcessMap = productProcessService
+ .list(new LambdaQueryWrapper<ProductProcess>().in(ProductProcess::getId, processRouteItems.stream().map(ProcessRouteItem::getProcessId).collect(Collectors.toList())))
+ .stream()
+ .collect(Collectors.toMap(ProductProcess::getId, productProcess -> productProcess));
+ }
// 鐢熸垚褰撳墠鏃ユ湡鐨勫墠缂�锛氬勾鏈堟棩
for (ProcessRouteItem processRouteItem : processRouteItems) {
ProductProcessRouteItem productProcessRouteItem = new ProductProcessRouteItem();
@@ -88,6 +119,7 @@
productProcessRouteItem.setProductOrderId(productOrder.getId());
productProcessRouteItem.setProductRouteId(productProcessRoute.getId());
productProcessRouteItem.setDragSort(processRouteItem.getDragSort());
+ productProcessRouteItem.setIsQuality(processRouteItem.getIsQuality());
int insert = productProcessRouteItemMapper.insert(productProcessRouteItem);
if (insert > 0) {
@@ -96,11 +128,13 @@
productWorkOrder.setProductOrderId(productOrder.getId());
ProductOrder order = productOrderMapper.selectById(productOrder.getId());
productWorkOrder.setPlanQuantity(order.getQuantity());
- productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder(null, productProcessMap.getOrDefault(productProcessRouteItem.getProcessId(), new ProductProcess()).getName(), productOrder.getNpsNo()));
+ productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder( productProcessMap.getOrDefault(productProcessRouteItem.getProcessId(), new ProductProcess()).getName(), productOrder.getNpsNo()));
productWorkOrder.setStatus(1);
productWorkOrderMapper.insert(productWorkOrder);
}
}
+ // 鎺掍骇涓嬭揪鍚庤嚜鍔ㄨЕ鍙戠涓�閬撻渶璐ㄦ宸ュ簭鐨勮繃绋嬫楠�
+ productionProductMainService.preGenerateQualityInspectForOrder(productOrder.getId());
return productOrderMapper.updateById(productOrder);
}
@@ -138,6 +172,9 @@
if (productionProductMains.size() > 0) {
throw new RuntimeException("鐢熶骇璁㈠崟宸茬粡寮�濮嬬敓浜�,涓嶈兘鍒犻櫎");
}
+ // 娓呯悊鎺掍骇棰勭敓鎴愮殑璐ㄦ鍗�
+ productionProductMainService.cleanPreGeneratedQualityInspects(
+ productWorkOrders.stream().map(ProductWorkOrder::getId).collect(Collectors.toList()));
//鍒犻櫎宸ュ崟
productWorkOrderMapper.delete(Wrappers.<ProductWorkOrder>lambdaQuery().in(ProductWorkOrder::getProductOrderId, ids));
}
@@ -150,6 +187,22 @@
productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>()
.in(ProductOrder::getId, ids));
return true;
+ }
+
+ @Override
+ public ProductWorkOrder startProduction(Long id) {
+ LocalDateTime now = LocalDateTime.now();
+ ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(id);
+ productWorkOrder.setStartProductTime(now);
+ Assert.notNull(productWorkOrder, "宸ュ崟涓嶅瓨鍦�");
+
+
+ ProductWorkOrder needUpdate = new ProductWorkOrder();
+ needUpdate.setId(id);
+ needUpdate.setStartProductTime(now);
+ productWorkOrderMapper.updateById(needUpdate);
+
+ return productWorkOrder;
}
//鑾峰彇褰撳墠鐢熶骇璁㈠崟鍙�
@@ -169,8 +222,8 @@
return "SC" + datePrefix + formatOrderSequence(datePrefix);
}
- public String generateNextOrderByContractNo(String datePrefix, String contractNo) {
- return contractNo + formatOrderSequence(datePrefix);
+ public String generateNextOrderByContractNo(String contractNo) {
+ return contractNo + formatOrderSequenceByContractNo(contractNo);
}
private String formatOrderSequence(String datePrefix) {
@@ -189,4 +242,12 @@
return String.format("%04d", sequence);
}
+
+ private String formatOrderSequenceByContractNo(String contractNo) {
+ LambdaQueryWrapper<ProductOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.likeRight(ProductOrder::getNpsNo, contractNo);
+ Long count = productOrderMapper.selectCount(queryWrapper);
+ return String.format("%04d", count+1);
+ }
+
}
--
Gitblit v1.9.3