jcdm-admin/src/main/java/com/jcdm/MesApplication.java
@@ -1,7 +1,5 @@ package com.jcdm; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
@@ -326,13 +326,13 @@ BsOrderScheduling OrderScheduling=dlist.get(0); DaParamCollection daParamCollection = new DaParamCollection(); daParamCollection.setParamValue(engineNo); daParamCollection.setLocationCode("OP010"); List<DaParamCollection> list = daParamCollectionService.selectDaParamCollectionList(daParamCollection); if (CollUtil.isNotEmpty(list)){ return R.ok(500,"已存在此箱体码，请勿重复扫描"); } // DaParamCollection daParamCollection = new DaParamCollection(); // daParamCollection.setParamValue(engineNo); // daParamCollection.setLocationCode("OP010"); // List<DaParamCollection> list = daParamCollectionService.selectDaParamCollectionList(daParamCollection); // if (CollUtil.isNotEmpty(list)){ // return R.ok(500,"已存在此箱体码，请勿重复扫描"); // } OmProductionOrdeInfo info = new OmProductionOrdeInfo(); info.setWorkOrderNo(orderNo); jcdm-main/src/main/java/com/jcdm/main/da/tileMatchCollection/controller/DaTileMatchCollectionController.java
@@ -175,20 +175,6 @@ resultList.add(rules); } } } else if ("372".equals(productType)){ for (int i = 1; i < 3; i++) { int finalI = i; int finalAxis = i+4; List<DaTileMatchRules> collect = allMatchRuleList.stream().filter(x -> x.getAxisParameterNoPosition().equals(finalAxis + 1) && x.getNeckParameterPosition().equals(finalI + 1) && x.getAxisValue().equals(String.valueOf(boxCodeCharArray[finalAxis])) && x.getNeckValue().equals(String.valueOf(balanceCodeCharArray[finalI]))) .collect(Collectors.toList()); if (CollUtil.isNotEmpty(collect)){ DaTileMatchRules rules = collect.get(0); resultList.add(rules); } } } } } jcdm-main/src/main/java/com/jcdm/main/da/tileMatchMiddleware/controller/DaTileMatchMiddlewareController.java
@@ -163,6 +163,15 @@ rMiddleware.setState(2); SNCode=rMiddleware.getSfcCode(); daTileMatchMiddlewareService.updateDaTileMatchMiddleware(rMiddleware); DaTileMatchMiddleware patch = new DaTileMatchMiddleware(); patch.setSfcCode(SNCode); patch.setState(1); List<DaTileMatchMiddleware> checkList = daTileMatchMiddlewareService.selectDaTileMatchMiddlewareList(patch); if (CollUtil.isNotEmpty(checkList)){ if (checkList.size() == 2){ rMiddleware.setCheckFlag("1"); } } //获取产品型号 ProductNewPassStation productNewPassStation = new ProductNewPassStation(); productNewPassStation.setSfcCode(SNCode); jcdm-main/src/main/java/com/jcdm/main/da/tileMatchMiddleware/domain/DaTileMatchMiddleware.java
@@ -67,4 +67,7 @@ @TableField(exist = false) private String productType; @TableField(exist = false) private String checkFlag; } jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/service/impl/DaTileMatchRulesServiceImpl.java
@@ -138,7 +138,7 @@ } if (CollUtil.isNotEmpty(xtList) && xtList.size()>1 && StrUtil.isNotBlank(s2)){ String s1 = xtList.get(2); String s1 = xtList.get(1); if ("380".equals(productType)){ for (int i = 1; i < 5; i++){ char[] charArray1 = s1.toCharArray(); jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -170,12 +170,13 @@ if (ObjectUtil.isNotEmpty(SNCodeObject)){ String snCode = SNCodeObject.toString(); if (snCode.startsWith("380")){ log.info("enter-380"); String[] split = snCode.split(StrUtil.SPACE); if (split.length>1){ ReadWriteEntity entity = new ReadWriteEntity("CFL4HX.OP020.PrintSN1", split[0]); OPCUaSubscription.miloService.writeToOpcByte(entity);//写完成 ReadWriteEntity entity2 = new ReadWriteEntity("CFL4HX.OP020.PrintSN2", split[1]); OPCUaSubscription.miloService.writeToOpcByte(entity2);//写完成 OPCUaSubscription.miloService.writeToOpcUa(entity);//写完成 ReadWriteEntity entity2 = new ReadWriteEntity("CFL4HX.OP020.PrintSN2", "☆"+split[1]+"☆"); OPCUaSubscription.miloService.writeToOpcUa(entity2);//写完成 ReadWriteEntity entity3 = new ReadWriteEntity("CFL4HX.OP020.SendSNDone", 1); OPCUaSubscription.miloService.writeToOpcByte(entity3);//写完成 } @@ -187,9 +188,10 @@ } } } else if (OPCElement.OP030_SAVE_REQUEST.equals(identifier)) { cleanForm("CFL4HX.OP030.SaveFeed"); ReadWriteEntity entity2 = new ReadWriteEntity("CFL4HX.OP030.SaveFeed", 1); OPCUaSubscription.miloService.writeToOpcByte(entity2);//写完成 cleanForm("CFL4HX.OP030.SaveFeed"); } else if (OPCElement.OP040_SAVE_REQUEST.equals(identifier)) { cleanForm040(OPCElement.OP040_SAVE_REQUEST); ReadWriteEntity entity2 = new ReadWriteEntity("CFL4HX.OP040.SaveFeed", 1); @@ -664,6 +666,8 @@ ProductNewPassStation productNewPassStation = productPassStationList.get(0); String boxCode = productNewPassStation.getBoxCode(); String productType = productNewPassStation.getProductType(); log.info("发送到OP040的页面数据productType,{}",productType); log.info("发送到OP040的页面数据boxCode,{}",boxCode); passingStationCollectionServiceImpl.sendMessage(productType+"*"+boxCode, "OP040"); } } else if ("280".equals(productNewFlag)){ @@ -680,6 +684,7 @@ String snCode = SNCodeObject.toString(); String s = productNewFlag(snCode); if ("280".equals(s) || "380".equals(s)){ log.info("发送到OP030的清除"); passingStationCollectionServiceImpl.sendMessage("clean","OP030"); } } @@ -693,6 +698,7 @@ String snCode = SNCodeObject.toString(); String s = productNewFlag(snCode); if ("280".equals(s) || "380".equals(s)){ log.info("发送到OP040的页面清除"); passingStationCollectionServiceImpl.sendMessage("clean*clean","OP040"); } } jcdm-ui/src/views/main/cfkb/connectingRod/index.vue
@@ -176,6 +176,10 @@ this.from.scanObject1=res.crankshaftNo; this.from.connectingrodNo=res.connectingrodNo; this.queryParams.axisName=res.cylinder; if (res.checkFlag === "1"){ this.queryParams.tileColor2 = null this.queryParams.tileColor3 = null } this.handleQuery() } //this.queryParams.scanObject1=this.from.scanObject1 @@ -276,6 +280,13 @@ const neckValueextracted = parts2[2]; return this.queryParams.neckValue= neckValueextracted; } } else if (this.from.scanObject1.indexOf(",") !== -1){ const parts2 = this.from.scanObject1.split(","); if (parts2.length >= 2) { //const neckValueextracted = parts2[2].substring(3,4); const neckValueextracted = parts2[1]; return this.queryParams.neckValue= neckValueextracted; } } }, //取配瓦颜色 jcdm-ui/src/views/main/cfkb/connectingRodUp/index.vue
@@ -157,7 +157,7 @@ this.result = JSON.parse(data); const resultMessage = this.result.server_message.split("*"); console.log('resultMessage',resultMessage) if (resultMessage.length >=3){ if (resultMessage.length >=2){ if (resultMessage[1] === "sfcCode"){ this.queryParams.scanObject1 = resultMessage[0] this.queryParams.productSeries = resultMessage[2] jcdm-ui/src/views/main/cfkb/crankshaft/index.vue
@@ -246,7 +246,7 @@ console.log("33") if (this.from.scanObject1.indexOf(";") !== -1) { const parts1 = this.from.scanObject1.split(";"); if (parts1.length >= 3) { if (parts1.length >= 2) { console.log("44", parts1) //const axisValueextracted = parts1[2].substring(3,4); const axisValueextracted = parts1[2]; @@ -267,6 +267,13 @@ const neckValueextracted = parts2[2]; return this.queryParams.neckValue = neckValueextracted; } } else if (this.from.scanObject2.indexOf(",") !== -1){ const parts2 = this.from.scanObject2.split(","); if (parts2.length >= 2) { //const neckValueextracted = parts2[2].substring(3,4); const neckValueextracted = parts2[1]; return this.queryParams.neckValue = neckValueextracted; } } }, //取配瓦颜色 jcdm-ui/src/views/main/cfkb/crankshaftUp/index.vue
@@ -139,8 +139,9 @@ let data = event.data; if (data != null && data !== ''){ this.result = JSON.parse(data); console.log('this.result.server_message',this.result.server_message) if (this.result.server_message === 'clean'){ this.$refs.inputdata1.focus(); this.$refs.inputdata.focus(); this.from.scanObject1 = '' this.from.scanObjectCopy = '' this.from.scanObject2 = ''
