blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhoushihao
2024-10-31 6abae920ad543ebdc3ee2e386828dd65e4c5ec35 
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java


@@ -114,10 +114,10 @@


        String confirmationWrodAddress = plcParameterObject.getPlcParameter("MES_confirmation_word").getAddress();


        String currentSlot = plcParameterObject.getPlcParameter("Current_slot").getValue();




//        taskRequestTypeValue = "3";


//        taskRequestTypeValue = "2";


//        out08Glassstate = "1";


//        out10Glassstate = "1";


//        currentSlot = "2";


//        currentSlot = "5";


//        confirmationWrodValue = "0";


//        glassIdeValue = "P24092706|15|5";




@@ -231,6 +231,7 @@


        details.setSlot(nearestEmpty.getSlot());


        details.setDeviceId(nearestEmpty.getDeviceId());


        edgStorageCageDetailsService.save(details);


        damageService.deleteByGlassId(glassId);


        log.info("5、玻璃信息已存入理片笼详情表，玻璃信息为{}", details);


        //添加进片任务


        boolean taskCache = saveTaskCache(details.getGlassId(), 0, nearestEmpty.getSlot(), Const.GLASS_CACHE_TYPE_IN);


@@ -257,7 +258,6 @@


                .eq(GlassInfo::getThickness, glassInfo.getThickness())


                .eq(GlassInfo::getFilmsid, glassInfo.getFilmsid())


                .eq(GlassInfo::getFlowCardId, glassInfo.getFlowCardId())


                .ne(GlassInfo::getGlassId, glassInfo.getGlassId())


                .eq(GlassInfo::getTotalLayer, glassInfo.getTotalLayer())


                .eq(GlassInfo::getLayer, glassInfo.getLayer())


                .eq(GlassInfo::getEngineerId, glassInfo.getEngineerId())


@@ -302,7 +302,7 @@


//      玻璃小片表中玻璃已经替换，更新卧理笼内现有的准备出笼的玻璃信息，


        if (null == swapGlassDetailInfo) {


            GlassInfo glassInfoBase = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()


                    .eq(GlassInfo::getGlassId, swapGlassId));


                    .eq(GlassInfo::getGlassId, glassId));


            //需要替换的玻璃为存进卧理，仅需更新当前需要出笼的玻璃信息即可


            edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>()


                    .eq(EdgStorageCageDetails::getGlassId, glassId)


@@ -354,6 +354,7 @@


        //定义出片玻璃信息


        int endcell = 0;


        EdgStorageCageDetails glassInfo = null;






        boolean flag = queryMaxMinDiff(threshold);


        log.info("1、获取钢化版图是否超过阈值:{}", flag);


@@ -802,6 +803,7 @@


            damage.setType(1);


            damage.setRemark("过卧式理片");


            damageService.insertDamage(damage);


            damageService.deleteByGlassId(glassId);


            return Boolean.TRUE;


        }


        return Boolean.FALSE;