| | |
| | | .last("Limit 1"); |
| | | GlassInfo swapGlassInfo = glassInfoService.getOne(queryWrapper); |
| | | if (swapGlassInfo != null && !glassInfo.getGlassId().equals(swapGlassInfo.getGlassId())) { |
| | | //待替换的玻璃信息 |
| | | Integer ishorizontal = glassInfo.getIshorizontal(); |
| | | Integer temperingLayoutId = glassInfo.getTemperingLayoutId(); |
| | | Integer temperingFeedSequence = glassInfo.getTemperingFeedSequence(); |
| | | Integer xCoordinate = glassInfo.getXCoordinate(); |
| | | Integer yCoordinate = glassInfo.getYCoordinate(); |
| | | double angle = glassInfo.getAngle(); |
| | | Integer ruleId = glassInfo.getRuleId(); |
| | | //替换后的玻璃信息 |
| | | Integer swapIshorizontal = swapGlassInfo.getIshorizontal(); |
| | | Integer swapTemperingLayoutId = swapGlassInfo.getTemperingLayoutId(); |
| | | Integer swapTemperingFeedSequence = swapGlassInfo.getTemperingFeedSequence(); |
| | | Integer swapXCoordinate = swapGlassInfo.getXCoordinate(); |
| | | Integer swapYCoordinate = swapGlassInfo.getYCoordinate(); |
| | | double swapAngle = swapGlassInfo.getAngle(); |
| | | Integer swapRuleId = swapGlassInfo.getRuleId(); |
| | | //替换玻璃信息 |
| | | glassInfo.setIshorizontal(swapIshorizontal); |
| | | glassInfo.setTemperingLayoutId(swapTemperingLayoutId); |
| | | glassInfo.setTemperingFeedSequence(swapTemperingFeedSequence); |
| | | glassInfo.setXCoordinate(swapXCoordinate); |
| | | glassInfo.setYCoordinate(swapYCoordinate); |
| | | glassInfo.setAngle(swapAngle); |
| | | glassInfo.setRuleId(swapRuleId); |
| | | |
| | | int patternSequence = glassInfo.getPatternSequence(); |
| | | int xAxis = glassInfo.getXAxis(); |
| | | int yAxis = glassInfo.getYAxis(); |
| | | String swapGlassId = swapGlassInfo.getGlassId(); |
| | | int swapPatternSequence = swapGlassInfo.getPatternSequence(); |
| | | int swapXAxis = swapGlassInfo.getXAxis(); |
| | | int swapYAxis = swapGlassInfo.getYAxis(); |
| | | swapGlassInfo.setGlassId(glassId); |
| | | swapGlassInfo.setPatternSequence(patternSequence); |
| | | swapGlassInfo.setXAxis(xAxis); |
| | | swapGlassInfo.setYAxis(yAxis); |
| | | glassInfo.setGlassId(swapGlassId); |
| | | glassInfo.setPatternSequence(swapPatternSequence); |
| | | glassInfo.setXAxis(swapXAxis); |
| | | glassInfo.setYAxis(swapYAxis); |
| | | swapGlassInfo.setIshorizontal(ishorizontal); |
| | | swapGlassInfo.setTemperingLayoutId(temperingLayoutId); |
| | | swapGlassInfo.setTemperingFeedSequence(temperingFeedSequence); |
| | | swapGlassInfo.setXCoordinate(xCoordinate); |
| | | swapGlassInfo.setYCoordinate(yCoordinate); |
| | | swapGlassInfo.setAngle(angle); |
| | | swapGlassInfo.setRuleId(ruleId); |
| | | |
| | | log.info("将玻璃{}和玻璃{},信息互换(原片序号及坐标除外),进玻璃 {}", glassInfo, swapGlassInfo, swapGlassInfo); |
| | | glassInfoService.updateById(swapGlassInfo); |
| | | glassInfoService.updateById(glassInfo); |
| | | return swapGlassId; |
| | | return swapGlassInfo.getGlassId(); |
| | | } |
| | | return ""; |
| | | } |