ZengTao
2024-08-13 c2b1f33ad95f77d676eb8de187875ad1d9aed61d
修改磨边队列调用接口的参数
2个文件已修改
36 ■■■■ 已修改文件
UI-Project/src/views/StockBasicData/stockBasicData.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -83,10 +83,10 @@
    if (confirmResult === 'confirm') {  
      // 用户点击了“是”,现在调用删除接口  
      const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
        glassId: row.glass_id,
        controlsId: 8,
        line: 2001,
        machine: '冷加工',
        glassId: row.glassId,
        state: 8,
        line: row.line,
        workingProcedure: '冷加工',
    })
    if (response.code === 200) {
      ElMessage.success(response.message);
@@ -116,10 +116,10 @@
    if (confirmResult === 'confirm') {  
      // 用户点击了“是”,现在调用删除接口  
      const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
        glassId: row.glass_id,
        controlsId: 9,
        line: 2001,
        machine: '冷加工',
        glassId: row.glassId,
        state: 9,
        line: row.line,
        workingProcedure: '冷加工',
    })
    if (response.code === 200) {
      ElMessage.success(response.message);
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -350,15 +350,15 @@
                    }
                }
            }
            //向plc写入确认字
            int returnData = 0;
            int count = 1;
            while (returnData == 0) {
                log.info("已向plc第{}次送协议", count);
                S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
                returnData = S7object.getinstance().plccontrol.readWord(mesToPLCAddress, 1).get(0);
                log.info("已向plc第{}次发送出片任务确认,地址为:{},写入的内容为{}", count++, mesToPLCAddress, returnData);
            }
//            //向plc写入确认字
//            int returnData = 0;
//            int count = 1;
//            while (returnData == 0) {
//                log.info("已向plc第{}次送协议", count);
//                S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
//                returnData = S7object.getinstance().plccontrol.readWord(mesToPLCAddress, 1).get(0);
//                log.info("已向plc第{}次发送出片任务确认,地址为:{},写入的内容为{}", count++, mesToPLCAddress, returnData);
//            }
            Date endDate = new Date();
            log.info("大理片笼出片任务结束时间:{},共耗时:{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
            return;
@@ -713,7 +713,7 @@
        while (returnData == 0) {
            s7control.writeWord(outLine, 2);
            returnData = s7control.readWord(outLine, 1).get(0);
            log.info("已向plc第{}次发送出片任务确认,地址为:{},写入的内容为{}", count++, outLine, returnData);
            log.info("已向plc第{}次发送送片任务确认,地址为:{},写入的内容为{}", count++, outLine, returnData);
        }
    }