|
|
@@ -3,9 +3,12 @@ package com.cnbm.basic.service.impl; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; |
|
|
|
import com.cnbm.basic.dto.UnitDTO; |
|
|
|
import com.cnbm.basic.entity.Machine; |
|
|
|
import com.cnbm.basic.entity.ProductWorkingprocedureRelation; |
|
|
|
import com.cnbm.basic.entity.WorkingProcedureType; |
|
|
|
import com.cnbm.basic.mapper.ProductWorkingprocedureRelationMapper; |
|
|
|
import com.cnbm.basic.mapper.UnitMapper; |
|
|
|
import com.cnbm.common.page.PageData; |
|
|
|
import com.cnbm.common.service.impl.CrudServiceImpl; |
|
|
|
import com.cnbm.basic.dto.WorkingProcedureDTO; |
|
|
@@ -59,7 +62,7 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur |
|
|
|
getWrapper(params) |
|
|
|
); |
|
|
|
PageData<WorkingProcedureDTO> workingProcedureDTOPageData = getPageData(page, WorkingProcedureDTO.class); |
|
|
|
if(workingProcedureDTOPageData.getList().isEmpty()){ |
|
|
|
if(!workingProcedureDTOPageData.getList().isEmpty()){ |
|
|
|
for(WorkingProcedureDTO workingProcedureDTO:workingProcedureDTOPageData.getList()){ |
|
|
|
//工序类型 id,关联working_procedure_type表 |
|
|
|
WorkingProcedureType workingProcedureType = workingProcedureTypeServiceImpl.selectById(workingProcedureDTO.getWorkingProcedureTypeId()); |
|
|
@@ -77,9 +80,10 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur |
|
|
|
for(String machineId:machineIdList){ |
|
|
|
//QueryWrapper<Machine> machineQueryWrapper = new QueryWrapper<>(); |
|
|
|
//machineQueryWrapper.eq(StringUtils.isNotBlank(machineId), "id", machineId); |
|
|
|
String machineName = machineServiceImpl.selectById(machineId).getName(); |
|
|
|
if(machineName!=null) { |
|
|
|
machineList.add(machineName); |
|
|
|
//String machineName = null; |
|
|
|
Machine machine = machineServiceImpl.selectById(machineId); |
|
|
|
if(machine!=null&&machine.getName()!=null) { |
|
|
|
machineList.add(machine.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
String machineNameList = String.join(",", machineList); |
|
|
@@ -145,4 +149,15 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur |
|
|
|
return workingProcedureDTOList; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WorkingProcedureMapper workingProcedureMapper; |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public List<WorkingProcedureDTO> list() { |
|
|
|
List<WorkingProcedureDTO> list = workingProcedureMapper.list(); |
|
|
|
return list; |
|
|
|
} |
|
|
|
|
|
|
|
} |