1、卧理单条磨边线对接完成，另一条线等待IP确认 2、大理片笼提交部分代码

zhoushihao

2024-11-11 21092d29c1c0cd1003bb32bf91fddae265a8baea

1、卧理单条磨边线对接完成，另一条线等待IP确认
2、大理片笼提交部分代码

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTask.java

@@ -31,6 +31,10 @@
    /**
     * 任务状态 0默认空任务 1执行中 2结束任务
     */
    private Integer inkageState;
    /**
     * 任务状态 0默认空任务 1执行中 2结束任务
     */
    private Integer taskState;
    /**
     * 创建时间

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/mapper/RawGlassStorageDetailsMapper.java

@@ -23,5 +23,5 @@
     * @param state
     * @return
     */
    List<Integer> listBySlotState(@Param("leftingStation") List<Integer> liftingStation, @Param("state") List<Integer> state);
    List<RawGlassStorageDetails> listBySlotState(@Param("leftingStation") List<Integer> liftingStation, @Param("state") List<Integer> state);
}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java

@@ -35,7 +35,7 @@

    String outWarehousing(Long slotId);

    List<Integer> listBySlotState(List<Integer> liftingStation, List<Integer> state);
    List<RawGlassStorageDetails> listBySlotState(List<Integer> liftingStation, List<Integer> state);

    String warehousingRequest(int leftingStation);


 hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java

@@ -57,17 +57,19 @@
    @Override
    public String warehousingRequest(int leftingStation) {
        RawGlassStorageDetails storageDetails = getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
                .in(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN_ALL));
                .in(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN_ALL)
                .eq(RawGlassStorageDetails::getSlot, leftingStation));
        if (null != storageDetails) {
            log.info("当前吊装位有架子，结束本地入库请求");
            return "fail";
        }
        List<Integer> shelfList = listBySlotState(Const.RAW_GLASS_DEVICE, Const.RAW_GLASS_STATE_IN_ALL);
        List<RawGlassStorageDetails> shelfList = listBySlotState(Const.RAW_GLASS_DEVICE, Const.RAW_GLASS_STATE_IN_ALL);
        if (CollectionUtils.isEmpty(shelfList)) {
            log.info("当前工位不存在可用的空架子");
            return "fail";
        }
        Integer shelf = shelfList.get(0);
        Integer shelf = shelfList.get(0).getSlot();
        Integer deviceId = shelfList.get(0).getDeviceId();
        log.info("生成任务");
        try {
            generateTask(shelf, leftingStation, shelf, 0, Const.RAW_GLASS_TASK_TYPE_IN_REQUEST);
@@ -78,6 +80,7 @@
        RawGlassStorageDetails details = new RawGlassStorageDetails();
        details.setSlot(shelf);
        details.setShelf(shelf);
        details.setDeviceId(deviceId);
        details.setState(Const.RAW_GLASS_STATE_RUNNING);
        save(details);
        return "success";
@@ -126,7 +129,7 @@
    }

    @Override
    public List<Integer> listBySlotState(List<Integer> liftingStation, List<Integer> state) {
    public List<RawGlassStorageDetails> listBySlotState(List<Integer> liftingStation, List<Integer> state) {
        return baseMapper.listBySlotState(liftingStation, state);
    }

@@ -173,13 +176,10 @@
                .shelf(shelf)
                .createTime(new Date()).build();
        rawGlassStorageTaskService.save(task);


        List<ReadWriteEntity> list = new ArrayList<>();
        list.add(generateReadWriteEntity("A01-CC.dev.taskWord", 1));
//        list.add(generateReadWriteEntity("A01-CC.dev.taskSending", 1));
        list.add(generateReadWriteEntity("A01-CC.dev.startSlot", startSlot));
        list.add(generateReadWriteEntity("A01-CC.dev.endSlot", endSlot));
        list.add(generateReadWriteEntity("PLC.CC.taskWord", 1));
        list.add(generateReadWriteEntity("PLC.CC.startSlot", startSlot));
        list.add(generateReadWriteEntity("PLC.CC.endSlot", endSlot));
        miloService.writeToOpcWord(list);
        return Boolean.TRUE;
    }

 hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml

@@ -2,9 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper">

    <select id="listBySlotState" resultType="java.lang.Integer">
    <resultMap id="baseMap" type="com.mes.rawglassdetails.entity.RawGlassStorageDetails">
        <result column="DEVICE_ID" property="deviceId"/>
        <result column="SLOT" property="slot"/>
    </resultMap>

    <select id="listBySlotState" resultMap="baseMap">
        SELECT
        T.SLOT
        T.SLOT,
        T.DEVICE_ID
        FROM
        RAW_GLASS_STORAGE_STATION T
        LEFT JOIN RAW_GLASS_STORAGE_DETAILS AS T1 ON T.DEVICE_ID = T1.DEVICE_ID

 hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml

@@ -13,11 +13,10 @@
        <result column="state" property="state"/>
        <result column="group_number" property="groupNumber"/>
    </resultMap>
    <select id="queryRawGlassByEngineeringId" resultType="com.mes.uppattenusage.entity.vo.UpPattenUsageVO">
    <select id="queryRawGlassByEngineeringId" resultMap="baseMap">
        SET @prev_width := NULL;
        SET @prev_height := NULL;
        SET @counter := 0;

        SELECT t.*,
               @counter := IF(@prev_width = width and @prev_height = height, @counter, @counter + 1) AS group_number,
               @prev_width := width,

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java

@@ -1,12 +1,15 @@
package com.mes.job;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
import com.mes.common.config.Const;
import com.mes.edgglasstaskqueueinfo.entity.EdgGlassTaskQueueInfo;
import com.mes.edgglasstaskqueueinfo.service.EdgGlassTaskQueueInfoService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.opctask.entity.EdgStorageDeviceTask;
import com.mes.opctask.service.EdgStorageDeviceTaskService;
import lombok.extern.slf4j.Slf4j;
@@ -17,6 +20,7 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

/**
@@ -46,80 +50,80 @@
    EdgStorageDeviceTaskService edgStorageDeviceTaskService;
    @Resource
    EdgGlassTaskQueueInfoService edgGlassTaskQueueInfoService;
    private int sum = 0;

    @Scheduled(fixedDelay = 10)
    public void startOpcTask() throws Exception {
//        miloService.subscriptionFromOpcUa(Arrays.asList("C101-WL.S7-1200.plc_task_state", "D101-WL.S7-1200.plc_task_state"), cacheGlassStartCallback);
//        miloService.subscriptionFromOpcUa(Arrays.asList("mes.dec.edg_storage_device_one_task[1].task_state", "D101-WL.S7-1200.plc_task_state"), cacheGlassTestCallback);
//        log.info("--------------------s---------------------------");
        EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage("edg_storage_device_one_task");
        try {
            if (task == null) {
                log.info("任务表基础数据录入失败，请检查数据是否录入成功");
                return;
            }
            if (task.getTaskState() == sum) {
                return;
            }
            sum = task.getTaskState();
            task.setTaskRunning(sum);
            log.info("当前第{}次执行", task.getTaskRunning());
//            task.setTaskState(task.getTaskRunning());
            edgStorageDeviceTaskService.updateTaskMessage("edg_storage_device_one_task", task);
        } catch (Exception e) {
            log.info("{}", e.getMessage());
        }
    @Resource
    GlassInfoService glassInfoService;

    private String glassIdOne = "";
    private String glassIdTwo = "";

    @Scheduled(fixedDelay = Long.MAX_VALUE)
    public void startOneOpcTask() throws Exception {
        miloService.subscriptionFromOpcUa(Arrays.asList("mes.WL1.edg_storage_device_one_task[1].task_state"), cacheGlassStartCallback);
    }

//    mesControlWord glassId
//    width height
//    thickness             filmRemove
//    deviceControlWord             deviceWarnState
    @Scheduled(fixedDelay = Long.MAX_VALUE)
    public void startTwoOpcTask() throws Exception {
        miloService.subscriptionFromOpcUa(Arrays.asList("mes.WL2.edg_storage_device_two_task[1].task_state"), cacheGlassStartCallback);
    }

    //    @Scheduled(fixedDelay = 1000)
    public void edgOpcTask() throws Exception {
        ReadWriteEntity controlEntity = miloService.readFromOpcUa("A001-MB1.dev.deviceControlWord");
        String deviceControlWord = (String) controlEntity.getValue();
        if ("0".equals(deviceControlWord)) {
            ReadWriteEntity messageEntity = miloService.readFromOpcUa("A001-MB1.dev.mesControlWord");
            String messageValue = (String) messageEntity.getValue();
            if ("1".equals(messageValue)) {
                List<ReadWriteEntity> list = new ArrayList<>();
                list.add(generateReadWriteEntity("A001-MB1.dev.mesControlWord", 0));
                miloService.writeToOpcWord(list);
            }
            log.info("当前未收到磨边机的请求任务");
            return;
        }
    @Scheduled(fixedDelay = 1000)
    public void edgOneOpcTask() throws Exception {
        EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(EDG_STORAGE_DEVICE_ONE_TASK);
        String glassId = task.getGlassId();
        if (StringUtils.isBlank(glassId)) {
            log.info("磨边前的架子没有玻璃信息");
        if (StringUtils.isBlank(glassId) || glassId.equals(glassIdOne)) {
            log.info("{}号线磨边前玻璃未就位，结束本次任务", 1);
            return;
        }
        //获取磨边对列
        EdgGlassTaskQueueInfo edgInfo = edgGlassTaskQueueInfoService.getOne(new LambdaQueryWrapper<EdgGlassTaskQueueInfo>()
                .eq(EdgGlassTaskQueueInfo::getGlassId, glassId)
                .eq(EdgGlassTaskQueueInfo::getState, Const.GLASS_STATE_NEW));
        if (edgInfo == null) {
        edgTaskChild(glassId, 1);
    }

    @Scheduled(fixedDelay = 1000)
    public void edgTwoOpcTask() throws Exception {
        EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(EDG_STORAGE_DEVICE_TWO_TASK);
        String glassId = task.getGlassId();
        if (StringUtils.isBlank(glassId) || glassId.equals(glassIdTwo)) {
            log.info("{}号线磨边前玻璃未就位，结束本次任务", 2);
            return;
        }
        edgTaskChild(glassId, 2);
    }

    private void edgTaskChild(String glassId, int cell) throws Exception {
        GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId).last("limit 1"));
        if (glassInfo == null) {
            log.info("对列表中的玻璃id错误，请检查数据，玻璃id：{}", glassId);
            return;
        }
        String toEndingId = glassInfo.getTemperingLayoutId() + "" + glassInfo.getTemperingFeedSequence();
        List<ReadWriteEntity> list = new ArrayList<>();
        list.add(generateReadWriteEntity("A001-MB1.dev.mesControlWord", 1));
        list.add(generateReadWriteEntity("A001-MB1.dev.glassId", glassId));
        list.add(generateReadWriteEntity("A001-MB1.dev.width", edgInfo.getWidth()));
        list.add(generateReadWriteEntity("A001-MB1.dev.height", edgInfo.getHeight()));
        list.add(generateReadWriteEntity("A001-MB1.dev.thickness", edgInfo.getThickness()));
        list.add(generateReadWriteEntity("A001-MB1.dev.filmRemove", 0));
        miloService.writeToOpcWord(list);
        list.add(generateReadWriteEntity("PLC.MB" + cell + ".mesControl", true));
        list.add(generateReadWriteEntity("PLC.MB" + cell + ".glassId", Integer.parseInt(toEndingId)));
        list.add(generateReadWriteEntity("PLC.MB" + cell + ".toEdingId", Integer.parseInt(toEndingId)));
        list.add(generateReadWriteEntity("PLC.MB" + cell + ".width", (int) Math.max(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10)));
        list.add(generateReadWriteEntity("PLC.MB" + cell + ".height", (int) Math.min(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10)));

        miloService.writeToOpcUa(list);
        miloService.writeToOpcWord(generateReadWriteEntity("PLC.MB" + cell + ".thickness", (int) glassInfo.getThickness() * 10));
        //修改磨边对列中的磨边线路及状态
        edgGlassTaskQueueInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskQueueInfo>()
                .set(EdgGlassTaskQueueInfo::getLine, cell)
                .set(EdgGlassTaskQueueInfo::getState, 1)
                .eq(EdgGlassTaskQueueInfo::getGlassId, glassId)
                .eq(EdgGlassTaskQueueInfo::getState, Const.GLASS_STATE_NEW));
        if (cell == 1) {
            glassIdOne = glassId;
        } else {
            glassIdTwo = glassId;
        }

    }

    private ReadWriteEntity generateReadWriteEntity(String identifier, Object value) {
        ReadWriteEntity readWriteEntity = new ReadWriteEntity();
        readWriteEntity.setIdentifier(identifier);
        readWriteEntity.setValue(value);
        return readWriteEntity;
        return ReadWriteEntity.builder()
                .identifier(identifier)
                //Kep中是Long类型，即：Int32，Java中的int类型
                .value(value)
                .build();
    }
}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/opccallback/CacheGlassStartCallback.java

@@ -270,10 +270,10 @@
        task.setGlassIdOut(edgStorageCageDetails.getGlassId());
        task.setStartCell(edgStorageCageDetails.getSlot());
        task.setTaskRunning(taskType);
        task.setWidth((int) edgStorageCageDetails.getWidth() * 10);
        task.setHeight((int) edgStorageCageDetails.getHeight() * 10);
        task.setThickness((int) edgStorageCageDetails.getThickness() * 10);
        task.setFilmRemove(0);
//        task.setWidth((int) edgStorageCageDetails.getWidth() * 10);
//        task.setHeight((int) edgStorageCageDetails.getHeight() * 10);
//        task.setThickness((int) edgStorageCageDetails.getThickness() * 10);
//        task.setFilmRemove(0);
        edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
        saveHistoryTask(task);
        //更新详情表任务出片中
@@ -300,10 +300,10 @@
//        task.setTaskState(Const.GLASS_CACHE_TYPE_EMPTY);
        task.setGlassIdOut("");
        task.setStartCell(0);
        task.setWidth(0);
        task.setHeight(0);
        task.setThickness(0);
        task.setFilmRemove(0);
//        task.setWidth(0);
//        task.setHeight(0);
//        task.setThickness(0);
//        task.setFilmRemove(0);
        edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
        edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>()
                .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java

@@ -21,6 +21,10 @@
     */
    private String glassId;
    /**
     * 是否就位
     */
    private Integer inPlace;
    /**
     * 进片玻璃id
     */
    private String glassIdIn;
@@ -48,22 +52,7 @@
     * 任务类型
     */
    private Integer taskType;
    /**
     * 宽
     */
    private Integer width;
    /**
     * 高
     */
    private Integer height;
    /**
     * 厚
     */
    private Integer thickness;
    /**
     * 是否除膜
     */
    private Integer filmRemove;

    /**
     * 创建时间
     */
@@ -73,4 +62,5 @@
     */
    private Date updateTime;


}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml

@@ -4,6 +4,8 @@

    <resultMap id="baseMap" type="com.mes.opctask.entity.EdgStorageDeviceTask">
        <id column="task_running" property="taskRunning"/>
        <id column="glass_id" property="glassId"/>
        <id column="in_place" property="inPlace"/>
        <id column="glass_id_in" property="glassIdIn"/>
        <id column="glass_id_out" property="glassIdOut"/>
        <id column="current_cell" property="currentCell"/>
@@ -12,10 +14,6 @@
        <id column="task_state" property="taskState"/>
        <id column="create_time" property="createTime"/>
        <id column="update_time" property="updateTime"/>
        <id column="width" property="width"/>
        <id column="height" property="height"/>
        <id column="thickness" property="thickness"/>
        <id column="film_remove" property="filmRemove"/>
    </resultMap>

    <select id="queryTaskMessage" resultMap="baseMap">
@@ -30,11 +28,7 @@
        glass_id_out = #{task.glassIdOut},
        current_cell = #{task.currentCell},
        start_cell = #{task.startCell},
        end_cell = #{task.endCell},
        width = #{task.width},
        height = #{task.height},
        thickness = #{task.thickness},
        film_remove = #{task.filmRemove}
        end_cell = #{task.endCell}
        <if test="task.taskState == 0">
            ,task_state = #{task.taskState}
        </if>

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecageIntask/entity/BigStorageCageInTask.java

New file
@@ -0,0 +1,35 @@
package com.mes.bigstoragecageIntask.entity;

import lombok.Data;

/**
 * (BigStorageCageInOneTask)表实体类
 *
 * @author makejava
 * @since 2024-11-08 21:40:17
 */
@Data
public class BigStorageCageInTask {
    /**
     * 任务请求 0无任务 1启动任务 2 确认完成
     */
    private Integer taskRunning;
    /**
     * 玻璃id
     */
    private String glassId;
    /**
     * 起始格子
     */
    private Integer startSlot;
    /**
     * 目标格子
     */
    private Integer targetSlot;
    /**
     * 任务状态
     */
    private Integer taskState;

}


 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecageIntask/mapper/BigStorageCageInTaskMapper.java

New file
@@ -0,0 +1,22 @@
package com.mes.bigstoragecageIntask.mapper;

import com.mes.bigstoragecageIntask.entity.BigStorageCageInTask;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * (BigStorageCageInOneTask)表数据库访问层
 *
 * @author makejava
 * @since 2024-11-08 21:40:15
 */
public interface BigStorageCageInTaskMapper {

    List<BigStorageCageInTask> queryTaskMessage(String tableName);

    boolean updateTaskMessage(@Param("tableName") String tableName, @Param("task") BigStorageCageInTask bigStorageCageInTask);


}


 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecageIntask/service/BigStorageCageInTaskService.java

New file
@@ -0,0 +1,21 @@
package com.mes.bigstoragecageIntask.service;

import com.mes.bigstoragecageIntask.entity.BigStorageCageInTask;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * (BigStorageCageInOneTask)表服务接口
 *
 * @author makejava
 * @since 2024-11-08 21:40:20
 */
public interface BigStorageCageInTaskService {


    List<BigStorageCageInTask> queryTaskMessage(String tableName);

    boolean updateTaskMessage(@Param("tableName") String tableName, @Param("task") BigStorageCageInTask bigStorageCageInTask);
}


 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecageIntask/service/impl/BigStorageCageInTaskServiceImpl.java

New file
@@ -0,0 +1,33 @@
package com.mes.bigstoragecageIntask.service.impl;

import com.mes.bigstoragecageIntask.entity.BigStorageCageInTask;
import com.mes.bigstoragecageIntask.mapper.BigStorageCageInTaskMapper;
import com.mes.bigstoragecageIntask.service.BigStorageCageInTaskService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * (BigStorageCageInOneTask)表服务实现类
 *
 * @author makejava
 * @since 2024-11-08 21:40:23
 */
@Service
public class BigStorageCageInTaskServiceImpl implements BigStorageCageInTaskService {

    @Resource
    BigStorageCageInTaskMapper bigStorageCageInTaskMapper;

    @Override
    public List<BigStorageCageInTask> queryTaskMessage(String tableName) {
        return bigStorageCageInTaskMapper.queryTaskMessage(tableName);
    }

    @Override
    public boolean updateTaskMessage(String tableName, BigStorageCageInTask bigStorageCageInTask) {
        return bigStorageCageInTaskMapper.updateTaskMessage(tableName, bigStorageCageInTask);
    }
}


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

@@ -5,10 +5,10 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragecageIntask.entity.BigStorageCageInTask;
import com.mes.bigstoragecageIntask.service.BigStorageCageInTaskService;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
@@ -17,19 +17,20 @@
import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.tools.service.BigStorageBaseService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
@@ -38,23 +39,21 @@
@Component
@Slf4j
public class OpcPlcStorageCageTask {

    @Resource
    private BigStorageCageService bigStorageCageService;
    @Resource
    private BigStorageCageDetailsService bigStorageCageDetailsService;
    @Resource
    private GlassInfoService glassInfoService;
    @Resource
    private BigStorageCageFeedTaskService bigStorageCageFeedTaskService;
    @Resource
    private BigStorageCageOutTaskService bigStorageCageOutTaskService;
    @Resource
    private EdgGlassTaskInfoService edgGlassTaskInfoService;
    @Resource
    private TemperingGlassInfoService temperingGlassInfoService;
    @Resource
    private DamageService damageService;

    @Resource
    private BigStorageBaseService baseService;
    @Resource
    private BigStorageCageInTaskService bigStorageBaseInTaskService;

    @Autowired(required = false)
    MiloService miloService;
@@ -62,14 +61,6 @@
    @Resource(name = "bigStorageStartCallback")
    SubscriptionCallback bigStorageStartCallback;

    @Value("${mes.carWidth}")
    private Integer carWidth;

    @Value("${mes.slotWidth}")
    private Integer slotWidth;

    @Value("${mes.glassGap}")
    private Integer glassGap;

    @Scheduled(fixedDelay = Long.MAX_VALUE)
    public void startOpcTask() throws Exception {
@@ -81,6 +72,17 @@
    public void outOpcTask() throws Exception {
        //设备1的出片请求
        miloService.subscriptionFromOpcUa(Arrays.asList("my.device03.x1"), bigStorageStartCallback);
    }


    @Scheduled(fixedDelay = 200)
    public void inBigStorageTask() {
        //todo:获取进片任务表
        List<BigStorageCageInTask> inTaskList = bigStorageBaseInTaskService.queryTaskMessage("big_storage_cage_in_one_task");
        if (CollectionUtils.isEmpty(inTaskList)) {
            log.info("当前大车无进片任务，结束本地定时任务");
        }
        inTaskList
    }


@@ -108,7 +110,7 @@
                bigStorageCageDetailsService.updateBySlot(storageCageDTOList, Const.GLASS_STATE_IN);
                log.info("4、大理片笼进片状态已完成已完成的玻璃信息id:{}", inSuccessGlass);
                //更新理片笼玻璃尺寸
                updateSlotRemainBySlots(inSuccessGlassSlot);
                baseService.updateSlotRemainBySlots(inSuccessGlassSlot);
                log.info("5、大理片笼进片目标格子尺寸更新完成");
            }

@@ -153,7 +155,7 @@
                List<Integer> outSuccessSlotList = outSuccessGlass.stream().map(BigStorageCageOutTask::getStartSlot).collect(Collectors.toList());
                log.info("4、大理片笼出片状态已完成已完成的玻璃信息id:{}", outSuccessGlass);
                //更新理片笼玻璃尺寸
                updateSlotRemainBySlots(outSuccessSlotList);
                baseService.updateSlotRemainBySlots(outSuccessSlotList);
                log.info("5、大理片笼进片目标格子尺寸更新完成");
            }
        }
@@ -190,7 +192,7 @@
                //更新理片笼玻璃尺寸
                List<Integer> slotList = scheduleSuccessGlass.stream().map(BigStorageCageOutTask::getStartSlot).distinct().collect(Collectors.toList());
                slotList.addAll(scheduleSuccessGlass.stream().map(BigStorageCageOutTask::getEndSlot).distinct().collect(Collectors.toList()));
                updateSlotRemainBySlots(slotList);
                baseService.updateSlotRemainBySlots(slotList);
                log.info("5、大理片笼进片目标格子尺寸更新完成");
            }
        }
@@ -230,7 +232,7 @@
                slotList.add(bigStorageCageFeedTask.getTargetSlot());
            }
            //更新格子剩余宽度
            updateSlotRemainBySlots(slotList);
            baseService.updateSlotRemainBySlots(slotList);
            log.info("进片任务执行完成");
        }
        //获取出片任务表中状态为破损的数据
@@ -258,37 +260,12 @@
                slotList.add(bigStorageCageOutTask.getStartSlot());
            }
            //更新格子剩余宽度
            updateSlotRemainBySlots(slotList);
            baseService.updateSlotRemainBySlots(slotList);
            log.info("出片任务执行完成");
        }
        Date endDate = new Date();
        log.info("大理片笼破损玻璃清除任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
        return;
    }

    public void updateSlotRemainBySlots(List<Integer> slotList) {
        //获取格子内所有的玻璃信息
        List<BigStorageCageDetails> inSlotGlassList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
                .in(BigStorageCageDetails::getSlot, slotList).in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
        Map<Integer, Double> slotRemainMap = new HashMap<>();
        //是否存在有格子非空的玻璃
        if (CollectionUtils.isNotEmpty(inSlotGlassList)) {
            //存在  将格子内的玻璃分别进行更新
            slotRemainMap = inSlotGlassList.stream()
                    .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)
                        .eq(BigStorageCage::getSlot, e));
            });
        }
        //过滤不存在玻璃的格子 将宽度重置为原始宽度5000
        Set<Integer> remainSlotList = slotRemainMap.keySet();
        slotList.removeAll(remainSlotList);
        if (CollectionUtils.isNotEmpty(slotList)) {
            bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, slotWidth)
                    .in(BigStorageCage::getSlot, slotList));
        }
    }



 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/tools/service/BigStorageBaseService.java

New file
@@ -0,0 +1,17 @@
package com.mes.tools.service;

import com.mes.bigstorage.entity.BigStorageDTO;
import com.mes.glassinfo.entity.GlassInfo;

import java.util.List;

/**
 * @Author : zhoush
 * @Date: 2024/11/8 22:02
 * @Description:
 */
public interface BigStorageBaseService {
    void updateSlotRemainBySlots(List<Integer> slotList);

    BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo);
}

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/tools/service/impl/BigStorageBaseServiceImpl.java

New file
@@ -0,0 +1,663 @@
package com.mes.tools.service.impl;

import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.entity.BigStorageDTO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
import com.mes.common.S7object;
import com.mes.common.config.Const;
import com.mes.device.PlcParameterObject;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.tools.S7control;
import com.mes.tools.service.BigStorageBaseService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

/**
 * @Author : zhoush
 * @Date: 2024/11/8 22:03
 * @Description:
 */
@Service
@Slf4j
public class BigStorageBaseServiceImpl implements BigStorageBaseService {

    @Resource
    BigStorageCageDetailsService bigStorageCageDetailsService;

    @Resource
    BigStorageCageService bigStorageCageService;

    @Resource
    GlassInfoService glassInfoService;

    @Value("${mes.slotWidth}")
    private Integer slotWidth;

    @Value("${mes.carWidth}")
    private Integer carWidth;

    @Value("${mes.outCarMaxSize}")
    private Integer outCarMaxSize;

    @Value("${mes.glassGap}")
    private Integer glassGap;


    @Override
    public void updateSlotRemainBySlots(List<Integer> slotList) {
        //获取格子内所有的玻璃信息
        List<BigStorageCageDetails> inSlotGlassList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
                .in(BigStorageCageDetails::getSlot, slotList).in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
        Map<Integer, Double> slotRemainMap = new HashMap<>();
        //是否存在有格子非空的玻璃
        if (CollectionUtils.isNotEmpty(inSlotGlassList)) {
            //存在  将格子内的玻璃分别进行更新
            slotRemainMap = inSlotGlassList.stream()
                    .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)
                        .eq(BigStorageCage::getSlot, e));
            });
        }
        //过滤不存在玻璃的格子 将宽度重置为原始宽度5000
        Set<Integer> remainSlotList = slotRemainMap.keySet();
        slotList.removeAll(remainSlotList);
        if (CollectionUtils.isNotEmpty(slotList)) {
            bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, slotWidth)
                    .in(BigStorageCage::getSlot, slotList));
        }
    }

    /**
     * 按照玻璃id判断玻璃状态及卧转立是否可直接启动
     */
//    public Boolean judgeGlassTypeStatus(String glassId, Integer line, String mesAddress) {
//        //判断此玻璃是在笼内或已生成进片任务
//        BigStorageCageFeedTask bigStorageCageFeedTask = bigStorageCageFeedTaskService.getOne(
//                new LambdaQueryWrapper<BigStorageCageFeedTask>()
//                        .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
//                        .eq(BigStorageCageFeedTask::getGlassId, glassId)
//        );
//        BigStorageCageDetails bigStorageCageDetails = bigStorageCageDetailsService.getOne(
//                new LambdaQueryWrapper<BigStorageCageDetails>()
//                        .eq(BigStorageCageDetails::getGlassId, glassId)
//                        .ne(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
//        );
//        if (bigStorageCageFeedTask != null || bigStorageCageDetails != null) {
//            log.info("此玻璃存任务或已在笼内");
//            return Boolean.TRUE;
//        }
//        //1、获取任务表中相邻玻璃
//        List<EdgGlassTaskInfo> edgGlassTaskInfoList;
//        edgGlassTaskInfoList = edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
//                .eq(EdgGlassTaskInfo::getLine, line)
//                .apply("time >= (select time from edg_glass_task_info where line='" + line + "' and glass_id = '" + glassId + "' and deleted = 0)")
//                .orderByAsc(EdgGlassTaskInfo::getTime));
//        if (edgGlassTaskInfoList.size() == 0) {
//            edgGlassTaskInfoList = edgGlassTaskInfoService.list(new QueryWrapper<EdgGlassTaskInfo>()
//                    .select("Top 1 *")
//                    .eq("glass_id", glassId)
//            );
//            log.info("在尺寸表中获取玻璃信息{}", edgGlassTaskInfoList);
//            if (edgGlassTaskInfoList.size() == 0) {
//                GlassInfo glassInfo = glassInfoService.getOne(
//                        new LambdaQueryWrapper<GlassInfo>()
//                                .eq(GlassInfo::getGlassId, glassId)
//                );
//                EdgGlassTaskInfo edgGlassTaskInfo = new EdgGlassTaskInfo();
//                BeanUtils.copyProperties(glassInfo, edgGlassTaskInfo);
//                edgGlassTaskInfo.setWidth((int) glassInfo.getWidth());
//                edgGlassTaskInfo.setHeight((int) glassInfo.getHeight());
//                edgGlassTaskInfoList.add(edgGlassTaskInfo);
//                log.info("在玻璃信息表中获取玻璃信息{}", edgGlassTaskInfoList);
//            }
//        }
//        Assert.isFalse(CollectionUtils.isEmpty(edgGlassTaskInfoList), "识别玻璃信息未出现在尺寸表中,获取相邻两块玻璃失败");
//        //2、获取卧转立剩余宽度
//        BigStorageDTO sitToUpRemainWidth = bigStorageCageFeedTaskService.querySitToUpRemainWidth(line);
//        Integer remainWidth;
//        Integer glassCount;
//        if (0 == sitToUpRemainWidth.getGlassCount()) {
//            remainWidth = carWidth;
//            glassCount = 0;
//        } else {
//            remainWidth = sitToUpRemainWidth.getWidth();
//            glassCount = sitToUpRemainWidth.getGlassCount();
//        }
//
//        Boolean flag = Boolean.TRUE;
//        //2、获取卧转立
//        Integer widthFirst = Math.max(edgGlassTaskInfoList.get(0).getWidth() / 10, edgGlassTaskInfoList.get(0).getHeight() / 10);
//        Integer heightFirst = Math.min(edgGlassTaskInfoList.get(0).getWidth() / 10, edgGlassTaskInfoList.get(0).getHeight() / 10);
//        if (edgGlassTaskInfoList.size() == 1) {
//            if (remainWidth >= widthFirst) {
//                if (glassCount < inCarMaxSize) {
//                    addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightFirst);
//                } else {
//                    if (glassCount < inCarMaxSize + 1) {
//                        addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
//                    } else {
//                        return Boolean.FALSE;
//                    }
//                }
//            } else {
//                flag = Boolean.FALSE;
//            }
//        } else {
//            Integer widthSecond = Math.max(edgGlassTaskInfoList.get(1).getWidth() / 10, edgGlassTaskInfoList.get(1).getHeight() / 10);
//            Integer heightSecond = Math.min(edgGlassTaskInfoList.get(1).getWidth() / 10, edgGlassTaskInfoList.get(1).getHeight() / 10);
//            if (remainWidth >= widthFirst) {
//                if (remainWidth - widthFirst - glassGap >= widthSecond) {
//                    if (glassCount < inCarMaxSize) {
//                        addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightFirst);
//                    } else {
//                        if (glassCount < inCarMaxSize + 1) {
//                            addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
//                        } else {
//                            return Boolean.FALSE;
//                        }
//                    }
//                } else {
//                    if (glassCount < inCarMaxSize + 1) {
//                        addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
//                    } else {
//                        return Boolean.FALSE;
//                    }
//                }
//            } else {
//                flag = Boolean.FALSE;
//            }
//        }
//        //向plc发送进片确认
//        if (flag) {
//            //向plc写入确认字
//            PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
//            int returnData = 1;
//            int count = 1;
//            while (returnData != 0) {
//                S7object.getinstance().plccontrol.writeWord(mesAddress, 1);
//
//                if (Const.A10_OUT_TARGET_POSITION.equals(line)) {
//                    returnData = Integer.parseInt(plcParameterObject.getPlcParameter("D04ToMES").getValue());
//                } else {
//                    returnData = Integer.parseInt(plcParameterObject.getPlcParameter("D01ToMES").getValue());
//                }
////                returnData = S7object.getinstance().plccontrol.readWord(mesAddress, 1).get(0);
//                log.info("进卧转立第{}次发送确认字完成，地址为：{},写入的内容为{}", count++, mesAddress, 1);
//            }
//        }
//        //记录无法放下玻璃，后续判断启动
//        return flag;
//    }

    /**
     * 添加任务信息
     */
//    private Boolean addFeedTask(String glassId, Integer line, Integer taskType, Integer width, Integer height) {
//        BigStorageCageFeedTask bigStorageCageFeedTask = new BigStorageCageFeedTask();
//        bigStorageCageFeedTask.setGlassId(glassId);
//        bigStorageCageFeedTask.setTaskState(Const.BIG_STORAGE_IN_NEW);
//        bigStorageCageFeedTask.setLine(line);
//        bigStorageCageFeedTask.setTaskType(taskType);
//        bigStorageCageFeedTask.setWidth(width);
//        bigStorageCageFeedTask.setHeight(height);
//        bigStorageCageFeedTask.setCreateTime(new Date());
//        //删除理片笼表拿走/破损数据数据
//        damageService.deleteByGlassId(glassId);
//        Damage damage = new Damage();
//        damage.setGlassId(glassId);
//        damage.setWorkingProcedure("磨边");
//        damage.setLine(line);
//        damage.setType(1);
//        damage.setRemark("进大理片");
//        damageService.insertDamage(damage);
//        return bigStorageCageFeedTaskService.save(bigStorageCageFeedTask);
//    }

    /**
     * 获取需要启动的线路：两条线都可启动 获取第一片玻璃版图id最小 版序最大的线路
     *
     * @return 需要启动的线路
     */
//    public Integer getStartLine() {
//        List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
//                .inSql(BigStorageCageFeedTask::getId, "select min(id) from big_storage_cage_feed_task where task_state = 2" +
//                        "and (target_slot = 0 or target_slot is null) group by line"));
//        Assert.isFalse(CollectionUtils.isEmpty(taskList), "卧转立两条线都没有玻璃进片任务");
//        Map<String, Integer> taskMap = taskList.stream().collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId,
//                BigStorageCageFeedTask::getLine));
//        GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
//                .in(GlassInfo::getGlassId, taskMap.keySet())
//                .orderByAsc(GlassInfo::getTemperingLayoutId)
//                .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)
//                .last("limit 1"));
//        return taskMap.get(glassInfo.getGlassId());
//    }

    /**
     * 计算任务表进片线路的目标格子，并启动任务
     */
//    public boolean computeTargetByLine(Integer line) {
//        //1、获取任务表中的所有玻璃（指定线路且已经进卧转立完成）
//        List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
//                .eq(BigStorageCageFeedTask::getLine, line)
//                .and(e -> e.isNull(BigStorageCageFeedTask::getTargetSlot).or().eq(BigStorageCageFeedTask::getTargetSlot, Const.OUT_TARGET_POSITION_ZERO))
//                .in(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP_ALL)
//                .orderByAsc(BigStorageCageFeedTask::getId));
//        //2、去笼子内查找是否可以继续存放的笼子
//        List<String> glassIds = taskList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList());
//        List<GlassInfo> glassInfos = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassIds));
//        return computeIsTemperingTargetByLine(glassInfos, taskList);
//    }

//    /**
//     * 是否钢化玻璃进笼目标位置
//     *
//     * @param glassInfos 当条线卧转立所有玻璃
//     * @param taskList   当条线卧转立所有任务
//     */
//    private boolean computeIsTemperingTargetByLine(List<GlassInfo> glassInfos, List<BigStorageCageFeedTask> taskList) {
//        //1、将玻璃信息集合转为glassid为key的map
//        Map<String, GlassInfo> glassInfoMap = glassInfos.stream()
//                .collect(Collectors.toMap(GlassInfo::getGlassId, p -> p));
//        for (BigStorageCageFeedTask e : taskList) {
//            GlassInfo info = glassInfoMap.get(e.getGlassId());
//            if (info == null) {
//                continue;
//            }
//            BigStorageCageDetails cageDetails = new BigStorageCageDetails();
//            BeanUtils.copyProperties(info, cageDetails);
//            //todo:2、获取目标格子信息
//            BigStorageDTO bigStorageDTO = bigStorageCageDetailsService.queryTargetSlotByTempering(info);
//            //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);
//
//            //5、将进片信息存入大理片笼详情表
//            cageDetails.setSlot(bigStorageDTO.getSlot());
//            cageDetails.setState(Const.GLASS_STATE_NEW);
//            cageDetails.setDeviceId(bigStorageDTO.getDeviceId());
//            cageDetails.setGap(glassGap);
//            bigStorageCageDetailsService.save(cageDetails);
//
//        }
//        return Boolean.TRUE;
//    }
    private void sendTaskListToPLC(List<BigStorageCageFeedTask> taskList, Integer line) {
        log.info("送片任务发送进片玻璃信息");
        S7control s7control = S7object.getinstance().plccontrol;
        PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
        String mesD03Address = plcMesObject.getPlcParameter("MESToD03").getAddress();
        String mesD05Address = plcMesObject.getPlcParameter("MESToD05").getAddress();
        String outLine = line.equals(Const.A09_OUT_TARGET_POSITION) ? mesD03Address : mesD05Address;
        for (int i = 1; i <= taskList.size(); i++) {
            s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), taskList.get(i - 1).getLine());
            s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), taskList.get(i - 1).getTargetSlot());
            log.info("向plc发送第{}片玻璃已完成,起始位置是{}，目标位置是", i, taskList.get(i - 1).getLine(), taskList.get(i - 1).getTargetSlot());
        }
        int returnData = 1;
        int count = 1;
        while (returnData != 0) {
            s7control.writeWord(outLine, 2);
            if (line.equals(Const.A09_OUT_TARGET_POSITION)) {
                returnData = Integer.parseInt(plcMesObject.getPlcParameter("D03ToMES").getValue());
            } else {
                returnData = Integer.parseInt(plcMesObject.getPlcParameter("D05ToMES").getValue());
            }
//            returnData = s7control.readWord(outLine, 1).get(0);
            log.info("已向plc第{}次发送进片任务确认，地址为：{},写入的内容为{}", count++, outLine, 2);
        }
    }

//    /**
//     * 出片一次仅生成一车玻璃
//     *
//     * @param list
//     * @param isTempering
//     * @param mesToPLCAddress
//     * @param <T>
//     * @return
//     */
//    private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
//        //任务数据  获取车子存放玻璃最大数量  玻璃间隔
//        List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
//        //打车剩余尺寸
//        Integer remainWidth = carWidth;
//        int maxX = 0;
//        for (T e : list) {
//            if (bigStorageCageOutTaskList.size() >= outCarMaxSize || Math.max((int) e.getWidth(), (int) e.getHeight()) > remainWidth) {
//                break;
//            }
//            remainWidth = remainWidth - Math.max((int) e.getWidth(), (int) e.getHeight()) - glassGap;
//            if (isTempering) {
//                int minLength = Math.min((int) e.getWidth(), (int) e.getHeight());
//                if (maxX + minLength <= xMaxSize) {
//                    bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
//                            e.getWidth() * 10, e.getHeight() * 10, 0, 0, 1, new Date()));
//                    maxX = Math.max(maxX, e.getXCoordinate());
//                } else {
//                    break;
//                }
//
//            } else {
//                bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
//                        e.getWidth() * 10, e.getHeight(), 0, 0, 1, new Date()));
//            }
//        }
//        Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "未获取出片数据，结束出片任务");
//        log.info("获取出片任务数据{}条，执行保存", bigStorageCageOutTaskList.size());
//        bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
//        List<String> glassIds = bigStorageCageOutTaskList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
//        log.info("将出片玻璃{}玻璃状态改为已出片", glassIds);
//        bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()
//                .set(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING)
//                .in(BigStorageCageDetails::getGlassId, glassIds));
//        int returnData = 0;
//        int count = 1;
//        while (returnData == 0) {
//            S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
//            returnData = S7object.getinstance().plccontrol.readWord(mesToPLCAddress, 1).get(0);
//            log.info("已向plc第{}次发送出片任务确认，地址为：{},写入的内容为{}", count++, mesToPLCAddress, returnData);
//        }
//        return Boolean.TRUE;
//    }

//    /**
//     * 出片一次生成一炉玻璃
//     *
//     * @param list
//     * @param isTempering
//     * @param mesToPLCAddress
//     * @param <T>
//     * @return
//     */
//    public <T extends BigStorageCageBaseInfo> Boolean computeOutMoreGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
//        //任务数据  获取车子存放玻璃最大数量  玻璃间隔
//        List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
//        //打车剩余尺寸
//        Integer remainWidth = carWidth;
//        int trainNumber = 1;
//        int serialNumber = 1;
//        int maxX = 0;
//        for (T e : list) {
//            int maxLength = Math.max((int) e.getWidth(), (int) e.getHeight());
//            if (serialNumber > outCarMaxSize || maxLength > remainWidth) {
//                remainWidth = carWidth;
//                trainNumber = trainNumber + 1;
//                serialNumber = 1;
//                maxX = 0;
//            }
//            remainWidth = remainWidth - maxLength - glassGap;
//            if (isTempering) {
//                int minLength = Math.min((int) e.getWidth(), (int) e.getHeight());
//                if (maxX + minLength <= xMaxSize) {
//                    bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
//                            e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1, new Date()));
//                    maxX = Math.max(maxX, e.getXCoordinate());
//                } else {
//                    remainWidth = carWidth - maxLength - glassGap;
//                    trainNumber = trainNumber + 1;
//                    serialNumber = 1;
//                    maxX = e.getXCoordinate();
//                    bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
//                            e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1, new Date()));
//                }
//            } else {
//                bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
//                        e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1, new Date()));
//            }
//        }
//        Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "未获取出片数据，结束出片任务");
//        log.info("获取出片任务数据{}条，执行保存", bigStorageCageOutTaskList.size());
//        for (BigStorageCageOutTask bigStorageCageOutTask : bigStorageCageOutTaskList
//        ) {
//            bigStorageCageOutTaskService.save(bigStorageCageOutTask);
//        }
////        bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
//        List<String> glassIds = bigStorageCageOutTaskList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
//        log.info("将出片玻璃{}玻璃状态改为已出片", glassIds);
//        bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()
//                .set(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING)
//                .in(BigStorageCageDetails::getGlassId, glassIds)
//                .ne(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT));
//
//        return Boolean.TRUE;
//    }

    @Override
    public BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo) {
        BigStorageDTO bigStorageDTO = null;
        MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
                .selectAll(BigStorageCage.class)
                .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
                .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
                .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
                .eq(BigStorageCageDetails::getEngineerId, glassInfo.getEngineerId())
                .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
                .gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight()))
                .last("limit 1");
        if (glassInfo.getTemperingLayoutId() == 0) {
            wrapper.eq(BigStorageCageDetails::getFlowCardId, glassInfo.getFlowCardId())
                    .eq(BigStorageCageDetails::getLayer, glassInfo.getLayer());
//            wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
        } else {
            wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
        }
        BigStorageCage bigStorageCage = bigStorageCageService.selectJoinOne(BigStorageCage.class, wrapper);
        if (null != bigStorageCage) {
            log.info("无钢化版图id或根据当前玻璃片序+1找到目标格子：{},玻璃id：{}", bigStorageCage.getSlot(), glassInfo.getGlassId());
            bigStorageDTO = new BigStorageDTO();
            bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
            bigStorageDTO.setSlot(bigStorageCage.getSlot());
            bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
            return bigStorageDTO;
        }
        bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
                .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
                .eq(BigStorageCage::getRemainWidth, slotWidth)
//                .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
                .inSql(BigStorageCage::getDeviceId,
                        "select distinct device_id from big_storage_cage_details where engineer_id = '" + glassInfo.getEngineerId() + "' and tempering_layout_id = " + glassInfo.getTemperingLayoutId())
                .last("limit 1"));
        if (null != bigStorageCage) {
            log.info("根据版图id找到笼子内的目标格子：{},玻璃id：{}", bigStorageCage.getSlot(), glassInfo.getGlassId());
            bigStorageDTO = new BigStorageDTO();
            bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
            bigStorageDTO.setSlot(bigStorageCage.getSlot());
            bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
            return bigStorageDTO;
        }

        //获取玻璃的厚度：重新选笼子需要按照笼子可放玻璃厚度进行选择 因为子查询排序对主sql无影响，所以先执行子查询获取顺序，然后一次去查询
        List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness());
        List<Integer> deviceUseds = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness());
        List<BigStorageCageDetails> engineerCount1 = baseMapper.selectList(
                new LambdaQueryWrapper<BigStorageCageDetails>()
                        .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
                        .select(BigStorageCageDetails::getEngineerId)
                        .groupBy(BigStorageCageDetails::getEngineerId)
                        .between(BigStorageCageDetails::getDeviceId, 1, 5)
        );
        List<BigStorageCageDetails> engineerCount2 = baseMapper.selectList(
                new LambdaQueryWrapper<BigStorageCageDetails>()
                        .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
                        .select(BigStorageCageDetails::getEngineerId)
                        .groupBy(BigStorageCageDetails::getEngineerId)
                        .between(BigStorageCageDetails::getDeviceId, 6, 8)
        );
        if (engineerCount1.size() > engineerCount2.size()) {
            deviceUsedList.removeIf(device -> device < 6);
        } else {
            deviceUsedList.removeIf(device -> device > 5);
        }
        if (CollectionUtils.isEmpty(deviceUsedList)) {
            deviceUsedList = deviceUseds;
        }
        for (Integer item : deviceUsedList) {
            bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
                    .eq(BigStorageCage::getRemainWidth, slotWidth)
                    .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
                    .eq(BigStorageCage::getDeviceId, item)
                    .last("limit 1"));
            if (null != bigStorageCage) {
                log.info("按照存笼玻璃格子数占用最少方式获取信息格子为：{},玻璃id：{}", bigStorageCage.getSlot(), glassInfo.getGlassId());
                bigStorageDTO = new BigStorageDTO();
                bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
                bigStorageDTO.setSlot(bigStorageCage.getSlot());
                bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
                return bigStorageDTO;
            }
        }

        //获取玻璃的厚度：重新选笼子需要按照笼子可放玻璃厚度进行选择
//        List<Integer> deviceNotUsedList = bigStorageCageService.queryFreeDeviceByNotUsed(glassInfo.getThickness());
//        for (Integer item : deviceNotUsedList) {
//            bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
//                    .eq(BigStorageCage::getRemainWidth, slotWidth)
//                    .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
//                    .eq(BigStorageCage::getDeviceId, item)
//                    .last("limit 1"));
//            if (null != bigStorageCage) {
//                log.info("按照存笼玻璃格子数剩余最多得方式获取信息版图id:{},格子：{},玻璃id：{}", glassInfo.getTemperingLayoutId(), bigStorageCage.getSlot(), glassInfo.getGlassId());
//                bigStorageDTO = new BigStorageDTO();
//                bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
//                bigStorageDTO.setSlot(bigStorageCage.getSlot());
//                bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
//                return bigStorageDTO;
//            }
//        }
        Assert.isTrue(null != bigStorageCage, "没有空余的笼子存放玻璃");
        return bigStorageDTO;
    }


    @Scheduled(fixedDelay = 300)
    public void querySizeByEngineerTask() {
        log.info("查询结果：{}", querySizeByEngineer("P24072402", 1, 10, 8));
        log.info("查询结果：{}", querySizeByEngineer("P24072402", 1, 5, 8));

    }

    public BigStorageDTO querySizeByEngineer(String engineerId, int temperingLayoutId, int temperingFeedSequence, double thickness) {
        BigStorageDTO bigStorageDTO = null;
        BigStorageCage bigStorageCage = null;
        //获取笼内当前版图每个格子已有玻璃的最小版序 获取笼内当前版图的所有玻璃信息
        List<BigStorageCageDetails> cageDetailsList = bigStorageCageDetailsService.list(new QueryWrapper<BigStorageCageDetails>()
                .select("slot", "min(tempering_feed_sequence) as tempering_feed_sequence")
                .eq("engineer_id", engineerId).eq("tempering_layout_id", temperingLayoutId)
                .in("state", Const.GLASS_STATE_IN_ALL_ZERO).groupBy("slot").orderByAsc("min(tempering_feed_sequence)"));
        if (CollectionUtils.isNotEmpty(cageDetailsList)) {
            Integer minLength = cageDetailsList.stream().filter(e -> e.getTemperingFeedSequence() > temperingFeedSequence)
                    .mapToInt(BigStorageCageDetails::getTemperingFeedSequence).min().orElse(1000);
            List<GlassInfo> infoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>()
                    .notInSql(GlassInfo::getGlassId, "select glass_id from damage where tempering_layout_id = " + temperingLayoutId + " and engineer_id = '" + engineerId + "'")
                    .eq(GlassInfo::getTemperingLayoutId, temperingLayoutId).eq(GlassInfo::getEngineerId, engineerId).orderByAsc(GlassInfo::getTemperingFeedSequence));
            int remainWidth = carWidth;
            int trainNumber = 1;
            int serialNumber = 0;
            int min = 0;
            int temp = infoList.get(0).getTemperingFeedSequence();
            int slot = 0;
            int resultTrainNumber = 0;
            for (GlassInfo e : infoList) {
                int maxLength = Math.max((int) e.getWidth(), (int) e.getHeight());
                if (serialNumber >= outCarMaxSize || maxLength > remainWidth || e.getTemperingFeedSequence() >= minLength) {
                    if (resultTrainNumber != 0) {
                        min = temp;
                        break;
                    }
                    temp = e.getTemperingFeedSequence();
                    remainWidth = carWidth;
                    trainNumber = trainNumber + 1;
                    serialNumber = 0;
                }
                if (temperingFeedSequence == e.getTemperingFeedSequence()) {
                    resultTrainNumber = trainNumber;
                }
                remainWidth = remainWidth - maxLength - glassGap > 0 ? remainWidth - maxLength - glassGap : 0;
                serialNumber += 1;
                log.info("{},{},{}", trainNumber, remainWidth, serialNumber);
                if (e.getTemperingFeedSequence().equals(infoList.get(infoList.size() - 1).getTemperingFeedSequence())) {
                    min = temp;
                }
            }
            for (BigStorageCageDetails item : cageDetailsList) {
                if (min <= item.getTemperingFeedSequence() && item.getTemperingFeedSequence() < minLength) {
                    slot = item.getSlot();
                    bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
                            .eq(BigStorageCage::getSlot, slot).eq(BigStorageCage::getEnableState, Const.SLOT_ON));
                    break;
                }
            }
        }

        if (bigStorageCage != null) {
            bigStorageDTO = new BigStorageDTO();
            bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
            bigStorageDTO.setSlot(bigStorageCage.getSlot());
            bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
            return bigStorageDTO;
        }

        bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
                .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
                .eq(BigStorageCage::getRemainWidth, slotWidth)
                .inSql(BigStorageCage::getDeviceId,
                        "select distinct device_id from big_storage_cage_details where engineer_id = '" + engineerId + "' and tempering_layout_id = " + temperingLayoutId)
                .last("limit 1"));
        if (null != bigStorageCage) {
            log.info("根据版图id找到笼子内的目标格子：{}", bigStorageCage.getSlot());
            bigStorageDTO = new BigStorageDTO();
            bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
            bigStorageDTO.setSlot(bigStorageCage.getSlot());
            bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
            return bigStorageDTO;

        }

        //获取玻璃的厚度：重新选笼子需要按照笼子可放玻璃厚度进行选择 因为子查询排序对主sql无影响，所以先执行子查询获取顺序，然后一次去查询
        List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(thickness);
        for (Integer item : deviceUsedList) {
            bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
                    .eq(BigStorageCage::getRemainWidth, slotWidth)
                    .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
                    .eq(BigStorageCage::getDeviceId, item)
                    .last("limit 1"));
            if (null != bigStorageCage) {
                log.info("按照存笼玻璃格子数占用最少方式获取信息格子为：{}", bigStorageCage.getSlot());
                bigStorageDTO = new BigStorageDTO();
                bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
                bigStorageDTO.setSlot(bigStorageCage.getSlot());
                bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
                return bigStorageDTO;
            }
        }
        Assert.isTrue(null != bigStorageCage, "没有空余的笼子存放玻璃");
        return bigStorageDTO;
    }


}

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageInTaskMapper.xml

New file
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.mes.bigstoragecageIntask.mapper.BigStorageCageInTaskMapper">

    <resultMap id="baseMap" type="com.mes.bigstoragecageIntask.entity.BigStorageCageInTask">
        <id column="task_running" property="taskRunning"/>
        <result column="glass_id" property="glassId"/>
        <result column="start_slot" property="startSlot"/>
        <result column="target_slot" property="targetSlot"/>
        <result column="task_state" property="taskState"/>
    </resultMap>

    <select id="queryTaskMessage" resultMap="baseMap">
        select *
        from ${tableName}
        where glass_id is not null
           or glass_id = ''
    </select>

    <update id="updateTaskMessage">
        UPDATE ${tableName}
        SET task_running = #{task.taskRunning},
            glass_id     = #{task.glassId},
            start_slot   = #{task.startSlot},
            target_slot  = #{task.targetSlot}
    </update>


</mapper>

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java

@@ -12,6 +12,8 @@
import com.mes.opctask.service.LoadGlassDeviceTaskService;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import com.mes.uppattenusage.entity.UpPattenUsage;
@@ -41,6 +43,8 @@

    @Autowired
    private RawGlassStorageTaskService rawGlassStorageTaskService;
    @Autowired
    private RawGlassStorageStationService rawGlassStorageStationService;

    @Resource
    private EngineeringMapper engineeringMapper;
@@ -67,22 +71,22 @@

    @Scheduled(fixedDelay = 1000)
    public void rawStorageTask() throws Exception {
        ReadWriteEntity requestWord = miloService.readFromOpcUa("A01-CC.dev.request");
        ReadWriteEntity confireWord = miloService.readFromOpcUa("A01-CC.dev.confirmationWord");
        ReadWriteEntity reportWord = miloService.readFromOpcUa("A01-CC.dev.reportWord");
        ReadWriteEntity taskWord = miloService.readFromOpcUa("A01-CC.dev.taskWord");
        ReadWriteEntity requestWord = miloService.readFromOpcUa("PLC.CC.request");
        ReadWriteEntity confireWord = miloService.readFromOpcUa("PLC.CC.confirmation");
        ReadWriteEntity reportWord = miloService.readFromOpcUa("PLC.CC.reportWord");
        ReadWriteEntity taskWord = miloService.readFromOpcUa("PLC.CC.taskWord");
        String requestValue = requestWord.getValue() + "";
        if ("0".equals(requestValue)) {
            if ("1".equals(confireWord.getValue() + "") && "0".equals(reportWord.getValue() + "")) {
                List<ReadWriteEntity> list = new ArrayList<>();
                list.add(generateReadWriteEntity("A01-CC.dev.confirmationWord", 0));
                list.add(generateReadWriteEntity("PLC.CC.confirmation", 0));
                miloService.writeToOpcWord(list);
            }
            if ("1".equals(taskWord.getValue() + "")) {
                List<ReadWriteEntity> list = new ArrayList<>();
                list.add(generateReadWriteEntity("A01-CC.dev.taskWord", 0));
                list.add(generateReadWriteEntity("A01-CC.dev.startSlot", 0));
                list.add(generateReadWriteEntity("A01-CC.dev.endSlot", 0));
                list.add(generateReadWriteEntity("PLC.CC.taskWord", 0));
                list.add(generateReadWriteEntity("PLC.CC.startSlot", 0));
                list.add(generateReadWriteEntity("PLC.CC.endSlot", 0));
                miloService.writeToOpcWord(list);
            }
            return;
@@ -118,7 +122,7 @@

    @Scheduled(fixedDelay = 1000)
    public void rawStorageInCar() throws Exception {
        ReadWriteEntity entity = miloService.readFromOpcUa("A01-CC.dev.inCar");
        ReadWriteEntity entity = miloService.readFromOpcUa("PLC.CC.inCar");
        String value = entity.getValue() + "";
        if (!"1".equals(value)) {
            log.info("大车上没有架子");
@@ -138,7 +142,7 @@

    @Scheduled(fixedDelay = 1000)
    public void rawStorageFinish() throws Exception {
        ReadWriteEntity entity = miloService.readFromOpcUa("A01-CC.dev.reportWord");
        ReadWriteEntity entity = miloService.readFromOpcUa("PLC.CC.reportWord");
        String value = entity.getValue() + "";
        if ("0".equals(value)) {
            log.info("当前任务未汇报，结束本次任务");
@@ -153,6 +157,7 @@
        RawGlassStorageTask task = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
                .in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW));
        RawGlassStorageDetails targetDetails = generateDetails(details, task.getEndSlot());
        int deviceId = details.getDeviceId();
        Integer taskType = task.getTaskType();
        if ("1".equals(value)) {
            log.info("将详情表的状态改为已出库");
@@ -165,6 +170,7 @@
                    .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_SUCCESS));
            switch (taskType) {
                case 1:
                case 3:
                    log.info("1、入库，3、调度任务。{}", taskType);
                    if (targetDetails.getRemainQuantity() > 0) {
                        rawGlassStorageDetailsService.save(targetDetails);
@@ -175,6 +181,7 @@
                    log.info("2、出片,4、入库请求。{}", taskType);
                    targetDetails = new RawGlassStorageDetails();
                    targetDetails.setSlot(task.getEndSlot());
                    targetDetails.setDeviceId(deviceId);
                    targetDetails.setShelf(task.getStartSlot());
                    targetDetails.setState(Const.RAW_GLASS_STATE_IN);
                    rawGlassStorageDetailsService.save(targetDetails);
@@ -200,7 +207,7 @@

        }
        List<ReadWriteEntity> list = new ArrayList<>();
        list.add(generateReadWriteEntity("A01-CC.dev.confirmationWord", 1));
        list.add(generateReadWriteEntity("PLC.CC.confirmation", 1));
        miloService.writeToOpcWord(list);
    }

@@ -259,10 +266,10 @@
        rawGlassStorageDetailsService.generateTask(startSlot, lefting, startSlot, rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_OUT);

//        List<ReadWriteEntity> list = new ArrayList<>();
//        list.add(generateReadWriteEntity("A01-CC.dev.taskWord", 1));
//        list.add(generateReadWriteEntity("A01-CC.dev.taskSending", 1));
//        list.add(generateReadWriteEntity("A01-CC.dev.startSlot", startSlot));
//        list.add(generateReadWriteEntity("A01-CC.dev.endSlot", lefting));
//        list.add(generateReadWriteEntity("PLC.CC.taskWord", 1));
//        list.add(generateReadWriteEntity("PLC.CC.taskSending", 1));
//        list.add(generateReadWriteEntity("PLC.CC.startSlot", startSlot));
//        list.add(generateReadWriteEntity("PLC.CC.endSlot", lefting));
//        miloService.writeToOpcWord(list);

        //修改出片任务状态
@@ -293,10 +300,10 @@
        rawGlassStorageDetailsService.generateTask(details.getSlot(), details.getShelf(), details.getShelf(),
                details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_IN);
//        List<ReadWriteEntity> list = new ArrayList<>();
//        list.add(generateReadWriteEntity("A01-CC.dev.taskWord", 1));
//        list.add(generateReadWriteEntity("A01-CC.dev.taskSending", 1));
//        list.add(generateReadWriteEntity("A01-CC.dev.startSlot", details.getSlot()));
//        list.add(generateReadWriteEntity("A01-CC.dev.endSlot", details.getShelf()));
//        list.add(generateReadWriteEntity("PLC.CC.taskWord", 1));
//        list.add(generateReadWriteEntity("PLC.CC.taskSending", 1));
//        list.add(generateReadWriteEntity("PLC.CC.startSlot", details.getSlot()));
//        list.add(generateReadWriteEntity("PLC.CC.endSlot", details.getShelf()));
//        miloService.writeToOpcWord(list);
        //生成工位任务，将吊装位的玻璃状态改位进笼中
        //修改吊装位的原片状态为103 出片中
@@ -327,14 +334,48 @@
        List<UpPattenUsageVO> usageVOS = upListMap.get("1");
        //获取当前上片位1号架子信息
        List<Integer> loadStation = LOAD_GLASS_ONE_DEVICE.equals(stationCell) ? LOAD_STATION_01 : LOAD_STATION_02;
        List<RawGlassStorageStation> stations = rawGlassStorageStationService.list(new LambdaQueryWrapper<RawGlassStorageStation>()
                .in(RawGlassStorageStation::getSlot, loadStation)
                .eq(RawGlassStorageStation::getEnableState, Const.SLOT_ON).orderByAsc(RawGlassStorageStation::getSlot));
        if (CollectionUtils.isEmpty(stations)) {
            log.info("没有可用的上片位");
            return Boolean.FALSE;
        }


        List<RawGlassStorageDetails> loadStationList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
                .inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1")
                .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
                .eq(RawGlassStorageDetails::getDeviceId, stationCell));
        if (stations.size() == 1) {
            if (CollectionUtils.isEmpty(loadStationList)) {
                RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
                rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), stations.get(0).getSlot(), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
                //结束调度任务 修改工位状态(起始位）状态为103 RAW_GLASS_STATE_RUNNING 任务完成后将状态改为101  目标位新增一条数据，架子号为（起始位）
                rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
                        .eq(RawGlassStorageDetails::getSlot, rawDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
                        .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
                return Boolean.TRUE;
            }
            RawGlassStorageDetails oneLoadStation = loadStationList.get(0);
            if (oneLoadStation.getRemainQuantity() <= 0 || !compareRawSize(usageVOS.get(0), oneLoadStation)) {
                rawGlassStorageDetailsService.generateTask(stations.get(0).getSlot(), oneLoadStation.getShelf(), oneLoadStation.getShelf(), oneLoadStation.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
                rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
                        .eq(RawGlassStorageDetails::getSlot, oneLoadStation.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
                        .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
                return Boolean.FALSE;
            }
        }

        log.info("获取{}上片线的工位信息{}", stationCell, loadStationList);
        if (CollectionUtils.isEmpty(loadStationList)) {
            log.info("1号上片位生成调度任务");
            RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
            rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), loadStation.get(0), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
            //结束调度任务 修改工位状态(起始位）状态为103 RAW_GLASS_STATE_RUNNING 任务完成后将状态改为101  目标位新增一条数据，架子号为（起始位）
            rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
                    .eq(RawGlassStorageDetails::getSlot, rawDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
                    .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
            return Boolean.TRUE;
        }
        RawGlassStorageDetails oneLoadStation = loadStationList.stream().filter(e -> e.getSlot().equals(loadStation.get(0))).findFirst().orElse(null);
@@ -389,11 +430,15 @@
                            rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());

                        }
                        if (null == rawDetails) {
                            log.info("原片仓储没有相同尺寸的玻璃");
                            return Boolean.FALSE;
                        }
                        rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), loadStation.get(1), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
                        //结束调度任务 修改工位状态(起始位）状态为103 RAW_GLASS_STATE_RUNNING 任务完成后将状态改为101  目标位新增一条数据，架子号为（起始位）
                        rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
                                .eq(RawGlassStorageDetails::getSlot, rawDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
                                .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
                                .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
                        return Boolean.TRUE;
                    } else {
                        //todo:当二号为的尺寸大于0时，是否执行调度任务，更换当前原片的尺寸，等待下一次任务的直接执行；还是继续等待，当尺寸不一样，等待一号工位的进出库调度任务。
@@ -417,7 +462,7 @@
                                //结束调度任务 修改工位状态(起始位）状态为103 RAW_GLASS_STATE_RUNNING 任务完成后将状态改为101  目标位新增一条数据，架子号为（起始位）
                                rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
                                        .eq(RawGlassStorageDetails::getSlot, loadStation.get(1)).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
                                        .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
                                        .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
                                return Boolean.TRUE;
                            }
                        } else {
@@ -426,7 +471,7 @@
                            //结束调度任务 修改工位状态(起始位）状态为103 RAW_GLASS_STATE_RUNNING 任务完成后将状态改为101  目标位新增一条数据，架子号为（起始位）
                            rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
                                    .eq(RawGlassStorageDetails::getSlot, loadStation.get(1)).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
                                    .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
                                    .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
                            return Boolean.TRUE;
                        }
                    }
@@ -436,7 +481,7 @@
                    rawGlassStorageDetailsService.generateTask(loadStation.get(0), oneLoadStation.getShelf(), oneLoadStation.getShelf(), oneLoadStation.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
                    rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
                            .eq(RawGlassStorageDetails::getSlot, loadStation.get(0)).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
                            .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
                            .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
                    return Boolean.TRUE;
                }
            } else {
@@ -444,16 +489,17 @@
                rawGlassStorageDetailsService.generateTask(loadStation.get(0), oneLoadStation.getSlot(), oneLoadStation.getShelf(), oneLoadStation.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
                rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
                        .eq(RawGlassStorageDetails::getSlot, loadStation.get(0)).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
                        .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
                        .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
                return Boolean.TRUE;
            }
        }
    }

    private RawGlassStorageDetails generateDetails(RawGlassStorageDetails details, Integer targetSlot) {

        RawGlassStorageDetails targetDetails = new RawGlassStorageDetails();
//        details.setDeviceId();
        RawGlassStorageStation station = rawGlassStorageStationService.getOne(new LambdaQueryWrapper<RawGlassStorageStation>()
                .eq(RawGlassStorageStation::getSlot, targetSlot));
        targetDetails.setDeviceId(station.getDeviceId());
        targetDetails.setSlot(targetSlot);
        targetDetails.setShelf(details.getShelf());
        targetDetails.setPatternWidth(details.getPatternWidth());
@@ -480,6 +526,7 @@
                .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
                .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
                .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
                .eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
                .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
                .last("order by abs(t.remain_quantity - " + remainQuantity + ")  asc")
                .last("limit 1"));

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@
      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
      datasource:
        hangzhoumes:
          url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8
          url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8&allowMultiQueries=true
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
@@ -14,6 +14,9 @@
          username: sa
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
      druid:
        wall:
          multi-statement-allow: true
  cloud:
    nacos:
      discovery:

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java

@@ -95,6 +95,10 @@
        }
        //任务暂停
        LoadGlassDeviceTask task = loadGlassDeviceTaskService.queryTaskMessage(tableName);
        if (0 == task.getInkageState()) {
            log.info("{}上片线，处于离线状态：{}，结束本地上片请求", deviceId, task.getInkageState());
            return;
        }
        if (task.getTaskRunning().equals(Const.ENGINEERING_RUNNING)) {
            log.info("{}上片线，有正在执行的任务，结束本地上片请求", deviceId);
            return;
@@ -177,11 +181,12 @@
                .setSql("remain_quantity = remain_quantity - " + (finishCount + damageCount)));
        //更新工程下的原片数量 todo:sql待优化

        List<Integer> ids = upPattenUsageMapper.queryFinishByEngineering(deviceId, finishCount);
        upPattenUsageMapper.update(null, new LambdaUpdateWrapper<UpPattenUsage>()
                .in(UpPattenUsage::getId, ids)
                .set(UpPattenUsage::getState, Const.LOAD_RAW_GLASS_SUCCESS));

        if (finishCount > 0) {
            List<Integer> ids = upPattenUsageMapper.queryFinishByEngineering(deviceId, finishCount);
            upPattenUsageMapper.update(null, new LambdaUpdateWrapper<UpPattenUsage>()
                    .in(UpPattenUsage::getId, ids)
                    .set(UpPattenUsage::getState, Const.LOAD_RAW_GLASS_SUCCESS));
        }
        //todo:任务表数据情况
        task.setTaskRunning(0);
        task.setTotalCount(0);

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@
      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
      datasource:
        hangzhoumes:
          url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
          url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8&allowMultiQueries=true
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/mapper/LoadGlassDeviceTaskMapper.xml

@@ -8,6 +8,7 @@
        <result column="raw_glass_height" property="rawGlassHeight"/>
        <result column="slot" property="slot"/>
        <result column="task_state" property="taskState"/>
        <result column="inkage_state" property="inkageState"/>
        <result column="create_time" property="createTime"/>
        <result column="update_time" property="updateTime"/>
        <result column="total_count" property="totalCount"/>

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql

@@ -9,17 +9,14 @@
    glass_id_in  varchar(20)        DEFAULT NULL COMMENT '进片玻璃id',
    glass_id_out varchar(20)        DEFAULT NULL COMMENT '出片玻璃id',
    glass_id     varchar(20)        DEFAULT NULL COMMENT '磨边前玻璃id',
    in_place     int                DEFAULT 0 COMMENT '就位信号',
    current_cell int                DEFAULT '0' COMMENT '当前层号',
    start_cell   int                DEFAULT '0' COMMENT '层号',
    end_cell     int                DEFAULT NULL COMMENT '预留层号',
    task_state   int                DEFAULT NULL COMMENT '任务状态 0默认空任务 1执行中 2结束任务',
    task_type    int                DEFAULT NULL COMMENT '任务类型',
    create_time  timestamp NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
    update_time  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
    width        int                DEFAULT NULL COMMENT '宽',
    height       int                DEFAULT NULL COMMENT '高',
    thickness    int                DEFAULT NULL COMMENT '厚',
    film_remove  int                DEFAULT NULL COMMENT '是否除膜'
    update_time  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
);
-- rollback DROP TABLE edg_storage_device_one_task;

@@ -27,9 +24,10 @@
-- changeset zsh:20241107002
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM edg_storage_device_one_task;
INSERT INTO edg_storage_device_one_task (task_running, glass_id, glass_id_in, glass_id_out, current_cell, start_cell,
                                         end_cell, task_state, task_type, width, height, thickness, film_remove)
VALUES (0, NULL, NULL, NULL, 1, 0, NULL, 0, NULL, 0, 0, 0, 0);
INSERT INTO edg_storage_device_one_task (task_running, glass_id, in_place, glass_id_in, glass_id_out, current_cell,
                                         start_cell,
                                         end_cell, task_state, task_type)
VALUES (0, NULL, 0, NULL, NULL, 1, 0, NULL, 0, NULL, 0, 0, 0, 0);


-- changeset zsh:20241107003
@@ -41,26 +39,24 @@
    glass_id_in  varchar(20)        DEFAULT NULL COMMENT '进片玻璃id',
    glass_id_out varchar(20)        DEFAULT NULL COMMENT '出片玻璃id',
    glass_id     varchar(20)        DEFAULT NULL COMMENT '磨边前玻璃id',
    in_place     int                DEFAULT 0 COMMENT '就位信号',
    current_cell int                DEFAULT '0' COMMENT '当前层号',
    start_cell   int                DEFAULT '0' COMMENT '层号',
    end_cell     int                DEFAULT NULL COMMENT '预留层号',
    task_state   int                DEFAULT NULL COMMENT '任务状态 0默认空任务 1执行中 2结束任务',
    task_type    int                DEFAULT NULL COMMENT '任务类型',
    create_time  timestamp NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
    update_time  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
    width        int                DEFAULT NULL COMMENT '宽',
    height       int                DEFAULT NULL COMMENT '高',
    thickness    int                DEFAULT NULL COMMENT '厚',
    film_remove  int                DEFAULT NULL COMMENT '是否除膜'
    update_time  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
);
-- rollback DROP TABLE edg_storage_device_two_task;

-- changeset zsh:20241107004
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM edg_storage_device_two_task;
INSERT INTO edg_storage_device_two_task (task_running, glass_id, glass_id_in, glass_id_out, current_cell, start_cell,
                                         end_cell, task_state, task_type, width, height, thickness, film_remove)
VALUES (0, NULL, NULL, NULL, 1, 0, NULL, 0, NULL, 0, 0, 0, 0);
INSERT INTO edg_storage_device_two_task (task_running, glass_id, in_place, glass_id_in, glass_id_out, current_cell,
                                         start_cell,
                                         end_cell, task_state, task_type)
VALUES (0, NULL, 0, NULL, NULL, 1, 0, NULL, 0, NULL, 0, 0, 0, 0);



@@ -72,6 +68,8 @@
    id           bigint    NOT NULL AUTO_INCREMENT COMMENT '工程表id',
    glass_id_in  varchar(20)        DEFAULT NULL COMMENT '进片玻璃id',
    glass_id_out varchar(20)        DEFAULT NULL COMMENT '出片玻璃id',
    glass_id     varchar(20)        DEFAULT NULL COMMENT '磨边前玻璃id',
    in_place     int                DEFAULT 0 COMMENT '就位信号',
    current_cell int                DEFAULT '0' COMMENT '当前层号',
    start_cell   int                DEFAULT '0' COMMENT '层号',
    end_cell     int                DEFAULT NULL COMMENT '预留层号',
@@ -108,6 +106,7 @@
    raw_glass_width  int                DEFAULT '0' COMMENT '原片宽',
    raw_glass_height int                DEFAULT '0' COMMENT '原片高',
    slot             int                DEFAULT '0' COMMENT '上片位编号',
    inkage_state     int                DEFAULT '0' COMMENT '联机状态',
    task_state       int                DEFAULT NULL COMMENT '任务状态 0默认空任务 1执行中 2结束任务',
    create_time      timestamp NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
    update_time      timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
@@ -120,9 +119,9 @@
-- changeset zsh:20241107008
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM load_glass_device_one_task;
INSERT INTO load_glass_device_one_task (task_running, raw_glass_width, raw_glass_height, slot, task_state, total_count,
                                        finish_count, damage_count)
VALUES (0, 0, 0, 0, 0, 0, 0, 0);
INSERT INTO load_glass_device_one_task (task_running, raw_glass_width, raw_glass_height, slot, inkage_state, task_state,
                                        total_count, finish_count, damage_count)
VALUES (0, 0, 0, 0, 0, 0, 0, 0, 0);

-- changeset zsh:20241107009
-- preconditions onFail:CONTINUE onError:CONTINUE
@@ -133,6 +132,7 @@
    raw_glass_width  int                DEFAULT '0' COMMENT '原片宽',
    raw_glass_height int                DEFAULT '0' COMMENT '原片高',
    slot             int                DEFAULT '0' COMMENT '上片位编号',
    inkage_state     int                DEFAULT '0' COMMENT '联机状态',
    task_state       int                DEFAULT NULL COMMENT '任务状态 0默认空任务 1执行中 2结束任务',
    create_time      timestamp NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
    update_time      timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
@@ -145,9 +145,9 @@
-- changeset zsh:20241107010
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM load_glass_device_two_task;
INSERT INTO load_glass_device_two_task (task_running, raw_glass_width, raw_glass_height, slot, task_state, total_count,
                                        finish_count, damage_count)
VALUES (0, 0, 0, 0, 0, 0, 0, 0);
INSERT INTO load_glass_device_two_task (task_running, raw_glass_width, raw_glass_height, slot, inkage_state, task_state,
                                        total_count, finish_count, damage_count)
VALUES (0, 0, 0, 0, 0, 0, 0, 0, 0);


-- changeset zsh:20241107011
@@ -161,6 +161,7 @@
    raw_glass_height int                DEFAULT '0' COMMENT '原片高',
    station          int                DEFAULT '0' COMMENT '上片设备编号',
    slot             int                DEFAULT '0' COMMENT '上片位编号',
    inkage_state     int                DEFAULT '0' COMMENT '联机状态',
    task_state       int                DEFAULT NULL COMMENT '任务状态 0默认空任务 1执行中 2结束任务',
    create_time      timestamp NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
    update_time      timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',