严智鑫
2025-09-22 16170b1d8429f7c31bb1a323b93c2de5137f2c6f
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineConfigurationServiceImpl.java
@@ -2,13 +2,10 @@
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.md.entity.Line;
import com.mes.md.entity.LineConfiguration;
import com.mes.md.entity.Machine;
import com.mes.md.mapper.LineConfigurationMapper;
import com.mes.md.mapper.LineMapper;
import com.mes.md.service.LineConfigurationService;
import com.mes.md.service.LineService;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -63,6 +60,33 @@
        return null;
    }
    /**
     * 磨边识别上片设备配置
     * @param machine
     * @return
     */
    @Override
    public LineConfiguration machineLineConfigurationBeforeEdg(Machine machine){
        List<LineConfiguration> machineLineConfiguration=baseMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
                .selectAll(LineConfiguration.class)
                .eq(LineConfiguration::getMachineId,machine.getId()));
        if(!machineLineConfiguration.isEmpty()){
            List<LineConfiguration> machineLineConfigurationBefore=baseMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
                    .selectAll(LineConfiguration.class)
                    .eq(LineConfiguration::getLineId,machineLineConfiguration.get(0).getLineId())
                    .eq(LineConfiguration::getIsStart,1)
                    .lt(LineConfiguration::getProcessSequence,machineLineConfiguration.get(0).getProcessSequence())
                    .orderByDesc(LineConfiguration::getProcessSequence));
            if (!machineLineConfigurationBefore.isEmpty()){
                return machineLineConfigurationBefore.get(1);
            }
        }
        return null;
    }
    /**
     * @param machine 当前设备的下一设备配置
     * @return