ZengTao
2024-04-01 eccfd8d0504c48f07c7e11ed1fc94451ce5e7cb1
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -291,11 +291,11 @@
    }
    // 开始任务
    public Result ClaimTasks(String flowcard, Integer state) {
    public Result ClaimTasks(String flowcard, Integer state, Integer line) {
        if (state == 1) {
            homeMapper.ClaimTasks(flowcard, 0);
            homeMapper.ClaimTasks(flowcard, 0,line);
        } else {
            homeMapper.ClaimTasks(flowcard, 1);
            homeMapper.ClaimTasks(flowcard, 1,line);
        }
        Map<String, Object> map = new HashMap<>();
        map.put("message", "200");
@@ -317,7 +317,7 @@
    // 修改测量信息
    public Result UpdateQueue(GlassInfo glassInfo) {
        homeMapper.UpdateQueue(glassInfo.getFlowcard(), glassInfo.getWidth(), glassInfo.getHeight(),
                glassInfo.getGlasstype());
                glassInfo.getGlasstype(),glassInfo.getThickness());
        Map<String, Object> map = new HashMap<>();
        PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
        S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);