| | |
|---|
| | | return; |
|---|
| | | } |
|---|
| | | //钢化优先：获取理片笼 玻璃小片 破损表 数量 判断笼内版图是否到齐 |
|---|
| | | TemperingLayoutDTO temperingLayoutDTO = bigStorageCageDetailsService.temperingIsAll(); |
|---|
| | | if (null != temperingLayoutDTO) { |
|---|
| | | //玻璃到齐 |
|---|
| | | List<TemperingLayoutDTO> temperingLayoutDTOList = bigStorageCageDetailsService.temperingIsAll(); |
|---|
| | | if (CollectionUtils.isNotEmpty(temperingLayoutDTOList)) { |
|---|
| | | //玻璃到齐包括已出片的 |
|---|
| | | //到齐，将玻璃小片数据存入钢化小片表，逻辑生成出片任务 结束 |
|---|
| | | for (TemperingLayoutDTO item : temperingLayoutDTOList) { |
|---|
| | | List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class) |
|---|
| | | .selectAll(GlassInfo.class) |
|---|
| | | .select("-1 as state") |
|---|
| | | .selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot) |
|---|
| | | .innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId) |
|---|
| | | .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN) |
|---|
| | | .eq(GlassInfo::getTemperingLayoutId, temperingLayoutDTO.getTemperingLayoutId()) |
|---|
| | | .eq(GlassInfo::getEngineerId, temperingLayoutDTO.getEngineerId())); |
|---|
| | | .eq(GlassInfo::getTemperingLayoutId, item.getTemperingLayoutId()) |
|---|
| | | .eq(GlassInfo::getEngineerId, item.getEngineerId())); |
|---|
| | | if (CollectionUtils.isNotEmpty(temperingGlassInfos)) { |
|---|
| | | temperingGlassInfoService.saveBatch(temperingGlassInfos); |
|---|
| | | computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress); |
|---|
| | | Date endDate = new Date(); |
|---|
| | | log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime()); |
|---|
| | | return; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | //未到齐 执行内部调度任务 |
|---|
| | | TemperingLayoutDTO temperingOccupySlot = bigStorageCageDetailsService.queryTemperingOccupySlot(); |
|---|
| | | if (null != temperingOccupySlot) { |
|---|
