wuyouming666
2024-05-09 6fc113e0fd5e792350e286ad24a83bcd8d4b4b3b
更新界面显示问题
8个文件已修改
100 ■■■■■ 已修改文件
UI-Project/config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/config.js
@@ -1,5 +1,5 @@
export default {
 serverUrl: "127.0.0.1:88/api",
 serverUrl: "10.153.19.150:88/api",
  serverUrl2: "10.153.19.150:88"
  //serverUrl:"res.abeim.cn"
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -100,7 +100,8 @@
    const response = await request.get('unLoadGlass/downWorkStation/getflowCardId');
    console.log(response)
    if (response.code === 200) {
      flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flow_card_id }));
      flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flow_card_Id }));
      console.log(flowCardOptions.value)
    } else {
      ElMessage.error(response.msg);
    }
@@ -198,7 +199,7 @@
initWebSocket();
// initWebSocket();
onMounted(fetchTableData);
// setInterval(fetchTableData, 2000)
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
@@ -5,8 +5,7 @@
import org.springframework.data.annotation.Id;
import org.springframework.stereotype.Component;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import java.io.Serializable;
/**
@@ -27,8 +26,7 @@
    /**
     * 下片玻璃信息表id
     */
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    private Long id;
    /**
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
@@ -35,7 +35,7 @@
    @GetMapping("/selectStorageCage")
    @ResponseBody
    public Result selectDownStorageCage () {
        List<Map<String, Object>> list=downStorageCageDetailsService.getCacheInfo();
        List<Map<String, Object>> list=downStorageCageService.selectDownStorageCages();
        return Result.build(200,"成功",list);
    }
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
@@ -55,4 +55,8 @@
     *修改理片笼信息 功能:对笼内栅格玻璃 【添加/删除/更换】
     */
    boolean updateDownStorageCageDetails(int downStorageCageId,DownStorageCageDetails downStorageCageDetails);
    List<Map<String, Object>> selectDownStorageCages();
}
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -238,9 +238,18 @@
    }
    @Override
    public List<Map<String, Object>> selectDownStorageCages() {
        return baseMapper.selectJoinMaps(JoinWrappers.lambda(DownStorageCage.class)
                .selectAll(DownStorageCage.class)
                .selectAs(DownStorageCageDetails::getId, "esdId")
                .select(DownStorageCageDetails::getGlassId, DownStorageCageDetails::getWidth, DownStorageCageDetails::getHeight, DownStorageCageDetails::getId)
                .leftJoin(DownStorageCageDetails.class, on -> on
                        .eq(DownStorageCageDetails::getDeviceId, DownStorageCage::getDeviceId)
                        .eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot))
        );
    }
    /**
     * 修改理片笼信息 功能:对笼内栅格玻璃 【启用/禁用】
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
@@ -4,7 +4,7 @@
  "dataType": "word",
  "parameteInfor": [
    {
      "codeId": "PLC卧式理片任务请求字",
      "codeId": "RequestWord",
      "addressIndex": "0",
      "addressLenght": "2"
    },
@@ -14,57 +14,57 @@
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "4",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "6",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "8",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "10",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "12",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "14",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "16",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "18",
      "addressLenght": "2"
    },
    {
      "codeId": "MES任务发送字",
      "codeId": "MESSendingWord",
      "addressIndex": "20",
      "addressLenght": "2"
    },
    {
      "codeId": "进片格子",
      "codeId": "InputGrid",
      "addressIndex": "22",
      "addressLenght": "2"
    },
    {
      "codeId": "出片格子",
      "codeId": "OutputGrid",
      "addressIndex": "24",
      "addressLenght": "2"
    },
@@ -79,67 +79,67 @@
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "30",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "32",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "34",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "36",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "38",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "40",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "42",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "44",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "46",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "48",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "50",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "52",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "54",
      "addressLenght": "2"
    },
@@ -149,7 +149,7 @@
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "58",
      "addressLenght": "2"
    },
@@ -189,12 +189,12 @@
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "74",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "76",
      "addressLenght": "2"
    },
@@ -234,27 +234,27 @@
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "92",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "94",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "96",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "98",
      "addressLenght": "2"
    },
    {
      "codeId": "备用",
      "codeId": "spare",
      "addressIndex": "100",
      "addressLenght": "2"
    },
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -56,7 +56,7 @@
    @Test
    public void testCacheGlass() {
        List<Map<String, Object>> map = downStorageCageDetailsServiceImpl.getCacheInfo();
        List<Map<String, Object>> map = downStorageCageServiceImpl.selectDownStorageCages();
        log.info("笼内信息:{}", Arrays.asList(map));
    }