UI-Project/src/views/Identify/identify.vue
@@ -1,10 +1,10 @@ <template> <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading"> <el-scrollbar height="600px"> <el-scrollbar height="600px" > <div id="app" style="margin-top: 20px;"> <div :style="{ width: `${olWidth}px`, height: `${olHeight}px`,position: 'relative' }" > <!-- <div :style="{ width: `${olWidth}px`, height: `${olHeight}px`,position: 'relative',}" > --> <div v-for="(rect, index) in adjustedRects" :key="rect.glass_id" @@ -34,7 +34,7 @@ {{ $t('order.Takeaway') }}</el-button> </el-dialog> </div> </div> <!-- </div> --> </el-scrollbar> </el-card> </template> @@ -64,42 +64,42 @@ currentGlassId.value = glassId; blind.value = true; } onMounted(async () => { try { const response = await request.post('/cacheGlass/taskCache/currentCutTerritory'); // 替换为你的API端点 if (response.code === 200) { // const process_id = response.data[0].process_id const rawRects = response.data; // 设置矩形数据 console.log(response.data); const { olWidth: newolWidth, olHeight: newolHeight, process_id: newprocess_id ,glass_id:newglass_id } = response.data; // 获取尺寸 olWidth.value = newolWidth; // 设置容器宽度 olHeight.value = newolHeight; // 设置容器高度 process_id.value = newprocess_id; glass_id.value = newglass_id; // onMounted(async () => { // try { // const response = await request.post('/cacheGlass/taskCache/currentCutTerritory'); // 替换为你的API端点 // if (response.code === 200) { // // const process_id = response.data[0].process_id // const rawRects = response.data; // 设置矩形数据 // console.log(response.data); // const { olWidth: newolWidth, olHeight: newolHeight, process_id: newprocess_id ,glass_id:newglass_id } = response.data; // 获取尺寸 // olWidth.value = newolWidth; // 设置容器宽度 // olHeight.value = newolHeight; // 设置容器高度 // process_id.value = newprocess_id; // glass_id.value = newglass_id; adjustedRects.value = rawRects.map(rect => ({ ...rect, // 复制原始对象的其他属性 x_axis: (rect.x_axis*100) * 0.003, // 将x值除以3 y_axis: (rect.y_axis*100) * 0.003, width: (rect.width*100) * 0.002 , widtha: rect.width , heighta: rect.height , height:( rect.height*100) * 0.002 , glass_state: rect.glass_state })); console.log(adjustedRects.value); // adjustedRects.value = rawRects.map(rect => ({ // ...rect, // 复制原始对象的其他属性 // x_axis: (rect.x_axis*100) * 0.003, // 将x值除以3 // y_axis: (rect.y_axis*100) * 0.003, // width: (rect.width*100) * 0.002 , // widtha: rect.width , // heighta: rect.height , // height:( rect.height*100) * 0.002 , // glass_state: rect.glass_state // })); // console.log(adjustedRects.value); // console.log( (rect.width*100) / 300 ); } else { // console.error('Failed to fetch rectangles from API.'); console.error('Failed to fetch rects from API.'); } } catch (error) { // console.error('Error fetching rectangles :', error); console.error('Error fetching rects :', error); } }); // // console.log( (rect.width*100) / 300 ); // } else { // // console.error('Failed to fetch rectangles from API.'); // console.error('Failed to fetch rects from API.'); // } // } catch (error) { // // console.error('Error fetching rectangles :', error); // console.error('Error fetching rects :', error); // } // }); // 破损 const handleDamage = async () => { try { @@ -187,7 +187,8 @@ // adjustedRects.value = data.currentCutTerritory[0] adjustedRects.value = data.currentCutTerritory[0].map(rect => ({ ...rect, x_axis: (rect.x_axis*100) * 0.003, x_axis: 1360 -(rect.x_axis + rect.width) * 0.37, // x_axis: (rect.x_axis*100) * 0.003, y_axis: (rect.y_axis*100) * 0.003, width: (rect.width*100) * 0.002 , widtha: rect.width , UI-Project/src/views/Returns/returns.vue
@@ -28,6 +28,8 @@ const filmsId = ref(''); const patternThickness = ref(''); const number = ref(''); const canSelectProject = ref(true); // 假设开始时可以选择项目 const canStartLoading = ref(false); import { WebSocketHost ,host} from '@/utils/constants' import request from "@/utils/request" const ida = ref(null); @@ -195,13 +197,30 @@ const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`; // 定义消息处理函数，更新 receivedData 变量 const handleMessage = (data) => { // 更新 tableData 的数据 if(data.prioritylist!=null){ tableData.splice(0, tableData.length, ...data.prioritylist[0]); } if(data.list!=null){ tableDataa.value = data.list[0] } if(data.engineering ){ if ( Array.isArray(data.engineering) && data.engineering.length !== 0) { canSelectProject.value = false; canStartLoading.value = true; }else{ canSelectProject.value = true; canStartLoading.value = false; } } if (data.InkageStatus) { if(data.InkageStatus!=null){ const status = data.InkageStatus[0]; cuttingMachine.value = status; upstatus.value = status === '1' ? t('basicData.machine') : t('basicData.machineaa'); cuttingMachineStatusColor.value = status === '1' ? 'green' : '#911005'; inKageWord.value = status === '1' ? 0 : 1; } } }; const requestData = { state: 100 @@ -615,47 +634,46 @@ ElMessage.error(t('basicData.glassnull')); } }; const wsUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`; const ws = new WebSocket(wsUrl); ws.onopen = () => { console.log('WebSocket连接已打开'); }; // 上片机联机状态 // const wsUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`; // const ws = new WebSocket(wsUrl); // ws.onopen = () => { // console.log('WebSocket连接已打开'); // }; // 监听WebSocket的错误事件 ws.onerror = (error) => { console.error('WebSocket发生错误:', error); }; // // 监听WebSocket的错误事件 // ws.onerror = (error) => { // console.error('WebSocket发生错误:', error); // }; // 监听WebSocket的关闭事件 ws.onclose = (event) => { if (event.wasClean) { console.log('WebSocket连接已正常关闭'); } else { console.error('WebSocket连接异常关闭'); } }; // 监听WebSocket的消息事件 ws.onmessage = (event) => { try { const data = JSON.parse(event.data.replace('<END>', '')); // 解析消息为JSON if (data && Array.isArray(data.InkageStatus) && data.InkageStatus.length > 0) { if(data.InkageStatus!=null){ const status = data.InkageStatus[0]; cuttingMachine.value = status; upstatus.value = status === '1' ? t('basicData.machine') : t('basicData.machineaa'); cuttingMachineStatusColor.value = status === '1' ? 'green' : '#911005'; inKageWord.value = status === '1' ? 0 : 1; } } else { // 处理错误情况或无效数据 // console.error('接收到的数据无效', data); } } catch (error) { // console.error('解析WebSocket消息时发生错误', error); } }; // // 监听WebSocket的关闭事件 // ws.onclose = (event) => { // if (event.wasClean) { // console.log('WebSocket连接已正常关闭'); // } else { // console.error('WebSocket连接异常关闭'); // } // }; // // 监听WebSocket的消息事件 // ws.onmessage = (event) => { // try { // const data = JSON.parse(event.data.replace('<END>', '')); // 解析消息为JSON // if (data && Array.isArray(data.InkageStatus) && data.InkageStatus.length > 0) { // if(data.InkageStatus!=null){ // const status = data.InkageStatus[0]; // cuttingMachine.value = status; // upstatus.value = status === '1' ? t('basicData.machine') : t('basicData.machineaa'); // cuttingMachineStatusColor.value = status === '1' ? 'green' : '#911005'; // inKageWord.value = status === '1' ? 0 : 1; // } // } else { // // 处理错误情况或无效数据 // // console.error('接收到的数据无效', data); // } // } catch (error) { // // console.error('解析WebSocket消息时发生错误', error); // } // }; const confirmCutting = async () => { try { const response = await request.post('/loadGlass/LoadGlass/updateMesInkageLoad', @@ -691,8 +709,8 @@ <el-button @click="confirmCutting" style="margin-left: 30px;margin-top: -3px;" >{{ $t('basicData.change') }}</el-button> </div> <el-button style="margin-top: 5px;margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisible = true">{{ $t('basicData.selectproject') }}</el-button> <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="primary" @click="handleBind">{{ $t('basicData.startloading') }}</el-button> <el-button :disabled="!canSelectProject" style="margin-top: 5px;margin-left: 15px;" type="primary" @click="dialogFormVisible = true">{{ $t('basicData.selectproject') }}</el-button> <el-button :style="{ backgroundColor: canStartLoading ? 'green' : 'initial',color: canStartLoading ? 'white' : 'black', }" style="margin-top: 5px;margin-left: 20px;" @click="handleBind">{{ $t('basicData.startloading') }}</el-button> <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button> <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button> <!-- <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handleBindb">停止任务</el-button> --> hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -43,13 +43,9 @@ @ApiOperation("报工") @PostMapping("/submitDamage") public Result submitDamage(@RequestBody Map map) { String startTime=map.get("startTime").toString(); String endTime=map.get("endTime").toString(); int type =Integer.parseInt(map.get("type").toString()); int status =Integer.parseInt(map.get("status").toString()); String workingProcedure =map.get("workingProcedure").toString(); damageService.submitDamage(startTime,endTime,type,status,workingProcedure); public Result submitDamage(@RequestBody List<Damage> damageList) { damageService.submitDamage(damageList); damageService.updateBatchById(damageList); return Result.build(200,"报工成功",1); }
@@ -19,7 +19,7 @@ List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure); void submitDamage(String startTime, String endTime, int type, int status, String workingProcedure); void submitDamage(List<Damage> damageList); void insertDamage(Damage damage); } hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -19,11 +19,12 @@ import java.time.LocalDateTime; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; /** * <p> * 服务实现类 * 服务实现类 * </p> * * @author wu @@ -41,17 +42,22 @@ * 查询报工信息 */ @Override public List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure){ LambdaQueryWrapper<Damage> damageSelectWrapper =new LambdaQueryWrapper<>(); damageSelectWrapper.between(Damage::getDamageTime,startTime,endTime); if (type!=0){ damageSelectWrapper.eq(Damage::getType,type); public List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure) { LambdaQueryWrapper<Damage> damageSelectWrapper = new LambdaQueryWrapper<>(); damageSelectWrapper.between(Damage::getDamageTime, startTime, endTime); if (type != 0) { damageSelectWrapper.eq(Damage::getType, type); } if (status!=0){ damageSelectWrapper.eq(Damage::getStatus,status); if (status != 0) { damageSelectWrapper.eq(Damage::getStatus, status); } if(!"0".equals(workingProcedure)){ damageSelectWrapper.eq(Damage::getWorkingProcedure,workingProcedure); if (!"0".equals(workingProcedure)) { damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure); } List<Damage> damageList = baseMapper.selectList(damageSelectWrapper); for (Damage damage : damageList) { damage.setStatus(2); } return baseMapper.selectList(damageSelectWrapper); } @@ -60,27 +66,7 @@ * 提交报工 */ @Override public void submitDamage(String startTime, String endTime, int type, int status, String workingProcedures){ LambdaUpdateWrapper<Damage> damageUpdateWrapper=new LambdaUpdateWrapper<>(); LambdaQueryWrapper<Damage> damageLambdaQueryWrapper=new LambdaQueryWrapper<>() ; damageUpdateWrapper.between(Damage::getDamageTime,startTime,endTime); damageLambdaQueryWrapper.between(Damage::getDamageTime,startTime,endTime); if (type!=0){ damageUpdateWrapper.eq(Damage::getType,type); damageLambdaQueryWrapper.eq(Damage::getType,type); } if (status!=0){ damageUpdateWrapper.eq(Damage::getStatus,status); damageLambdaQueryWrapper.eq(Damage::getStatus,status); } if(!"0".equals(workingProcedures)){ damageUpdateWrapper.eq(Damage::getWorkingProcedure,workingProcedures); damageLambdaQueryWrapper.eq(Damage::getWorkingProcedure,workingProcedures); } // Damage damage=new Damage(); // damage.setStatus(2); // baseMapper.update(damage,damageUpdateWrapper); List<Damage> damageList = baseMapper.selectList(damageLambdaQueryWrapper); public void submitDamage(List<Damage> damageList) { Map<String, Map<String, Map<String, Map<String, List<Damage>>>>> resultMap = damageList.stream() .collect(Collectors.groupingBy( Damage::getProcessId, @@ -123,15 +109,23 @@ // 获取 Damage 列表 List<Damage> damageListForTeamsGroupsName = teamsGroupsNameEntry.getValue(); //报工主表数据 ReportingWork reportingWork = new ReportingWork(); reportingWork.setProcessId(processId); reportingWork.setThisProcess(workingProcedure); reportingWork.setDeviceName(deviceName); reportingWork.setTeamsGroupsName(teamsGroupsName); // 使用 stream 对 damageListForTeamsGroupsName 进行再次分组 Map<Integer, Map<Integer, Map<String, List<Damage>>>> groupedByOrderTechBreakage = damageListForTeamsGroupsName.stream() .map(damage -> Optional.ofNullable(damage)) // 使用Optional处理可能为null的元素 .filter(Optional::isPresent) // 过滤掉空的Optional .map(Optional::get) // 获取非空的Damage对象 .collect(Collectors.groupingBy( Damage::getOrderNumber, damage -> Optional.ofNullable(damage.getOrderNumber()).orElse(0), // 使用orElse设置默认值，以处理null值 Collectors.groupingBy( Damage::getTechnologyNumber, damage -> Optional.ofNullable(damage.getTechnologyNumber()).orElse(0), // 同样处理technologyNumber可能为null的情况 Collectors.groupingBy( Damage::getBreakageType, damage -> Optional.ofNullable(damage.getBreakageType()).orElse("Unknown"), // 处理breakageType可能为null的情况 Collectors.toList() ) ) @@ -158,23 +152,19 @@ String breakageType = breakageTypeEntry.getKey(); System.out.println(" BreakageType: " + breakageType); ReportingWork reportingWork=new ReportingWork(); reportingWork.setProcessId(processId); reportingWork.setThisProcess(workingProcedure); reportingWork.setDeviceName(deviceName); reportingWork.setTeamsGroupsName(teamsGroupsName); // 获取 Damage 列表 List<Damage> damageListForBreakageType = breakageTypeEntry.getValue(); int completedQuantity=0; int breakageQuantity=0; int completedQuantity = 0; int breakageQuantity = 0; // 遍历 Damage 列表 for (Damage damage : damageListForBreakageType) { // 打印或处理每个 Damage 对象 System.out.println(" Damage: " + damage.toString()); if(damage.getType()==1){ completedQuantity+=1; }else if(damage.getType()==2){ breakageQuantity+=1; if (damage.getType() == 1) { completedQuantity += 1; } else if (damage.getType() == 2) { breakageQuantity += 1; } } } @@ -186,28 +176,27 @@ } } /** * 添加报工信息 */ @Override public void insertDamage(Damage damage){ LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper=new LambdaQueryWrapper<>(); glassInfoSelectWrapper.eq(GlassInfo::getGlassId,damage.getGlassId()); GlassInfo glassInfo=glassInfoMapper.selectOne(glassInfoSelectWrapper); public void insertDamage(Damage damage) { LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper = new LambdaQueryWrapper<>(); glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId()); GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoSelectWrapper); BeanUtils.copyProperties(glassInfo, damage); LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper=new LambdaQueryWrapper<>(); LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper = new LambdaQueryWrapper<>(); workAssignmentSelectWrapper .eq(WorkAssignment::getLine,damage.getLine()) .eq(WorkAssignment::getWorkProcesses,damage.getWorkingProcedure()); WorkAssignment workAssignment=workAssignmentMapper.selectOne(workAssignmentSelectWrapper); damage.setTeamsGroupsName(workAssignment.getTeamsGroupsName()); damage.setDeviceName(workAssignment.getDeviceName()); .eq(WorkAssignment::getLine, damage.getLine()) .eq(WorkAssignment::getWorkProcesses, damage.getWorkingProcedure()); WorkAssignment workAssignment = workAssignmentMapper.selectOne(workAssignmentSelectWrapper); if (workAssignment != null) { damage.setTeamsGroupsName(workAssignment.getTeamsGroupsName()); damage.setDeviceName(workAssignment.getDeviceName()); } damage.setProcessId(glassInfo.getFlowCardId()); damage.setOrderNumber(glassInfo.getGlassType()); damage.setTechnologyNumber(glassInfo.getLayer()); hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; /** * <p> @@ -28,7 +29,9 @@ private WorkAssignmentService workAssignmentService; @ApiOperation("值班数据查询") @PostMapping("/selectWorkAssignment") public Result selectWorkAssignment(int line,String workingProcedure) { public Result selectWorkAssignment(@RequestBody Map map) { String line=map.get("line").toString(); String workingProcedure=map.get("workingProcedure").toString(); return Result.build(200,"查询成功",workAssignmentService.selectWorkAssignment(line,workingProcedure)); }
@@ -3,6 +3,8 @@ import com.mes.work_assignment.entity.WorkAssignment; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** * <p> * 服务类 @@ -13,5 +15,5 @@ */ public interface WorkAssignmentService extends IService<WorkAssignment> { WorkAssignment selectWorkAssignment(int line, String workingProcedure); List<WorkAssignment> selectWorkAssignment(String line, String workingProcedure); } hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; /** * <p> * 服务实现类 @@ -25,11 +27,11 @@ * @return */ @Override public WorkAssignment selectWorkAssignment(int line, String workingProcedure){ public List<WorkAssignment> selectWorkAssignment(String line, String workingProcedure){ LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper=new LambdaQueryWrapper<>(); workAssignmentSelectWrapper .eq(WorkAssignment::getLine,line) .eq(WorkAssignment::getWorkProcesses,workingProcedure); return baseMapper.selectOne(workAssignmentSelectWrapper); return baseMapper.selectList(workAssignmentSelectWrapper); } } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -266,6 +266,7 @@ .selectAll(BigStorageCage.class) .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot) .eq(BigStorageCage::getEnableState, Const.SLOT_ON) .eq(BigStorageCageDetails::getEngineerId,glassInfo.getEngineerId()) .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId()) .gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight())) .last("limit 1"); @@ -287,7 +288,7 @@ .eq(BigStorageCage::getRemainWidth, slotWidth) .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0") .inSql(BigStorageCage::getDeviceId, "select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId()) "select distinct device_id from big_storage_cage_details where engineer_id = "+glassInfo.getEngineerId()+" and tempering_layout_id = " + glassInfo.getTemperingLayoutId()) .last("limit 1")); if (null != bigStorageCage) { bigStorageDTO = new BigStorageDTO(); hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
@@ -109,4 +109,25 @@ } } @Scheduled(fixedDelay = 1000) public void temperingIsRun(){ JSONObject jsonObject = new JSONObject(); //进片任务数据 List<BigStorageCageDetails> bigStorageCageDetailsFeedTask=bigStorageCageDetailsService.selectFeedTask(); jsonObject.append("bigStorageCageDetailsFeedTask", bigStorageCageDetailsFeedTask); //出片任务数据 List<BigStorageCageDetails> bigStorageCageDetailsOutTask=bigStorageCageDetailsService.selectOutTask(); jsonObject.append("bigStorageCageDetailsOutTask", bigStorageCageDetailsOutTask); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { if (webserver != null) { webserver.sendMessage(jsonObject.toString()); } else { log.info("Home is closed"); } } } } }
