1、中空添加sd配置 2、中空新笼子逻辑调整

ZengTao

2025-10-15 82f33e80d430bc655a3ad85f282192cd3d9ae2ac

1、中空添加sd配置
2、中空新笼子逻辑调整

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java

@@ -120,7 +120,7 @@
        if (Math.min(width, height) > slotMaxHeight) {
            storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
                    .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth)
                    .eq(HollowBigStorageCage::getDeviceId, 5)
                    .eq(HollowBigStorageCage::getDeviceId, 6)
                    .orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));
            HollowBigStorageDTO storageDTO = new HollowBigStorageDTO();
            BeanUtils.copyProperties(storageCage, storageDTO);

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java

@@ -157,14 +157,17 @@

        List<BigStorageCageTask> inTaskList = new ArrayList();
        Integer from = s7DataZKDLPOne.getFrom1();
        List<Integer> states = s7DataZKDLPOne.getStates();
        List<String> glassIdList = new ArrayList<>();
        List<String> requestWords = s7DataZKDLPOne.getIds();
        for (int i = 1; i <= 6; i++) {
            String requestWord = requestWords.get(i - 1);
            Integer state = states.get(i - 1);
            if (null != requestWord && !requestWord.isEmpty()) {
                BigStorageCageTask task = new BigStorageCageTask();
                task.setGlassId(requestWord);
                task.setStartSlot(from);
                task.setTaskState(state);
                inTaskList.add(task);
                glassIdList.add(requestWord);
                continue;
@@ -456,6 +459,7 @@
            //nothing
            log.info("二/三线线空闲状态获取异常");
        }

        List<Integer> resultList = new ArrayList<>();
        if (redisUtil.getCacheObject("priorityHollowSwitch")) {
            resultList = TWO_LINE_FIRST;
@@ -507,6 +511,15 @@
                    .eq(HollowGlassQueueInfo::getState, Const.TEMPERING_NEW)
                    .orderByAsc(HollowGlassQueueInfo::getHollowSequence));
            if (CollectionUtil.isNotEmpty(unFinishHollowQueueList)) {
                HollowGlassQueueInfo queueInfo = unFinishHollowQueueList.get(0);
                //直通台有玻璃时将中空出片队列中对应玻璃id的格子号替换未直通台
                HollowBigStorageCageDetails details = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
                        .eq(HollowBigStorageCageDetails::getSlot, THROUGH_SLOT)
                        .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL).last("limit 1"));
                if (details != null && details.getGlassId().equals(queueInfo.getGlassId())) {
                    queueInfo.setCell(THROUGH_SLOT);
                    unFinishHollowQueueList.get(0).setCell(THROUGH_SLOT);
                }
                log.info("有正在出片的中空任务");
                Integer isPair = unFinishHollowQueueList.get(0).getIsPair();
                hollowOutGlassByIsPair(unFinishHollowQueueList, hollowGlassOutRelationInfo.getCell(), isPair, hollowGlassOutRelationInfo.getTotalLayer(), hollowGlassOutRelationInfo.getIsForce());
@@ -869,12 +882,14 @@
            log.info("当前为非联机状态，结束进片任务");
            return;
        }
        if (StringUtils.isNotBlank(s7DataZKDLPOne.getId1())) {
        if (StringUtils.isNotBlank(s7DataZKDLPOne.getId7())) {
            //汇报字为1 启动字为1是  清除所有任务信息
            if (s7DataZKDLPOne.getId1().equals(s7DataZKDLPOne.getId1())) {
            if (s7DataZKDLPOne.getId7().equals(s7DataZKDLPOne.getId1())) {
                //todo:清空任务
                s7DataZKDLPOne.setFrom1(0);
                s7DataZKDLPOne.getId1();
                S7DataZKDLPOne sendTask = new S7DataZKDLPOne();
                sendTask.setFrom7(0);
                sendTask.setId1("");
                s7SerializerZKDLPOne.write(sendTask);
            }
            log.info("存在任务，结束");
            return;
@@ -897,7 +912,7 @@
        }
        List<HollowBigStorageCageDetails> list = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
                .eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
                .in(HollowBigStorageCageDetails::getDeviceId, 5)
                .in(HollowBigStorageCageDetails::getDeviceId, 6)
                .in(HollowBigStorageCageDetails::getGlassId, glassIdList));
        if (CollectionUtil.isEmpty(list)) {
            return;
@@ -907,7 +922,10 @@
        hollowBigStorageCageDetailsService.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>()
                .set(HollowBigStorageCageDetails::getState, Const.RAW_GLASS_STATE_OUT)
                .eq(HollowBigStorageCageDetails::getGlassId, details.getGlassId()));

        S7DataZKDLPOne sendTask = new S7DataZKDLPOne();
        sendTask.setFrom7(THROUGH_SLOT);
        sendTask.setId7(details.getGlassId());
        s7SerializerZKDLPOne.write(sendTask);
    }


@@ -1082,6 +1100,14 @@
//        Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
        Integer glassGap = hollowGlassRelationInfoService.getGlassGapByThickness(list.get(0).getThickness());
        for (T e : list) {
            //格子为第五个笼子时不添加出片任务
            HollowBigStorageCage hollowBigStorageCage = hollowBigStorageCageService.getOne(
                    new LambdaQueryWrapper<HollowBigStorageCage>()
                            .eq(HollowBigStorageCage::getSlot, e.getSlot())
            );
            if (hollowBigStorageCage.getDeviceId() == 6) {
                break;
            }
            if (templist.size() >= outCarMaxSize || Math.max((int) e.getWidth(), (int) e.getHeight()) > remainWidth) {
                break;
            }

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPOne.java

@@ -97,6 +97,12 @@
    @S7Variable(address = "DB7.118", type = EDataType.STRING, count = 14)
    private String id6;

    @S7Variable(address = "DB7.1248", type = EDataType.STRING, count = 14)
    private String id7;

    @S7Variable(address = "DB7.1380", type = EDataType.UINT16)
    private Integer from7;

    @S7Variable(address = "MW1002", type = EDataType.UINT16)
    private Integer alramSignal;


 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-yw.yml

@@ -19,6 +19,11 @@
          username: sa
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
        sd:
          url: jdbc:mysql://192.168.2.100:3309/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
  cloud:
    nacos:
      discovery: