| | |
|---|
| | | .set(EdgGlassTaskInfo::getState, Const.EDG_GLASS_SUCCESS).in(EdgGlassTaskInfo::getGlassId, glassIdList)); |
|---|
| | | //报工 |
|---|
| | | for (String glass : glassIdList) { |
|---|
| | | damageService.autoSubmitReport(glass, inTaskList.get(0).getStartSlot(), "磨边", "进大理片笼"); |
|---|
| | | damageService.autoSubmitReport(glass, inTaskList.get(0).getStartSlot(), "磨边", "进大理片笼",1); |
|---|
| | | } |
|---|
| | | |
|---|
| | | Map<String, List<GlassInfo>> glassListMap = glassInfoList.stream().collect(Collectors.groupingBy(GlassInfo::getGlassId)); |
|---|
| | |
|---|
| | | List<TemperingGlassInfo> unFinishTemperingGlassInfoList = temperingGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>() |
|---|
| | | .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW).orderByAsc(TemperingGlassInfo::getTemperingFeedSequence)); |
|---|
| | | if (CollectionUtil.isNotEmpty(unFinishTemperingGlassInfoList)) { |
|---|
| | | // List<String> glassIdList = unFinishTemperingGlassInfoList.stream().map(TemperingGlassInfo::getGlassId).collect(Collectors.toList()); |
|---|
| | | // List<BigStorageCageHistoryTask> historyTaskList = bigStorageCageHistoryTaskService.list(new LambdaQueryWrapper<BigStorageCageHistoryTask>() |
|---|
| | | // .eq(BigStorageCageHistoryTask::getTaskType, Const.BIG_STORAGE_BEFORE_OUT) |
|---|
| | | // .in(BigStorageCageHistoryTask::getGlassId, glassIdList)); |
|---|
| | | // List<TemperingGlassInfo> temperingGlassList = unFinishTemperingGlassInfoList; |
|---|
| | | // if (CollectionUtil.isNotEmpty(historyTaskList)) { |
|---|
| | | // List<String> taskGlassList = historyTaskList.stream().map(BigStorageCageHistoryTask::getGlassId).collect(Collectors.toList()); |
|---|
| | | // temperingGlassList = unFinishTemperingGlassInfoList.stream().filter(e -> !taskGlassList.contains(e.getGlassId())).collect(Collectors.toList()); |
|---|
| | | // } |
|---|
| | | // if (CollectionUtil.isNotEmpty(unFinishTemperingGlassInfoList)) { |
|---|
| | | log.info("有正在出片的钢化任务"); |
|---|
| | | computeOutGlassInfoByVirtualSlot(unFinishTemperingGlassInfoList, "big_storage_cage_out_one_task", temperingOutTargetPosition, Const.GLASS_STATE_OUT_ING, Const.BIG_STORAGE_BEFORE_OUT); |
|---|
| | | Date endDate = new Date(); |
|---|
| | |
|---|
| | | for (TemperingLayoutDTO item : temperingLayoutDTOList) { |
|---|
| | | // if (item.getEngineerId().equals(redisUtil.getCacheObject("temperingengineerId"))) { |
|---|
| | | List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class) |
|---|
| | | .selectAll(GlassInfo.class) |
|---|
| | | .select("-1 as state") |
|---|
| | | .selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot) |
|---|
| | | .select("-1 as state,t.filmsid as films_id,t.glass_id,t.flow_card_id,t.glass_type,t.width,t.height" + |
|---|
| | | ",t.thickness,t.ishorizontal,t.tempering_layout_id,t.tempering_feed_sequence,t.x_coordinate,t.y_coordinate," + |
|---|
| | | "t.angle,t1.slot,t.engineer_id") |
|---|
| | | .innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId) |
|---|
| | | .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN) |
|---|
| | | .eq(GlassInfo::getTemperingLayoutId, item.getTemperingLayoutId()) |
|---|
