From 9a8731dda3c51f46a41b5478c6e31111dbf82557 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 09 四月 2026 16:28:47 +0800
Subject: [PATCH] fix: 工序无法删除,并且删除工序的同时把绑定的参数也清空
---
src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
index be5443b..5d6a21c 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
@@ -6,16 +6,17 @@
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.basic.pojo.Customer;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.ProductProcessDto;
-import com.ruoyi.production.mapper.ProcessRouteItemMapper;
import com.ruoyi.production.mapper.ProductProcessMapper;
-import com.ruoyi.production.mapper.ProductProcessRouteItemMapper;
-import com.ruoyi.production.pojo.ProcessRouteItem;
+import com.ruoyi.production.mapper.ProductProcessParamMapper;
+import com.ruoyi.production.mapper.ProductStructureMapper;
+import com.ruoyi.production.mapper.ProductionOrderRouteItemMapper;
import com.ruoyi.production.pojo.ProductProcess;
-import com.ruoyi.production.pojo.ProductProcessRouteItem;
+import com.ruoyi.production.pojo.ProductProcessParam;
+import com.ruoyi.production.pojo.ProductStructure;
+import com.ruoyi.production.pojo.ProductionOrderRouteItem;
import com.ruoyi.production.service.ProductProcessService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +31,11 @@
@Autowired
private ProductProcessMapper productProcessMapper;
@Autowired
- private ProcessRouteItemMapper processRouteItemMapper;
+ private ProductProcessParamMapper productProcessParamMapper;
@Autowired
- private ProductProcessRouteItemMapper productProcessRouteItemMapper;
+ private ProductionOrderRouteItemMapper productionOrderRouteItemMapper;
+ @Autowired
+ private ProductStructureMapper productStructureMapper;
@Override
public IPage<ProductProcessDto> listPage(Page page, ProductProcessDto productProcessDto) {
@@ -82,12 +85,13 @@
@Override
public String batchDelete(List<Integer> ids) {
//鏌ヨ鏄惁鐢熶骇涓凡缁忓紩鐢ㄤ簡杩欎簺宸ュ簭
- List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(Wrappers.<ProcessRouteItem>lambdaQuery().in(ProcessRouteItem::getProcessId, ids));
- List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().in(ProductProcessRouteItem::getProcessId, ids));
+ List<ProductionOrderRouteItem> processRouteItems = productionOrderRouteItemMapper.selectList(Wrappers.<ProductionOrderRouteItem>lambdaQuery().in(ProductionOrderRouteItem::getProcessId, ids));
+ List<ProductStructure> productProcessRouteItems = productStructureMapper.selectList(Wrappers.<ProductStructure>lambdaQuery().in(ProductStructure::getProcessId, ids));
if (!CollectionUtils.isEmpty(processRouteItems) || !CollectionUtils.isEmpty(productProcessRouteItems)){
throw new RuntimeException("璇ュ伐搴忓凡缁忚浣跨敤锛屾棤娉曞垹闄�");
}
productProcessMapper.deleteBatchIds(ids);
+ productProcessParamMapper.delete(Wrappers.<ProductProcessParam>lambdaQuery().in(ProductProcessParam::getProcessId, ids));
return null;
}
--
Gitblit v1.9.3