UI-Project/src/views/Caching/cachingun.vue
@@ -10,7 +10,7 @@ <el-table-column prop="width" align="center" :label="$t('sorter.width')" min-width="120" /> <el-table-column prop="height" align="center" :label="$t('sorter.height')" min-width="120" /> <el-table-column align="center" align="center" :label="$t('sorter.startstatus')" min-width="80" prop="enable_state" @@ -194,7 +194,7 @@ const toggleEnableState = async (row) => { const newState = row.enable_state === 1 ? 0 : 1; // 发送请求到后端更新状态（这里省略了实际的请求逻辑） const response = await request.post('/unLoadGlass/downStorage/updateDownStorageCage', { id: row.id, enablestate: newState }); const response = await request.post('/unLoadGlass/downStorage/updateDownStorageCage', { id: row.id, enableState: newState }); if (response.code === 200) { ElMessage.success(response.message); } else { @@ -202,6 +202,9 @@ } row.enable_state = newState; }; const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass`; // 定义消息处理函数，更新 receivedData 变量 const handleMessage = (data) => { UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -195,8 +195,8 @@ const response = await request.post('unLoadGlass/downWorkStation/updateDownWorkstation', { enableState: 1 - row.enableState enableState:row.enableState, id:row.id }); console.log('Updated row status:', response.data); // 可以根据后端返回的数据进行进一步处理，比如更新本地状态等 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -7,6 +7,7 @@ import com.github.yulichang.query.MPJLambdaQueryWrapper; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.mes.common.config.Const; import com.mes.edgstoragecage.entity.EdgStorageCage; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper; @@ -109,7 +110,8 @@ for (Map<String, Object> cutTerritory : cutTerritorys) { EdgStorageCageDetails edgStorageCageDetails=baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>() .selectAll(EdgStorageCageDetails.class) .eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id"))); .eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id")) .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)); // log.info("内容：{}-------{}",cutTerritory,edgStorageCageDetails); if(edgStorageCageDetails!=null){ cutTerritory.put("glass_state",edgStorageCageDetails.getState()); hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -152,11 +152,20 @@ @Override public boolean updateDownStorageCage(DownStorageCage downStorageCage) { DownStorageCage downItem = baseMapper.selectById(downStorageCage.getId()); downItem.setEnableState(downStorageCage.getEnableState()); baseMapper.updateById(downItem); return true; if (downItem != null) { downItem.setEnableState(downStorageCage.getEnableState()); int rowsAffected = baseMapper.updateById(downItem); if (rowsAffected > 0) { return true; } else { return false; } } else { return false; } } /** * 修改理片笼信息 功能：对笼内栅格玻璃 【添加/删除/更换】 * hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -10,7 +10,6 @@ import com.mes.downglassinfo.mapper.DownGlassInfoMapper; import com.mes.downglassinfo.service.DownGlassInfoService; import com.mes.downglassinfo.service.DownGlassTaskService; import com.mes.downstorage.entity.DownStorageCage; import com.mes.downworkstation.entity.DownWorkstation; import com.mes.downworkstation.entity.DownWorkstationTask; import com.mes.downworkstation.entity.DownWorkstionAndDownGlassinfo; @@ -35,7 +34,7 @@ @Autowired private DownWorkstationMapper downWorkstationMapper; @Autowired(required=false) @Autowired(required = false) private DownWorkstationTaskMapper downWorkstationTaskMapper; @Autowired private DownGlassInfoService downGlassInfoService; @@ -68,7 +67,7 @@ //工位显示 @Override public List<Map<String, Object>> getTotalGlassDimensionsByWorkstation(int start,int end) { public List<Map<String, Object>> getTotalGlassDimensionsByWorkstation(int start, int end) { MPJQueryWrapper<DownWorkstation> queryWrapper = new MPJQueryWrapper<>(); queryWrapper.select("t.workstation_id", "t.flow_card_id", "COALESCE(SUM(b.width), 0) AS totalwidth", "COALESCE(SUM(b.height), 0) AS totalheight") .leftJoin("down_glass_info b on t.flow_card_id = b.flow_card_id") @@ -77,8 +76,8 @@ ; List<DownWorkstionAndDownGlassinfo> workstationList = downWorkstationMapper.selectJoinList(DownWorkstionAndDownGlassinfo.class, queryWrapper); // List<DownWorkstionAndDownGlassinfo> workstationList = null; List<DownWorkstionAndDownGlassinfo> workstationList = downWorkstationMapper.selectJoinList(DownWorkstionAndDownGlassinfo.class, queryWrapper); // List<DownWorkstionAndDownGlassinfo> workstationList = null; List<Map<String, Object>> result = new ArrayList<>(); for (DownWorkstionAndDownGlassinfo downWorkstionAndDownGlassinfo : workstationList) { Map<String, Object> rack = new HashMap<>(); @@ -95,7 +94,7 @@ List<DownGlassInfo> downGlassInfoList = downGlassInfoMapper.selectList(glassInfoQueryWrapper); if (!downGlassInfoList.isEmpty()) { if (!downGlassInfoList.isEmpty()) { item.put("downGlassInfoList", downGlassInfoList); @@ -104,7 +103,7 @@ rack.put("item", item); result.add(rack); } log.info("result"+(result)); log.info("result" + (result)); return result; // 返回最终结果 } @@ -142,13 +141,13 @@ @Override public void updateFlowCardIdAndCount(String flowCardId, int workstationId,int layer) { int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId,layer); public void updateFlowCardIdAndCount(String flowCardId, int workstationId, int layer) { int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId, layer); QueryWrapper<Damage> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("process_id", flowCardId); queryWrapper.eq("technology_number", layer); int otherNumber=damageservice.count(queryWrapper); int otherNumber = damageservice.count(queryWrapper); UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>(); updateWrapper.set("total_quantity", glassInfoCount) .set("flow_card_id", flowCardId) @@ -170,9 +169,6 @@ baseMapper.update(new DownWorkstation(), updateWrapper); } @Override @@ -197,10 +193,21 @@ @Override public boolean updateDownWorkstationstate(DownWorkstation downWorkstation) { DownWorkstation downWork = baseMapper.selectById(downWorkstation.getId()); downWork.setEnableState(downWorkstation.getEnableState()); baseMapper.updateById(downWork); return true; if (downWork != null) { downWork.setEnableState(downWorkstation.getEnableState()); baseMapper.updateById(downWork); return true; } else { return false; } } } hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -12,6 +12,7 @@ import com.mes.downstorage.service.impl.DownStorageCageDetailsServiceImpl; import com.mes.downstorage.service.impl.DownStorageCageServiceImpl; import com.mes.downworkstation.entity.DownWorkstation; import com.mes.downworkstation.service.DownWorkstationService; import com.mes.downworkstation.service.impl.DownWorkstationServiceImpl; import com.mes.glassinfo.service.impl.GlassInfoServiceImpl; @@ -190,6 +191,28 @@ //downGlassTaskService.getUnloadingTaskState(); } @Test public void updateDownWorkstationstate() { DownWorkstation downWorkstation= new DownWorkstation(); downWorkstation.setId(1); downWorkstation.setEnableState(0); downWorkstationServiceImpl.updateDownWorkstationstate(downWorkstation); } @Test public void updateDownstate() { DownStorageCage downStorageCage= new DownStorageCage(); downStorageCage.setId(1); downStorageCage.setEnableState(0); downStorageCageServiceImpl.updateDownStorageCage(downStorageCage); } /* @Test public void updateDownStorageCage() {
