添加引入，修改S7类short为int

ZengTao

2025-06-10 982bc1e3eb588021b2f73dfb04bfc78beb462db7

添加引入，修改S7类short为int

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java

@@ -9,6 +9,7 @@
import com.mes.bigstoragecagetask.entity.BigStorageCageHistoryTask;
import com.mes.bigstoragecagetask.entity.request.BigStorageCageHistoryRequest;
import com.mes.bigstoragecagetask.mapper.BigStorageCageHistoryTaskMapper;
import com.mes.bigstoragecagetask.service.BigStorageCageHistoryTaskService;
import com.mes.largenscreen.entity.DailyProductionVO;
import com.mes.largenscreen.entity.RunTime;
import com.mes.tools.DateUtil;

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

@@ -134,10 +134,10 @@
            return;
        }
        //任务暂停
        S7DataSP task=new S7DataSP();
        if(LOAD_GLASS_ONE_DEVICE.equals(deviceId)){
        S7DataSP task = new S7DataSP();
        if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
            s7SerializerSPOne.read(S7DataSP.class);
        }else{
        } else {
            s7SerializerSPTwo.read(S7DataSP.class);
        }
//        LoadGlassDeviceTask task = loadGlassDeviceTaskService.queryTaskMessage(tableName);
@@ -183,18 +183,18 @@
            }
            int number = Math.min(twoLoadStation.getRemainQuantity(), usageVOS.size());
            //生成上片任务
            task.setTotalCount((short)number);
            task.setTotalCount(number);
            task.setTaskRunning(Boolean.TRUE);
            task.setRawGlassWidth((short) usageVOS.get(0).getWidth());
            task.setRawGlassHeight((short) usageVOS.get(0).getHeight());
            task.setSlot(loadStation.get(1).shortValue());
            task.setRawGlassWidth((int) usageVOS.get(0).getWidth());
            task.setRawGlassHeight((int) usageVOS.get(0).getHeight());
            task.setSlot(loadStation.get(1));
//            loadGlassDeviceTaskService.updateTaskMessage(tableName, task);
            S7DataSP s7DataSPWrite = new S7DataSP();
            s7DataSPWrite.setTotalCount((short) number);
            s7DataSPWrite.setTotalCount(number);
            s7DataSPWrite.setTaskRunning(Boolean.TRUE);
            s7DataSPWrite.setRawGlassWidth((short) usageVOS.get(0).getWidth());
            s7DataSPWrite.setRawGlassHeight((short) usageVOS.get(0).getHeight());
            s7DataSPWrite.setSlot(loadStation.get(1).shortValue());
            s7DataSPWrite.setRawGlassWidth((int) usageVOS.get(0).getWidth());
            s7DataSPWrite.setRawGlassHeight((int) usageVOS.get(0).getHeight());
            s7DataSPWrite.setSlot(loadStation.get(1));
            if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
                s7SerializerSPOne.write(s7DataSPWrite);
            } else {
@@ -210,18 +210,18 @@
        }
        //生成上片任务
        int number = Math.min(oneLoadStation.getRemainQuantity(), usageVOS.size());
        task.setTotalCount((short)number);
        task.setTotalCount(number);
        task.setTaskRunning(Boolean.TRUE);
        task.setRawGlassWidth((short) usageVOS.get(0).getWidth());
        task.setRawGlassHeight((short) usageVOS.get(0).getHeight());
        task.setSlot(loadStation.get(0).shortValue());
        task.setRawGlassWidth((int) usageVOS.get(0).getWidth());
        task.setRawGlassHeight((int) usageVOS.get(0).getHeight());
        task.setSlot(loadStation.get(0));
//        loadGlassDeviceTaskService.updateTaskMessage(tableName, task);
        S7DataSP s7DataSPWrite = new S7DataSP();
        s7DataSPWrite.setTotalCount((short) number);
        s7DataSPWrite.setTotalCount(number);
        s7DataSPWrite.setTaskRunning(Boolean.TRUE);
        s7DataSPWrite.setRawGlassWidth((short) usageVOS.get(0).getWidth());
        s7DataSPWrite.setRawGlassHeight((short) usageVOS.get(0).getHeight());
        s7DataSPWrite.setSlot(loadStation.get(0).shortValue());
        s7DataSPWrite.setRawGlassWidth((int) usageVOS.get(0).getWidth());
        s7DataSPWrite.setRawGlassHeight((int) usageVOS.get(0).getHeight());
        s7DataSPWrite.setSlot(loadStation.get(0));
        if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
            s7SerializerSPOne.write(s7DataSPWrite);
        } else {
@@ -280,10 +280,10 @@
//        loadGlassDeviceTaskService.updateTaskMessage(tableName, task);
        S7DataSP s7DataSPWrite = new S7DataSP();
        s7DataSPWrite.setTaskRunning(Boolean.FALSE);
        s7DataSPWrite.setTotalCount((short) 0);
        s7DataSPWrite.setRawGlassWidth((short) 0);
        s7DataSPWrite.setRawGlassHeight((short) 0);
        s7DataSPWrite.setSlot((short) 0);
        s7DataSPWrite.setTotalCount(0);
        s7DataSPWrite.setRawGlassWidth(0);
        s7DataSPWrite.setRawGlassHeight(0);
        s7DataSPWrite.setSlot(0);
        if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
            s7SerializerSPOne.write(s7DataSPWrite);
        } else {

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java

@@ -13,32 +13,32 @@
public class S7DataSP {


    @S7Variable(address = "DB19.14", type = EDataType.INT16)
    private Short taskState;
    @S7Variable(address = "DB19.14", type = EDataType.UINT16)
    private Integer taskState;

    @S7Variable(address = "DB19.18", type = EDataType.INT16)
    private Short damageCount;
    @S7Variable(address = "DB19.18", type = EDataType.UINT16)
    private Integer damageCount;

    @S7Variable(address = "DB19.20", type = EDataType.INT16)
    private Short rawGlassWidth;
    @S7Variable(address = "DB19.20", type = EDataType.UINT16)
    private Integer rawGlassWidth;

    @S7Variable(address = "DB19.22", type = EDataType.INT16)
    private Short rawGlassHeight;
    @S7Variable(address = "DB19.22", type = EDataType.UINT16)
    private Integer rawGlassHeight;

    @S7Variable(address = "DB19.24", type = EDataType.INT16)
    private Short slot;
    @S7Variable(address = "DB19.24", type = EDataType.UINT16)
    private Integer slot;

    @S7Variable(address = "DB19.26", type = EDataType.INT16)
    private Short totalCount;
    @S7Variable(address = "DB19.26", type = EDataType.UINT16)
    private Integer totalCount;

    @S7Variable(address = "DB19.28", type = EDataType.INT16)
    private Short finishCount;
    @S7Variable(address = "DB19.28", type = EDataType.UINT16)
    private Integer finishCount;

    @S7Variable(address = "DB19.16.0", type = EDataType.BOOL)
    private Boolean taskRunning;

    @S7Variable(address = "DB19.30", type = EDataType.INT16)
    private Short inkageState;
    @S7Variable(address = "DB19.30", type = EDataType.UINT16)
    private Integer inkageState;


}