UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -212,6 +212,11 @@ } }; const handleEdit = (row) => { patternWidth.value = row.patternWidth; patternHeight.value = row.patternHeight; patternThickness.value = row.patternThickness; filmsId.value = row.filmsId; remainQuantity.value = row.remainQuantity; window.localStorage.setItem('deviceId', row.deviceId) window.localStorage.setItem('slot', row.slot) Edit.value = true; UI-Project/src/views/hollow/hollowequipment.vue
@@ -121,6 +121,7 @@ </el-table-column> <el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/> <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/> <el-table-column prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20"/> <el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270"> <template #default="scope"> <el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button> @@ -1109,7 +1110,7 @@ 5: t('hellow.intervalFrameTypea') } // 处理编辑按钮点击 function handleEdit(row) { function handleEdit(row) { window.localStorage.setItem('id', row.id) formulaName.value = row.formulaName; filmRemove.value = removalMethodMap[row.filmRemove]; UI-Project/src/views/hollow/hollowequipmenthree.vue
@@ -95,6 +95,7 @@ </el-table-column> <el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/> <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/> <el-table-column prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20"/> <el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270"> <template #default="scope"> <el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button> UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -95,6 +95,7 @@ </el-table-column> <el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/> <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/> <el-table-column prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20"/> <el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270"> <template #default="scope"> <el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button> hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml
@@ -30,6 +30,17 @@ host: 127.0.0.1 port: 6379 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv kangaroohy: milo: enabled: true hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
@@ -87,7 +87,7 @@ @Resource private RedisUtil redisUtil; @Scheduled(fixedDelay = 1000) // @Scheduled(fixedDelay = 1000) public void inBigStorageTask() throws Exception { ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl"); if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) { @@ -268,7 +268,7 @@ miloService.writeToOpcWord(list); } @Scheduled(fixedDelay = 1000) // @Scheduled(fixedDelay = 1000) public void outBigStorageTask() throws Exception { Date startDate = new Date(); ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl"); @@ -395,7 +395,7 @@ return; } @Scheduled(fixedDelay = 1000) // @Scheduled(fixedDelay = 1000) public void finishInBigStorageTask() throws Exception { ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl"); if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) { @@ -484,7 +484,7 @@ miloService.writeToOpcWord(list); } @Scheduled(fixedDelay = 1000) // @Scheduled(fixedDelay = 1000) public void finishOutBigStorageTask() throws Exception { ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl"); if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) { hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
@@ -26,6 +26,17 @@ host: 127.0.0.1 port: 6379 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv kangaroohy: milo: enabled: true hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
@@ -31,6 +31,17 @@ host: 127.0.0.1 port: 6379 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv kangaroohy: milo: enabled: true hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
@@ -33,7 +33,6 @@ @Resource HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService; @ApiOperation("领取任务") @PostMapping("/receiveTask") public Result<HollowGlassOutRelationInfo> receiveTask(HollowTaskRequest request) { hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml
@@ -28,6 +28,16 @@ host: 127.0.0.1 port: 6379 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv kangaroohy: milo: enabled: true
