From 6ad5c2cdc193cf7bb02884961b7434cd7f607a0d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 16 四月 2026 10:48:09 +0800
Subject: [PATCH] feat(production): 扩展生产工艺路线支持多产品绑定及工单权限控制
---
src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java | 146 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 118 insertions(+), 28 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 14426c4..695d85d 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
@@ -1,20 +1,37 @@
package com.ruoyi.production.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.production.dto.ProductOrderDto;
-import com.ruoyi.production.mapper.*;
-import com.ruoyi.production.pojo.*;
-import com.ruoyi.production.service.ProcessRouteService;
+import com.ruoyi.production.dto.ProductStructureDto;
+import com.ruoyi.production.mapper.ProcessRouteMapper;
+import com.ruoyi.production.mapper.ProductOrderMapper;
+import com.ruoyi.production.mapper.ProductProcessRouteItemMapper;
+import com.ruoyi.production.mapper.ProductProcessRouteMapper;
+import com.ruoyi.production.mapper.ProductWorkOrderMapper;
+import com.ruoyi.production.mapper.ProductionProductMainMapper;
+import com.ruoyi.production.pojo.ProcessRoute;
+import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.pojo.ProductProcessRoute;
+import com.ruoyi.production.pojo.ProductProcessRouteItem;
+import com.ruoyi.production.pojo.ProductWorkOrder;
+import com.ruoyi.production.pojo.ProductionProductMain;
import com.ruoyi.production.service.ProductOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class ProductOrderServiceImpl extends ServiceImpl<ProductOrderMapper, ProductOrder> implements ProductOrderService {
@@ -29,51 +46,56 @@
private ProductProcessRouteMapper productProcessRouteMapper;
@Autowired
- private ProcessRouteItemMapper processRouteItemMapper;
-
- @Autowired
private ProductProcessRouteItemMapper productProcessRouteItemMapper;
@Autowired
private ProductWorkOrderMapper productWorkOrderMapper;
+ @Autowired
+ private ProductionProductMainMapper productionProductMainMapper;
@Override
public IPage<ProductOrderDto> pageProductOrder(Page page, ProductOrderDto productOrder) {
- return productOrderMapper.pageProductOrder(page, productOrder);
+ Long userId = SecurityUtils.getUserId();
+ boolean isAdmin = SecurityUtils.isAdmin(userId) || SecurityUtils.hasRole(Constants.SUPER_ADMIN);
+ return productOrderMapper.pageProductOrder(page, productOrder, userId, isAdmin);
}
@Override
public int bindingRoute(ProductOrder productOrder) {
- //鏂板鐢熶骇璁㈠崟涓嬬殑宸ヨ壓璺嚎涓昏〃
- ProcessRoute processRoute = processRouteMapper.selectById(productOrder.getRouteId());
+ List<ProductProcessRouteItem> processRouteItems = productOrder.getProcessRouteItems();
+ if (ObjectUtils.isEmpty(processRouteItems)) {
+ throw new RuntimeException("宸ュ簭鍒楄〃涓嶈兘涓虹┖");
+ }
+
+ ProcessRoute processRoute = null;
+ if (ObjectUtils.isNotEmpty(productOrder.getRouteId())) {
+ processRoute = processRouteMapper.selectById(productOrder.getRouteId());
+ }
+
ProductProcessRoute productProcessRoute = new ProductProcessRoute();
- productProcessRoute.setProductModelId(processRoute.getProductModelId());
- productProcessRoute.setProcessRouteCode(processRoute.getProcessRouteCode());
+ productProcessRoute.setProductModelId(productOrder.getProductModelId());
+ productProcessRoute.setProcessRouteCode(processRoute != null ? processRoute.getProcessRouteCode() : productOrder.getProcessRouteCode());
productProcessRoute.setProductOrderId(productOrder.getId());
- productProcessRoute.setBomId(processRoute.getBomId());
+ productProcessRoute.setBomId(processRoute != null ? processRoute.getBomId() : productOrder.getBomId());
productProcessRouteMapper.insert(productProcessRoute);
- //鏂板鐢熶骇璁㈠崟涓嬬殑宸ヨ壓璺嚎瀛愯〃
- List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRoute.getId()));
- // 鐢熸垚褰撳墠鏃ユ湡鐨勫墠缂�锛氬勾鏈堟棩
+
String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
- for (ProcessRouteItem processRouteItem : processRouteItems) {
+ for (ProductProcessRouteItem processRouteItem : processRouteItems) {
ProductProcessRouteItem productProcessRouteItem = new ProductProcessRouteItem();
- productProcessRouteItem.setProductModelId(processRouteItem.getProductModelId());
+ productProcessRouteItem.setProductModelId(productOrder.getProductModelId());
productProcessRouteItem.setProcessId(processRouteItem.getProcessId());
productProcessRouteItem.setProductOrderId(productOrder.getId());
productProcessRouteItem.setProductRouteId(productProcessRoute.getId());
+ productProcessRouteItem.setDragSort(processRouteItem.getDragSort());
+ productProcessRouteItem.setIsQuality(processRouteItem.getIsQuality());
+ productProcessRouteItem.setReportUserIds(processRouteItem.getReportUserIds());
int insert = productProcessRouteItemMapper.insert(productProcessRouteItem);
if (insert > 0) {
- // 鏌ヨ浠婃棩宸插瓨鍦ㄧ殑鏈�澶у伐鍗曞彿
- QueryWrapper<ProductWorkOrder> queryWrapper = new QueryWrapper<>();
- queryWrapper.likeRight("work_order_no", datePrefix)
- .orderByDesc("work_order_no")
- .last("LIMIT 1");
- ProductWorkOrder lastWorkOrder = productWorkOrderMapper.selectOne(queryWrapper);
- int sequenceNumber = 1; // 榛樿搴忓彿
+ ProductWorkOrder lastWorkOrder = productWorkOrderMapper.selectMax(datePrefix);
+ int sequenceNumber = 1;
if (lastWorkOrder != null && lastWorkOrder.getWorkOrderNo() != null) {
- String lastNo = lastWorkOrder.getWorkOrderNo().toString();
+ String lastNo = lastWorkOrder.getWorkOrderNo();
if (lastNo.startsWith(datePrefix)) {
String seqStr = lastNo.substring(datePrefix.length());
try {
@@ -83,12 +105,14 @@
}
}
}
- // 鐢熸垚瀹屾暣鐨勫伐鍗曞彿
- String workOrderNoStr = String.format("%s%03d", datePrefix, sequenceNumber);
+ String workOrderNoStr = "GD" + String.format("%s%03d", datePrefix, sequenceNumber);
ProductWorkOrder productWorkOrder = new ProductWorkOrder();
productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
productWorkOrder.setProductOrderId(productOrder.getId());
- productWorkOrder.setPlanQuantity(productOrder.getQuantity());
+ ProductOrder order = productOrderMapper.selectById(productOrder.getId());
+ productWorkOrder.setPlanQuantity(order.getQuantity());
+ // 鏂板鐢熶骇璁㈠崟鏃讹紝灏嗗伐搴忎笂鐨勬姤宸ヤ汉鍚屾鍒板伐鍗曪紝鍚庣画鎸夊伐鍗曟姤宸ヤ汉鍋氭潈闄愭牎楠�
+ productWorkOrder.setReportUserIds(productProcessRouteItem.getReportUserIds());
productWorkOrder.setWorkOrderNo(workOrderNoStr);
productWorkOrder.setStatus(1);
productWorkOrderMapper.insert(productWorkOrder);
@@ -101,4 +125,70 @@
public List<ProcessRoute> listProcessRoute(Long productModelId) {
return productOrderMapper.listProcessRoute(productModelId);
}
+
+ @Override
+ public List<ProductStructureDto> listProcessBom(Long orderId) {
+ return productOrderMapper.listProcessBom(orderId);
+ }
+
+ @Override
+ public Boolean addProductOrder(ProductOrder productOrder) {
+ String orderNo = generateNextOrderNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+ productOrder.setNpsNo(orderNo);
+ productOrder.setCompleteQuantity(BigDecimal.ZERO);
+ this.save(productOrder);
+ if (ObjectUtils.isNotEmpty(productOrder.getProcessRouteItems())) {
+ this.bindingRoute(productOrder);
+ }
+ return true;
+ }
+
+ @Override
+ public Boolean delete(Long[] ids) {
+ List<ProductWorkOrder> productWorkOrders = productWorkOrderMapper.selectList(
+ Wrappers.<ProductWorkOrder>lambdaQuery().in(ProductWorkOrder::getProductOrderId, ids)
+ );
+ if (!productWorkOrders.isEmpty()) {
+ List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(
+ Wrappers.<ProductionProductMain>lambdaQuery()
+ .in(ProductionProductMain::getWorkOrderId, productWorkOrders.stream().map(ProductWorkOrder::getId).collect(Collectors.toList()))
+ );
+ if (!productionProductMains.isEmpty()) {
+ throw new RuntimeException("鐢熶骇璁㈠崟宸茬粡寮�濮嬬敓浜э紝涓嶈兘鍒犻櫎");
+ }
+ productWorkOrderMapper.delete(Wrappers.<ProductWorkOrder>lambdaQuery().in(ProductWorkOrder::getProductOrderId, ids));
+ }
+
+ productProcessRouteItemMapper.delete(new LambdaQueryWrapper<ProductProcessRouteItem>()
+ .in(ProductProcessRouteItem::getProductOrderId, ids));
+ productProcessRouteMapper.delete(new LambdaQueryWrapper<ProductProcessRoute>()
+ .in(ProductProcessRoute::getProductOrderId, ids));
+ productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>()
+ .in(ProductOrder::getId, ids));
+ return true;
+ }
+
+ public String getMaxOrderNoByDate(String datePrefix) {
+ QueryWrapper<ProductOrder> queryWrapper = new QueryWrapper<>();
+ queryWrapper.likeRight("nps_no", "SC" + datePrefix);
+ queryWrapper.orderByDesc("nps_no");
+ queryWrapper.last("LIMIT 1");
+
+ ProductOrder latestOrder = this.getOne(queryWrapper);
+ return latestOrder != null ? latestOrder.getNpsNo() : null;
+ }
+
+ public String generateNextOrderNo(String datePrefix) {
+ String maxOrderNo = getMaxOrderNoByDate(datePrefix);
+ int sequence = 1;
+ if (maxOrderNo != null && !maxOrderNo.isEmpty()) {
+ String sequenceStr = maxOrderNo.substring(("SC" + datePrefix).length());
+ try {
+ sequence = Integer.parseInt(sequenceStr) + 1;
+ } catch (NumberFormatException e) {
+ sequence = 1;
+ }
+ }
+ return "SC" + datePrefix + String.format("%04d", sequence);
+ }
}
--
Gitblit v1.9.3