From 7f7993e0fde1e08bfd37982ab6eb9e5a08545b2d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 20 三月 2026 11:24:33 +0800
Subject: [PATCH] refactor: 生产订单绑定工艺路线的子表重命名
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemServiceImpl.java | 85 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/ruoyi/appendix/service/impl/ProcessRouteItemInstanceServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemServiceImpl.java
similarity index 62%
rename from src/main/java/com/ruoyi/appendix/service/impl/ProcessRouteItemInstanceServiceImpl.java
rename to src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemServiceImpl.java
index 79e30e5..696a7de 100644
--- a/src/main/java/com/ruoyi/appendix/service/impl/ProcessRouteItemInstanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemServiceImpl.java
@@ -1,17 +1,17 @@
-package com.ruoyi.appendix.service.impl;
+package com.ruoyi.production.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.appendix.dto.ProcessRouteItemInstanceDto;
-import com.ruoyi.appendix.mapper.ProcessRouteItemInstanceMapper;
-import com.ruoyi.appendix.pojo.ProcessRouteItemInstance;
-import com.ruoyi.appendix.pojo.ProcessRouteItemParamInstance;
-import com.ruoyi.appendix.service.ProcessRouteItemInstanceService;
-import com.ruoyi.appendix.service.ProcessRouteItemParamInstanceService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.production.dto.ProductionOrderRouteItemDto;
+import com.ruoyi.production.mapper.ProductionOrderRouteItemMapper;
import com.ruoyi.production.pojo.ProcessRouteItemParam;
import com.ruoyi.production.pojo.ProductProcess;
+import com.ruoyi.production.pojo.ProductionOrderRouteItem;
+import com.ruoyi.production.pojo.ProductionOrderRouteItemParam;
+import com.ruoyi.production.service.IProductionOrderRouteItemParamService;
+import com.ruoyi.production.service.IProductionOrderRouteItemService;
import com.ruoyi.production.service.ProcessRouteItemParamService;
import com.ruoyi.production.service.ProductProcessService;
import lombok.extern.slf4j.Slf4j;
@@ -24,34 +24,33 @@
import java.util.stream.Collectors;
/**
- * <br>
- * 宸ヨ壓璺嚎瀛愰泦-闄勮〃Service瀹炵幇绫�
- * </br>
+ * <p>
+ * 鐢熶骇璁㈠崟缁戝畾鐨勫伐鑹鸿矾绾�--宸ュ簭琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
*
* @author deslrey
- * @version 1.0
- * @since 2026/03/18 13:08
+ * @since 2026-03-20
*/
@Slf4j
@Service
-public class ProcessRouteItemInstanceServiceImpl extends ServiceImpl<ProcessRouteItemInstanceMapper, ProcessRouteItemInstance> implements ProcessRouteItemInstanceService {
+public class ProductionOrderRouteItemServiceImpl extends ServiceImpl<ProductionOrderRouteItemMapper, ProductionOrderRouteItem> implements IProductionOrderRouteItemService {
@Resource
private ProductProcessService productProcessService;
@Resource
- private ProcessRouteItemParamInstanceService processRouteItemParamInstanceService;
+ private IProductionOrderRouteItemParamService productionOrderRouteItemParamService;
@Resource
private ProcessRouteItemParamService processRouteItemParamService;
@Override
- public List<ProcessRouteItemInstanceDto> getProcessItem(Long orderId) {
- List<ProcessRouteItemInstance> list = list(new LambdaQueryWrapper<ProcessRouteItemInstance>()
- .eq(ProcessRouteItemInstance::getOrderId, orderId)
- .orderByAsc(ProcessRouteItemInstance::getDragSort));
+ public List<ProductionOrderRouteItemDto> getProcessItem(Long orderId) {
+ List<ProductionOrderRouteItem> list = list(new LambdaQueryWrapper<ProductionOrderRouteItem>()
+ .eq(ProductionOrderRouteItem::getOrderId, orderId)
+ .orderByAsc(ProductionOrderRouteItem::getDragSort));
return list.stream().map(item -> {
- ProcessRouteItemInstanceDto dto = new ProcessRouteItemInstanceDto();
+ ProductionOrderRouteItemDto dto = new ProductionOrderRouteItemDto();
BeanUtils.copyProperties(item, dto);
if (item.getProcessId() != null) {
ProductProcess process = productProcessService.getById(item.getProcessId());
@@ -64,7 +63,7 @@
}
@Override
- public void addProcessItem(ProcessRouteItemInstanceDto dto) {
+ public void addProcessItem(ProductionOrderRouteItemDto dto) {
if (dto == null) {
throw new ServiceException("鏂板鏁版嵁涓嶈兘涓虹┖");
}
@@ -74,51 +73,51 @@
if (dto.getProcessId() == null) {
throw new ServiceException("宸ュ簭ID涓嶈兘涓虹┖");
}
- ProcessRouteItemInstance entity = new ProcessRouteItemInstance();
+ ProductionOrderRouteItem entity = new ProductionOrderRouteItem();
BeanUtils.copyProperties(dto, entity);
entity.setId(null);
entity.setTenantId(SecurityUtils.getLoginUser().getTenantId());
entity.setCreateTime(LocalDateTime.now());
// 鍙栧綋鍓嶈鍗曚笅鏈�澶� dragSort + 1
- ProcessRouteItemInstance maxSortItem = getOne(new LambdaQueryWrapper<ProcessRouteItemInstance>()
- .eq(ProcessRouteItemInstance::getOrderId, dto.getOrderId())
- .orderByDesc(ProcessRouteItemInstance::getDragSort)
+ ProductionOrderRouteItem maxSortItem = getOne(new LambdaQueryWrapper<ProductionOrderRouteItem>()
+ .eq(ProductionOrderRouteItem::getOrderId, dto.getOrderId())
+ .orderByDesc(ProductionOrderRouteItem::getDragSort)
.last("limit 1"));
entity.setDragSort(maxSortItem != null && maxSortItem.getDragSort() != null ? maxSortItem.getDragSort() + 1 : 1);
save(entity);
}
@Override
- public void updateProcessItem(ProcessRouteItemInstanceDto dto) {
+ public void updateProcessItem(ProductionOrderRouteItemDto dto) {
if (dto == null || dto.getId() == null) {
throw new ServiceException("鏇存柊鏁版嵁鎴朓D涓嶈兘涓虹┖");
}
- ProcessRouteItemInstance old = getById(dto.getId());
+ ProductionOrderRouteItem old = getById(dto.getId());
if (old == null) {
throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
}
// 宸ュ簭鍙樻洿锛屽垹闄ゆ棫鍙傛暟闄勮〃锛岃縼绉绘柊宸ュ簭鍙傛暟
if (dto.getProcessId() != null && !dto.getProcessId().equals(old.getProcessId())) {
// 鍒犻櫎宸ヨ壓璺嚎宸ュ簭鍙傛暟闄勮〃
- processRouteItemParamInstanceService.remove(new LambdaQueryWrapper<ProcessRouteItemParamInstance>()
- .eq(ProcessRouteItemParamInstance::getOrderId, old.getOrderId())
- .eq(ProcessRouteItemParamInstance::getRouteItemId, old.getId()));
+ productionOrderRouteItemParamService.remove(new LambdaQueryWrapper<ProductionOrderRouteItemParam>()
+ .eq(ProductionOrderRouteItemParam::getOrderId, old.getOrderId())
+ .eq(ProductionOrderRouteItemParam::getRouteItemId, old.getId()));
// 杩佺Щ鏂板伐搴忕殑 process_route_item_param
List<ProcessRouteItemParam> routeItemParams = processRouteItemParamService.list(
new LambdaQueryWrapper<ProcessRouteItemParam>().eq(ProcessRouteItemParam::getRouteItemId, old.getId()));
if (!routeItemParams.isEmpty()) {
- List<ProcessRouteItemParamInstance> newInstances = routeItemParams.stream().map(p -> {
- ProcessRouteItemParamInstance instance = new ProcessRouteItemParamInstance();
+ List<ProductionOrderRouteItemParam> newInstances = routeItemParams.stream().map(p -> {
+ ProductionOrderRouteItemParam instance = new ProductionOrderRouteItemParam();
BeanUtils.copyProperties(p, instance, "id");
instance.setOrderId(old.getOrderId());
return instance;
}).collect(Collectors.toList());
- processRouteItemParamInstanceService.saveBatch(newInstances);
+ productionOrderRouteItemParamService.saveBatch(newInstances);
}
}
- ProcessRouteItemInstance entity = new ProcessRouteItemInstance();
+ ProductionOrderRouteItem entity = new ProductionOrderRouteItem();
BeanUtils.copyProperties(dto, entity);
entity.setUpdateTime(LocalDateTime.now());
updateById(entity);
@@ -129,35 +128,35 @@
if (id == null) {
throw new ServiceException("ID涓嶈兘涓虹┖");
}
- ProcessRouteItemInstance old = getById(id);
+ ProductionOrderRouteItem old = getById(id);
if (old == null) {
throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
}
// 鍒犻櫎宸ヨ壓璺嚎宸ュ簭鍙傛暟闄勮〃
- processRouteItemParamInstanceService.remove(new LambdaQueryWrapper<ProcessRouteItemParamInstance>()
- .eq(ProcessRouteItemParamInstance::getOrderId, old.getOrderId())
- .eq(ProcessRouteItemParamInstance::getRouteItemId, id));
+ productionOrderRouteItemParamService.remove(new LambdaQueryWrapper<ProductionOrderRouteItemParam>()
+ .eq(ProductionOrderRouteItemParam::getOrderId, old.getOrderId())
+ .eq(ProductionOrderRouteItemParam::getRouteItemId, id));
removeById(id);
}
@Override
- public void sortProcessItem(ProcessRouteItemInstanceDto dto) {
+ public void sortProcessItem(ProductionOrderRouteItemDto dto) {
if (dto == null || dto.getId() == null) {
throw new ServiceException("鏁版嵁鎴朓D涓嶈兘涓虹┖");
}
- ProcessRouteItemInstance old = getById(dto.getId());
+ ProductionOrderRouteItem old = getById(dto.getId());
if (old == null) {
throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
}
- List<ProcessRouteItemInstance> items = list(new LambdaQueryWrapper<ProcessRouteItemInstance>()
- .eq(ProcessRouteItemInstance::getOrderId, old.getOrderId())
- .orderByAsc(ProcessRouteItemInstance::getDragSort));
+ List<ProductionOrderRouteItem> items = list(new LambdaQueryWrapper<ProductionOrderRouteItem>()
+ .eq(ProductionOrderRouteItem::getOrderId, old.getOrderId())
+ .orderByAsc(ProductionOrderRouteItem::getDragSort));
Integer targetPosition = dto.getDragSort();
if (targetPosition != null && targetPosition >= 1) {
items.removeIf(item -> item.getId().equals(old.getId()));
items.add(targetPosition - 1, old);
for (int i = 0; i < items.size(); i++) {
- ProcessRouteItemInstance item = items.get(i);
+ ProductionOrderRouteItem item = items.get(i);
int newSort = i + 1;
if (!item.getId().equals(old.getId())) {
if (!Integer.valueOf(newSort).equals(item.getDragSort())) {
--
Gitblit v1.9.3