From becb020492248fbf5a2920c954e03fd08d4b0e6f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 26 三月 2026 17:21:59 +0800
Subject: [PATCH] fix: 流程工序排序功能
---
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 74 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
index 1772404..39195ff 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -1,17 +1,35 @@
package com.ruoyi.production.service.impl;
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.production.dto.ProcessRouteDto;
+import com.ruoyi.production.mapper.ProcessRouteItemMapper;
import com.ruoyi.production.mapper.ProcessRouteMapper;
+import com.ruoyi.production.mapper.ProductOrderMapper;
+import com.ruoyi.production.mapper.ProductProcessRouteMapper;
import com.ruoyi.production.pojo.ProcessRoute;
+import com.ruoyi.production.pojo.ProcessRouteItem;
+import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.pojo.ProductProcessRoute;
import com.ruoyi.production.service.ProcessRouteService;
+import com.ruoyi.sales.pojo.SalesLedgerProcessRoute;
+import com.ruoyi.sales.service.ISalesLedgerProcessRouteService;
+import com.ruoyi.sales.service.ISalesLedgerProductProcessService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
@Service
@AllArgsConstructor
@@ -19,11 +37,67 @@
public class ProcessRouteServiceImpl extends ServiceImpl<ProcessRouteMapper, ProcessRoute> implements ProcessRouteService {
@Autowired
+ private ISalesLedgerProcessRouteService salesLedgerProcessRouteService;
+
+ @Autowired
private ProcessRouteMapper processRouteMapper;
+
+ @Autowired
+ private ProcessRouteItemMapper processRouteItemMapper;
+
+ @Autowired
+ private ProductOrderMapper productOrderMapper;
@Override
public IPage<ProcessRouteDto> pageProcessRouteDto(Page<ProcessRouteDto> page, ProcessRouteDto processRouteDto) {
return processRouteMapper.pageProcessRouteDto(page, processRouteDto);
}
+
+ @Override
+ public Integer saveProcessRoute(ProcessRoute processRoute) {
+ if (processRoute == null) {
+ throw new ServiceException("宸ヨ壓璺嚎鏂板澶辫触,鏁版嵁涓嶈兘涓虹┖");
+ }
+ if (StringUtils.isEmpty(processRoute.getProcessRouteName())) {
+ throw new ServiceException("宸ヨ壓璺嚎鏂板澶辫触,鍚嶇О涓嶈兘涓虹┖");
+ }
+ this.save(processRoute);
+ String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ String idStr = String.format("%06d", processRoute.getId());
+ String newProductCode = "GYLX" + dateStr + idStr;
+ // 鏇存柊鏁版嵁搴撲腑鐨刾roductCode
+ processRoute.setProcessRouteCode(newProductCode);
+ return processRouteMapper.updateById(processRoute);
+ }
+
+ @Override
+ public int batchDelete(List<Long> ids) {
+ //鍏堝垽鏂槸鍚﹀凡缁忓紩鐢ㄤ簡
+ List<SalesLedgerProcessRoute> list = salesLedgerProcessRouteService.list(new LambdaQueryWrapper<SalesLedgerProcessRoute>().in(SalesLedgerProcessRoute::getProcessRouteId, ids));
+ if (list != null && list.size() > 0) {
+ throw new ServiceException("璇ュ伐鑹鸿矾绾垮凡琚紩鐢ㄤ笉鑳藉垹闄�");
+ }
+ //鍒犻櫎宸ヨ壓璺嚎璇︽儏
+ processRouteItemMapper.delete(Wrappers.<ProcessRouteItem>lambdaQuery().in(ProcessRouteItem::getRouteId, ids));
+ return processRouteMapper.deleteBatchIds(ids);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateDefault(Long id) {
+ ProcessRoute currentRoute = this.getById(id);
+ if (currentRoute == null) {
+ throw new ServiceException("宸ヨ壓璺嚎涓嶅瓨鍦�");
+ }
+ if (Integer.valueOf(1).equals(currentRoute.getIsDefault())) {
+ return;
+ }
+ this.update(Wrappers.<ProcessRoute>lambdaUpdate()
+ .set(ProcessRoute::getIsDefault, 0)
+ .eq(ProcessRoute::getIsDefault, 1));
+ this.update(Wrappers.<ProcessRoute>lambdaUpdate()
+ .set(ProcessRoute::getIsDefault, 1)
+ .eq(ProcessRoute::getId, id));
+ }
}
--
Gitblit v1.9.3