UI-Project/src/lang/zh.js
@@ -654,6 +654,7 @@ claimednumber: '已领取配对数量：', linenumber: '进入中空线数量：', order: '出片顺序', flowCardId: '流程卡', thickness: '厚度', coatingtypes: '膜系', layer: '层数', UI-Project/src/utils/constants.js
@@ -1,4 +1,5 @@ // export const WebSocketHost = "192.168.2.100"; export const WebSocketHost = "192.168.2.100"; // export const WebSocketHost = "192.168.0.39"; // export const WebSocketHost = "10.153.19.150"; export const WebSocketHost = "127.0.0.1"; // export const WebSocketHost = "127.0.0.1"; export const host = "88"; UI-Project/src/views/hollow/hollowequipment.vue
@@ -44,7 +44,8 @@ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;"> <el-table height="650" ref="table" :data="tableDataa" :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"> <el-table-column prop="sequence" :label="$t('hellow.order')" align="center"/> <el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center"/> <el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center"/> <el-table-column prop="thickness" :label="$t('hellow.thickness')" align="center"/> <el-table-column prop="layer" :label="$t('hellow.coatingtypes')" align="center"/> <el-table-column prop="height" :label="$t('hellow.height')" align="center"/> hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring: profiles: active: cz active: yw application: name: cacheGlass liquibase: @@ -28,23 +28,23 @@ secondLength: 2500 min: one: #第一条磨边线的最小尺寸信息 firstLength: 500 secondLength: 400 firstLength: 460 secondLength: 390 two: #第二条磨边线的最小尺寸信息 firstLength: 400 secondLength: 400 glassGap: 300 cellLength: 2700 firstLength: 390 secondLength: 390 glassGap: 2500 cellLength: 2500 sequence: order: false kangaroohy: milo: enabled: false enabled: true primary: default config: default: endpoint: opc.tcp://192.168.10.241:49320 endpoint: opc.tcp://192.168.2.100:49320 security-policy: basic256sha256 username: liu username: admin password: 1qaz2wsx3edc4rfv
@@ -3,7 +3,7 @@ spring: profiles: active: dev active: yw application: name: cacheVerticalGlass liquibase: @@ -35,7 +35,7 @@ port: 5000 kangaroohy: milo: enabled: false enabled: true primary: default config: default: hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
@@ -55,12 +55,12 @@ reportingdamage.setReportingWorkTime(startOfPeriodStr); reportingdamage.setReportingWorkTime2(endOfPeriodStr); //扇形图各设备的加工破损数量 List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("device", device); // List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage); // jsonObject.append("device", device); //获取次破未补信息 List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair(); jsonObject.append("awaitingRepairs", awaitingRepairs); // List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair(); // jsonObject.append("awaitingRepairs", awaitingRepairs); //获取正在进行的工程 List<OptimizeProject> optimizeProjects = optimizeProjectService.getDoingTask(); jsonObject.append("DoingTask", optimizeProjects); hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
@@ -131,7 +131,7 @@ log.info("本次任务结束时间：{}，共耗时：{}ms", endDate, endDate.getTime() - startDate.getTime()); } @Scheduled(fixedDelay = 1000) // @Scheduled(fixedDelay = 1000) public void temperingGlassAfter() { //暂不处理 } hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,7 +2,7 @@ port: 8084 spring: profiles: active: prod active: yw application: name: temperingGlass liquibase: @@ -16,11 +16,11 @@ height: 5000 kangaroohy: milo: enabled: false enabled: true primary: default config: default: endpoint: opc.tcp://zidonghua:49320 endpoint: opc.tcp://192.168.2.100:49320 security-policy: basic256sha256 username: zsh username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
@@ -757,15 +757,17 @@ if (isPair == 0 && isForce != 1) { taskType = Const.BIG_STORAGE_AFTER_DISPATCH; taskState = Const.GLASS_STATE_SCHEDULE_ING; resultList.add(list.get(0)); //目前调度任务totalLayer为0 出片调度任务有层号，用于区分调度方式 // 因为出片存在调度，如果为调度，提前占用格子，更新格子剩余尺寸，避免被进片玻璃占用 if (totalLayer != 0) { resultList.add(list.get(0)); HollowBigStorageCage storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>() .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth).last("limit 1")); targetSlot = storageCage.getSlot(); hollowBigStorageCageService.update(new LambdaUpdateWrapper<HollowBigStorageCage>() .set(HollowBigStorageCage::getRemainWidth, 0).eq(HollowBigStorageCage::getSlot, targetSlot)); }else{ resultList = tempList; } totalLayer = 0; } else { @@ -852,6 +854,9 @@ //是否存在有格子非空的玻璃 if (CollectionUtils.isNotEmpty(inSlotGlassList)) { //存在 将格子内的玻璃分别进行更新 // List<HollowBigStorageCage> hollowBigStorageCageList = hollowBigStorageCageService.list(new LambdaQueryWrapper<HollowBigStorageCage>() // .lt(HollowBigStorageCage::getRemainWidth, 0).in(HollowBigStorageCage::getSlot, slotList)); // List<Integer> resultSlotList = hollowBigStorageCageList.stream().map(HollowBigStorageCage::getSlot).collect(Collectors.toList()); slotRemainMap = inSlotGlassList.stream() .collect(Collectors.groupingBy(HollowBigStorageCageDetails::getSlot, Collectors.summingDouble(item -> Math.max(item.getWidth(), item.getHeight()) + glassGap))); slotRemainMap.forEach((e, v) -> { hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-yw.yml
@@ -22,7 +22,7 @@ cloud: nacos: discovery: server-addr: 127.0.0.1:8848 server-addr: 192.168.2.100:8848 redis: database: 0 host: 192.168.2.100 hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring: profiles: active: dev active: yw application: name: hollowGlass liquibase: @@ -31,7 +31,7 @@ artificialOutTargetPosition: 931 kangaroohy: milo: enabled: false enabled: true primary: default config: default:
