blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wangfei
2024-08-01 3af375d6963531c403668f9fb507ae30d741a99f 
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java


@@ -481,8 +481,8 @@


            log.info("获取进片任务表中破损的玻璃信息{}", inDamageTaskInfoList);


            bigStorageCageFeedTaskService.remove(new LambdaQueryWrapper<BigStorageCageFeedTask>().eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));


            //理片笼详情表数据状态更新


            bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()


                    .set(BigStorageCageDetails::getState, Const.GLASS_STATE_DAMAGE).in(BigStorageCageDetails::getGlassId, inDamageTaskInfoList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList())));


            bigStorageCageDetailsService.remove(new LambdaQueryWrapper<BigStorageCageDetails>()


                    .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_NEW).in(BigStorageCageDetails::getGlassId, inDamageTaskInfoList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList())));


            //将破损信息新增入破损表


            for (BigStorageCageFeedTask bigStorageCageFeedTask : inDamageTaskInfoList) {


                Damage damage = new Damage();


@@ -503,11 +503,9 @@


            bigStorageCageOutTaskService.remove(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));


            List<String> glassIdList = outDamageTaskInfoList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());


            //移除钢化下片表数据


            temperingGlassInfoService.update(new LambdaUpdateWrapper<TemperingGlassInfo>().in(TemperingGlassInfo::getGlassId, glassIdList)


                    .set(TemperingGlassInfo::getState, Const.TEMPERING_DAMAGE));


            //理片笼详情表数据状态更新


            bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()


                    .set(BigStorageCageDetails::getState, Const.GLASS_STATE_DAMAGE).in(BigStorageCageDetails::getGlassId, glassIdList));


            temperingGlassInfoService.remove(new LambdaQueryWrapper<TemperingGlassInfo>().in(TemperingGlassInfo::getGlassId, glassIdList));


            //理片笼详情表数据状态删除


            bigStorageCageDetailsService.remove(new LambdaQueryWrapper<BigStorageCageDetails>().in(BigStorageCageDetails::getGlassId, glassIdList));




            //将破损信息新增入破损表


            for (BigStorageCageOutTask bigStorageCageOutTask : outDamageTaskInfoList) {


@@ -666,9 +664,9 @@


            BeanUtils.copyProperties(info, cageDetails);


            //2、获取目标格子信息


            BigStorageDTO bigStorageDTO = bigStorageCageDetailsService.queryTargetSlotByTempering(info);


            //3、更新大理片笼表剩余宽度（更新大理片笼剩余尺寸移到进笼完成后执行）


//            bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, bigStorageDTO.getWidth() - info.getWidth() - glassGap)


//                    .eq(BigStorageCage::getSlot, bigStorageDTO.getSlot()));


            //3、临时更新格子的剩余尺寸：防止相邻玻璃进同一格子造成剩余尺寸不足，玻璃越界的情况，任务完成后再次更新大理片笼表剩余宽度（按照笼内玻璃数量更新大理片笼剩余尺寸）


            bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, bigStorageDTO.getWidth() - Math.max(info.getWidth(), info.getHeight()) - glassGap)


                    .eq(BigStorageCage::getSlot, bigStorageDTO.getSlot()));


            //4、更新进片任务表，目标格子及状态（状态改为2 电气扫到自行处理）  遇到问题：无法批量更新，批量更新无法走指定从库


            e.setTargetSlot(bigStorageDTO.getSlot());


            bigStorageCageFeedTaskService.updateById(e);


@@ -679,6 +677,7 @@


            cageDetails.setDeviceId(bigStorageDTO.getDeviceId());


            cageDetails.setGap(glassGap);


            bigStorageCageDetailsService.save(cageDetails);




        }


        sendTaskListToPLC(taskList, line);


        return Boolean.TRUE;


@@ -768,7 +767,7 @@


        if (CollectionUtils.isNotEmpty(inSlotGlassList)) {


            //存在  将格子内的玻璃分别进行更新


            slotRemainMap = inSlotGlassList.stream()


                    .collect(Collectors.groupingBy(BigStorageCageDetails::getSlot, Collectors.summingDouble(item -> item.getWidth() + glassGap)));


                    .collect(Collectors.groupingBy(BigStorageCageDetails::getSlot, Collectors.summingDouble(item -> Math.max(item.getWidth(), item.getHeight()) + glassGap)));


            slotRemainMap.forEach((e, v) -> {


                double remainWidth = slotWidth - v >= 0 ? slotWidth - v : 0;


                bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, remainWidth)