义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhoushihao
2024-08-02 1ef978571cc66d87a5d9bf786c115cd7a0e5adf5 
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java


@@ -484,6 +484,7 @@


            bigStorageCageDetailsService.remove(new LambdaQueryWrapper<BigStorageCageDetails>()


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


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


            List<Integer> slotList = new ArrayList<>();


            for (BigStorageCageFeedTask bigStorageCageFeedTask : inDamageTaskInfoList) {


                Damage damage = new Damage();


                damage.setGlassId(bigStorageCageFeedTask.getGlassId());


@@ -492,7 +493,10 @@


                damage.setRemark("进笼前卧转立");


                damage.setStatus(2);


                damageService.insertDamage(damage);


                slotList.add(bigStorageCageFeedTask.getTargetSlot());


            }


            //更新格子剩余宽度


            updateSlotRemainBySlots(slotList);


            log.info("进片任务执行完成");


        }


        //获取出片任务表中状态为破损的数据


@@ -500,7 +504,7 @@


                .eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_DAMAGE));


        if (CollectionUtils.isNotEmpty(outDamageTaskInfoList)) {


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


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


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


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


            //移除钢化下片表数据


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


@@ -508,6 +512,7 @@


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




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


            List<Integer> slotList = new ArrayList<>();


            for (BigStorageCageOutTask bigStorageCageOutTask : outDamageTaskInfoList) {


                Damage damage = new Damage();


                damage.setGlassId(bigStorageCageOutTask.getGlassId());


@@ -516,7 +521,10 @@


                damage.setRemark("出片后卧转立");


                damage.setStatus(2);


                damageService.insertDamage(damage);


                slotList.add(bigStorageCageOutTask.getStartSlot());


            }


            //更新格子剩余宽度


            updateSlotRemainBySlots(slotList);


            log.info("出片任务执行完成");


        }


        Date endDate = new Date();