| | |
|---|
| | | * @param machineCode 机床编号 |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | public NcNode getCuredProgramPackage(String programPkgName,String machineCode) { |
|---|
| | | public NcNode getCuredProgramPackage(String programPkgName,String processEdition,String machineCode) { |
|---|
| | | Machine machine = machineService.getByCode(machineCode); |
|---|
| | | List<Machine> sameGroupMachines = machineService.lambdaQuery().eq(Machine::getMachineGroupCode,machine.getMachineGroupCode()).list(); |
|---|
| | | List<String> machineCodesInGroup = sameGroupMachines.stream().map(Machine::getCode).toList(); |
|---|
| | | List<NcNode> nodes = lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE) |
|---|
| | | .eq(NcNode::getName, programPkgName).likeRight(NcNode::getParentIds,"0,2,").eq(NcNode::getIsCured,1) |
|---|
| | | .eq(NcNode::getName, programPkgName) |
|---|
| | | .eq(NcNode::getProcessEdition,processEdition) |
|---|
| | | .likeRight(NcNode::getParentIds,"0,2,").eq(NcNode::getIsCured,1) |
|---|
| | | .in(!machineCodesInGroup.isEmpty(),NcNode::getMachineCode,machineCodesInGroup) |
|---|
| | | .eq(NcNode::getIsLastEdition,1).list(); |
|---|
| | | |
|---|
