| | |
|---|
| | | //玻璃到齐包括已出片的 |
|---|
| | | //到齐，将玻璃小片数据存入钢化小片表，逻辑生成出片任务 结束 |
|---|
| | | 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, item.getTemperingLayoutId()) |
|---|
| | | .eq(GlassInfo::getEngineerId, item.getEngineerId()) |
|---|
| | | .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)); |
|---|
| | | if (CollectionUtils.isNotEmpty(temperingGlassInfos)) { |
|---|
| | | temperingGlassInfoService.saveBatch(temperingGlassInfos); |
|---|
| | | computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress); |
|---|
| | | Date endDate = new Date(); |
|---|
| | | log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime()); |
|---|
| | | return; |
|---|
| | | if(redisUtil.getCacheObject("temperingengineerId").equals(item.getEngineerId())){ |
|---|
| | | 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, item.getTemperingLayoutId()) |
|---|
| | | .eq(GlassInfo::getEngineerId, item.getEngineerId()) |
|---|
| | | .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)); |
|---|
| | | if (CollectionUtils.isNotEmpty(temperingGlassInfos)) { |
|---|
| | | temperingGlassInfoService.saveBatch(temperingGlassInfos); |
|---|
| | | computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress); |
|---|
| | | Date endDate = new Date(); |
|---|
| | | log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime()); |
|---|
| | | return; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
