1、读取卧转立空闲请求后置 2、8毫米超大尺寸的玻璃增加判断只出一片

ZengTao

6 天以前 514dae5edaeaa2be689203edf2e3eb45b47f97bc

1、读取卧转立空闲请求后置
2、8毫米超大尺寸的玻璃增加判断只出一片

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java

@@ -393,16 +393,7 @@
            log.info("当前未收到出片请求，结束出片任务");
            return;
        }
        try {
            int outRequest = s7plcWZL.readUInt16("DB51.8");
            if (outRequest == 0){
                log.info("当前未收到卧转立允许出片请求，结束出片任务");
                return;
            }
        } catch (Exception e) {
            log.error("读取卧转立信号异常", e);
            return;
        }


        //获取出片任务表
        List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataWLTwo);
@@ -475,6 +466,17 @@
            S7DataDLPTwo s7DataDLPTwo = new S7DataDLPTwo();
            s7DataDLPTwo.setMesReply(1);
            s7SerializerDLPTwo.write(s7DataDLPTwo);
            return;
        }

        try {
            int outRequest = s7plcWZL.readUInt16("DB51.8");
            if (outRequest == 0){
                log.info("当前未收到卧转立允许出片请求，结束出片任务");
                return;
            }
        } catch (Exception e) {
            log.error("读取卧转立信号异常", e);
            return;
        }

@@ -1031,7 +1033,11 @@
        } else {
            List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId(
                    list.get(0).getEngineerId(), list.get(0).getTemperingLayoutId(), list.get(0).getTemperingFeedSequence());
            outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList());
            if (CollectionUtil.isNotEmpty(glassIdList)) {
                outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList());
            } else {
                outGlassList = list.subList(0, 1);
            }
        }
//        }
        Assert.isFalse(CollectionUtil.isEmpty(outGlassList), "未获取出片数据，结束出片任务");