fix: 工艺路线工序参数表取消绑定基础参数表

gongchunyi

11 小时以前 a497406167f500741ac6cc1d24e086589972eb49

 src/main/java/com/ruoyi/appendix/service/impl/ProcessRouteItemInstanceServiceImpl.java

@@ -8,8 +8,6 @@
import com.ruoyi.appendix.pojo.ProcessRouteItemParamInstance;
import com.ruoyi.appendix.service.ProcessRouteItemInstanceService;
import com.ruoyi.appendix.service.ProcessRouteItemParamInstanceService;
import com.ruoyi.basic.pojo.BaseParam;
import com.ruoyi.basic.service.BaseParamService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.production.pojo.ProcessRouteItemParam;
@@ -22,9 +20,7 @@

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
@@ -48,9 +44,6 @@

    @Resource
    private ProcessRouteItemParamService processRouteItemParamService;

    @Resource
    private BaseParamService baseParamService;

    @Override
    public List<ProcessRouteItemInstanceDto> getProcessItem(Long orderId) {
@@ -116,27 +109,10 @@
            List<ProcessRouteItemParam> routeItemParams = processRouteItemParamService.list(
                    new LambdaQueryWrapper<ProcessRouteItemParam>().eq(ProcessRouteItemParam::getRouteItemId, old.getId()));
            if (!routeItemParams.isEmpty()) {
                // 批量查询 base_param
                List<Long> paramIds = routeItemParams.stream().map(ProcessRouteItemParam::getParamId)
                        .filter(id -> id != null).distinct().collect(Collectors.toList());
                Map<Long, BaseParam> baseParamMap = new HashMap<>();
                if (!paramIds.isEmpty()) {
                    baseParamService.listByIds(paramIds).forEach(bp -> baseParamMap.put(bp.getId(), bp));
                }
                List<ProcessRouteItemParamInstance> newInstances = routeItemParams.stream().map(p -> {
                    ProcessRouteItemParamInstance instance = new ProcessRouteItemParamInstance();
                    BeanUtils.copyProperties(p, instance, "id");
                    instance.setOrderId(old.getOrderId());
                    BaseParam bp = baseParamMap.get(p.getParamId());
                    if (bp != null) {
                        instance.setParamKey(bp.getParamKey());
                        instance.setParamName(bp.getParamName());
                        instance.setParamType(bp.getParamType());
                        instance.setParamFormat(bp.getParamFormat());
                        instance.setValueMode(bp.getValueMode());
                        instance.setUnit(bp.getUnit());
                        instance.setRemark(bp.getRemark());
                    }
                    return instance;
                }).collect(Collectors.toList());
                processRouteItemParamInstanceService.saveBatch(newInstances);