jcdm-main/src/main/java/com/jcdm/main/da/tileMatchMiddleware/controller/DaTileMatchMiddlewareController.java
@@ -5,6 +5,8 @@ import javax.servlet.http.HttpServletResponse; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.jcdm.common.core.domain.R; import com.jcdm.main.da.paramCollection.domain.DaParamCollection; import com.jcdm.main.da.passingStationCollection.domain.ProductNewPassStation; import com.jcdm.main.da.passingStationCollection.service.ProductNewPassStationService; @@ -188,4 +190,20 @@ // InitCallback.miloService.writeToOpcByte(entity2);//写完成 return rMiddleware; } @GetMapping("/getSfcCodeByConnectCode") public R getSfcCodeByConnectCode(String connectCode){ DaTileMatchMiddleware tileMatchMiddleware = new DaTileMatchMiddleware(); if (StrUtil.isBlank(connectCode)){ return R.fail("连杆码不能为空"); } DaTileMatchMiddleware daTileMatchMiddleware = new DaTileMatchMiddleware(); daTileMatchMiddleware.setConnectingrodNo(connectCode); List<DaTileMatchMiddleware> daTileMatchMiddlewares = daTileMatchMiddlewareService.selectDaTileMatchMiddlewareList(daTileMatchMiddleware); if (CollUtil.isNotEmpty(daTileMatchMiddlewares)){ tileMatchMiddleware = daTileMatchMiddlewares.get(0); } return R.ok(tileMatchMiddleware); } } jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -419,7 +419,7 @@ Integer finalMaxCodeNum = maxCodeNum; //勾选的返修工位中最大的工位之后的工位----1 List<BsTechnologyRouteChildInfo> collect3 = bsTechnologyRouteChildInfos.stream() .filter(x -> x.getStepNoNum() >= finalMaxCodeNum).collect(Collectors.toList()); .filter(x -> x.getStepNoNum() > finalMaxCodeNum).collect(Collectors.toList()); if (CollUtil.isNotEmpty(collect3)){ //需要生产 productStation.addAll(collect3.stream().map(BsTechnologyRouteChildInfo::getProcessesCode).collect(Collectors.toList())); jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml
@@ -48,7 +48,6 @@ <if test="outRsSign != null "> and out_rs_sign = #{outRsSign}</if> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> and outbound_time between #{startTime} and #{endTime}</if> </where> ORDER BY id DESC </select> <select id="selectDaPassingStationCollectionById" parameterType="Long" resultMap="DaPassingStationCollectionResult"> jcdm-ui/src/api/main/da/tileMatchMiddleware/tileMatchMiddleware.js
@@ -58,3 +58,10 @@ params: param }) } export function getSfcCodeByConnectCode(param) { return request({ url: '/da/tileMatchMiddleware/getSfcCodeByConnectCode', method: 'get', params: param }) } jcdm-ui/src/views/main/cfkb/connectingRodUp/index.vue
@@ -8,26 +8,17 @@ </div> </template> </el-card> <el-row :gutter="3"> <el-col :span="6"> <el-card shadow="always" class="boxSize"> <div class="centerImg"> <img style="width: 140px;height: 30px;" src="@/assets/logo/jcdm2.png" alt="dark"> </div> </el-card> </el-col> <el-col :span="3"> <el-card shadow="always" class="boxSize"> <span class="centerText" style="height: 60px">{{locationCode}}</span> </el-card> </el-col> <el-col :span="15"> <el-card shadow="always" class="boxSize"> <span class="centerText" >{{locationName}}</span> </el-card> </el-col> </el-row> <el-card class="query-card" > <el-form :model="from" size="large" :inline="true" label-width="78px" @submit.native.prevent> <el-form-item label-width="200" label="连杆码" :prop="from.connectCode" style="align-content: center"> <input v-model="from.connectCode" ref="inputdata1" style="height: 39px; width: 300px" placeholder="请扫描连杆码" /> </el-form-item> </el-form> </el-card> <!-- <el-card class="box-card" >--> <!-- <el-form :model="from" size="large" :inline="true" label-width="68px" @submit.native.prevent>--> <!-- <el-form-item label-width="200" label="活塞连杆托盘码" :prop="from.scanObject2" style="align-content: center">--> @@ -74,6 +65,7 @@ import {getUrl} from "@/api/main/bs/orderScheduling/orderScheduling"; import WebSocketReconnect from "@/utils/WebsocketTool"; import result from "../../../../components/Crontab/result.vue"; import {getSfcCodeByConnectCode} from "../../../../api/main/da/tileMatchMiddleware/tileMatchMiddleware"; export default { name: "index", dicts: ['colour_hex','productseries','axisname','neckname','tilename'], @@ -90,6 +82,7 @@ qrCode: '', // 查询参数 from:{ connectCode:'', pageNum: 1, pageSize: 10, productSeries: null, @@ -133,11 +126,63 @@ } }, mounted() { this.setFocus1() this.$refs.inputdata1.addEventListener('keydown',this.handleScannerInput1) this.getStationConf() this.getWebUrl() this.getDetailMessage() }, beforeDestroy() { this.$refs.inputdata1.removeEventListener('keydown',this.handleScannerInput1) }, methods:{ setFocus1(){ this.$nextTick(()=>{ this.$refs.inputdata1.focus() }) }, handleScannerInput1(event) { if (this.scannerFlag) { this.$refs.inputdata1.value = '' this.scannerFlag = false } const input = event.target const inputValue = input.value this.from.connectCode = inputValue if (event.key === 'Enter') { this.scannerFlag = true //扫描完成 console.log('sssss', this.from.connectCode) getSfcCodeByConnectCode({connectCode:this.from.connectCode}).then(res => { console.log('res',res) if (res.code === 200){ this.queryParams.scanObject2 = res.data.sfcCode if (this.queryParams.scanObject1 !== null && this.queryParams.scanObject1 !== '' && this.queryParams.scanObject2 !== null && this.queryParams.scanObject2 !== ''){ if (this.queryParams.scanObject1 === this.queryParams.scanObject2){ this.queryParams.words = "配对成功" this.queryParams.tileColor = "#3dcc1d" //请求出站 // this.passStation() }else { this.queryParams.words = "配对失败" this.queryParams.tileColor = "#f50909" } } this.$message({ message: '查询成功', type: 'success' }); } else { this.$message({ message: '查询失败', type: 'error' }); } }) } }, getWebUrl(){ getUrl().then(res=>{ this.websocketUrl = res+"OP050" jcdm-ui/src/views/main/da/paramCollection/index.vue
@@ -255,7 +255,7 @@ }; }, created() { this.getList(); // this.getList(); }, methods: { /** 查询设备产品过程参数采集列表 */ jcdm-ui/src/views/main/pr/cameraReport/index.vue
@@ -146,7 +146,7 @@ } }, created() { this.getList(); // this.getList(); }, methods: { reset() { jcdm-ui/src/views/main/pr/detectionReport/index.vue
@@ -146,7 +146,7 @@ } }, created() { this.getList(); // this.getList(); }, methods: { reset() { jcdm-ui/src/views/main/pr/productResultReport/index.vue
@@ -148,7 +148,7 @@ } }, created() { this.getList(); // this.getList(); }, methods: { reset() { jcdm-ui/src/views/main/pr/refuelDataReport/index.vue
@@ -146,7 +146,7 @@ } }, created() { this.getList(); // this.getList(); }, methods: {
