jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -269,7 +269,10 @@ if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){ try { result = "3"; miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build()); String strA = bsFormulaChildInfo.getLocationCode() + "A"; String strB = bsFormulaChildInfo.getLocationCode() + "B"; miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strA+".RecordDataDone").value(21).build()); miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strB+".RecordDataDone").value(21).build()); } catch (Exception e) { throw new RuntimeException(e); } jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java
@@ -114,6 +114,16 @@ } /** * 出战时间参数增加 */ @PostMapping("/jrmSaveCampaignTimeParameters") public void jrmSaveCampaignTimeParameters(@RequestBody DaParamCollection daParamCollection) { daParamCollectionService.jrmSaveCampaignTimeParameters(daParamCollection); } /** * 更换总成号 */ @PostMapping("/replaceAssemblyCode") jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
@@ -74,4 +74,6 @@ void replaceAssemblyCode(DaParamCollection daParamCollection); void yzAddBasicParameters(DaParamCollection daParamCollection); void jrmSaveCampaignTimeParameters(DaParamCollection daParamCollection); } jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -313,4 +313,43 @@ daParamCollectionMapper.insertDaParamCollection(saveData); }); } @Override public void jrmSaveCampaignTimeParameters(DaParamCollection daParamCollection) { DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf(); daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode()); daCollectionParamConf.setCollectParameterId("OUTT"); List<DaCollectionParamConf> daCollectionParamConfs = daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf); DaParamCollection saveData = new DaParamCollection(); saveData.setWorkOrderNo(daParamCollection.getWorkOrderNo()); saveData.setProductCode(daParamCollection.getProductCode()); saveData.setLocationCode(daParamCollection.getLocationCode()); saveData.setSfcCode(daParamCollection.getProductBarcode()); saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId()); saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName()); saveData.setCollectionTime(new Date()); saveData.setParamValue(DateUtil.formatDateTime(new Date())); daParamCollectionMapper.insertDaParamCollection(saveData); //更新过站记录表出站时间 DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection(); daPassingStationCollection.setWorkOrderNo(daParamCollection.getWorkOrderNo()); daPassingStationCollection.setLocationCode(daParamCollection.getLocationCode()); List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection); daPassingStationCollections.get(0).setOutboundTime(new Date()); int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0)); // OPCUaSubscription.SaveParamData(daParamCollection.getProductBarcode(),"OP",daParamCollection.getLocationCode(),daParamCollection.getWorkOrderNo(),daParamCollection.getProductCode()); //给opc发21 try { // miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build()); String strA = daParamCollection.getLocationCode() + "A"; String strB = daParamCollection.getLocationCode() + "B"; miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strA+".RecordDataDone").value(21).build()); miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strB+".RecordDataDone").value(21).build()); } catch (Exception e) { throw new RuntimeException(e); } } } jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
@@ -153,8 +153,8 @@ public int jrmAddPassingStationCollection(DaPassingStationCollection daPassingStationCollection) { for (String model : daPassingStationCollection.getSfcCode().split(",")) { daPassingStationCollection.setSfcCode(model); daPassingStationCollectionService.save(daPassingStationCollection); boolean save = daPassingStationCollectionService.save(daPassingStationCollection); } return 0; return 1; } } jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -76,7 +76,7 @@ lists.add(OPCElement.PACK_OP310A_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP310B_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP330A_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP330B_RecordData);//请求记录数据 // lists.add(OPCElement.PACK_OP330B_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP380_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP380_AngleResult);//请求记录数据 lists.add(OPCElement.PACK_OP400_RecordData);//请求记录数据 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -176,7 +176,12 @@ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(recordDataDoneValue)).build()); }else { //手动工位 WebSocketUsers.sendMessageToUserByText(map.get(device), "END"); if(device.contains("OP330")){ String str = device.substring(0,5); WebSocketUsers.sendMessageToUserByText(map.get(str), "END"); }else { WebSocketUsers.sendMessageToUserByText(map.get(device), "END"); } } }else { System.out.println("^"); jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
@@ -62,6 +62,14 @@ }) } export function jrmSaveCampaignTimeParameters(data) { return request({ url: '/main/paramCollection/jrmSaveCampaignTimeParameters', method: 'post', data: data }) } // 新增设备产品过程参数采集 saveCampaignTimeParameters export function addTighteningParameters(data) { return request({ jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
@@ -6,20 +6,22 @@ <span class="head-font">工位编号 : {{headContent.processesCode}}</span> </el-card> </el-col> <el-col :span="7"> <el-col :span="17"> <el-card shadow="never"> <span class="head-font">工位名称 : {{headContent.processesName}}</span> </el-card> </el-col> <el-col :span="10"> <el-card shadow="never"> <span class="head-font">产品序列号 : {{headContent.sfcCode}}</span> <!-- <el-input v-model="content" style="float: right;width: 150px;" placeholder="请输入内容"></el-input>--> <!-- <el-button @click="scanCompleted" style="float: right" type="primary">扫码完成</el-button>--> <el-button type="primary" style="float: right" icon="el-icon-search" size="mini" @click="serialLink">串口连接</el-button> <el-button @click="clearClick" style="float: right" type="danger" size="mini">清除</el-button> </el-card> </el-col> <!-- <el-col :span="10">--> <!-- <el-card shadow="never">--> <!-- <span class="head-font">产品序列号 : {{headContent.sfcCode}}</span>--> <!--<!– <el-input v-model="content" style="float: right;width: 150px;" placeholder="请输入内容"></el-input>–>--> <!--<!– <el-button @click="scanCompleted" style="float: right" type="primary">扫码完成</el-button>–>--> <!-- <el-button type="primary" style="float: right" icon="el-icon-search" size="mini" @click="serialLink">串口连接</el-button>--> <!-- <el-button @click="clearClick" style="float: right" type="danger" size="mini">清除</el-button>--> <!-- </el-card>--> <!-- </el-col>--> </el-row> <el-row :gutter="5" style="margin-top: 5px"> @@ -268,7 +270,7 @@ addParamCollection, addTighteningParameters, saveCampaignTimeParameters, replaceAssemblyCode, replaceAssemblyCode, jrmSaveCampaignTimeParameters, } from "@/api/main/da/paramCollection/paramCollection"; export default { @@ -457,6 +459,7 @@ }, /** 查询配方配置子信息列表 */ getListFormulaChild() { console.log('getListFormulaChild') // this.formulaChildList = [] this.formulaChildParams.productCode = '1P102S' this.formulaChildParams.processesCode = this.headContent.processesCode @@ -464,6 +467,7 @@ noPageListFormulaChild(this.formulaChildParams).then(response => { this.formulaChildList = response.rows; }); console.log('success_getListFormulaChild') }, endClear(){ this.cakeLamp.InPlace= 0 //工件到位 @@ -503,6 +507,7 @@ /** 入站增加过站采集记录 **/ addOverStationCollection(){ console.log('addOverStationCollection') this.passingStationForm = { id: null, // workOrderNo: this.workpieceInformation.workOrderNo, @@ -513,7 +518,6 @@ sfcCode: this.headContent.moduleA+','+this.headContent.moduleB, inboundTime: new Date() } // addPassingStationCollection(this.passingStationForm).then(response => {}); jrmAddPassingStationCollection(this.passingStationForm).then(response => {}); // addBasicParameters(this.passingStationForm).then(response => {}); }, @@ -575,7 +579,7 @@ locationCode: self.headContent.processesCode, productBarcode: self.headContent.sfcCode, } saveCampaignTimeParameters(param).then(response => {}); jrmSaveCampaignTimeParameters(param).then(response => {}); self.cakeLamp.release = 1; self.endClear() workpieceRelease(param).then(response => {}); @@ -595,8 +599,8 @@ const param = { tightenTheArray: event.data, paramCode: formulaChilds.paramCode, workOrderNo: self.workpieceInformation.workOrderNo, productCode: self.workpieceInformation.productCode, // workOrderNo: self.workpieceInformation.workOrderNo, productCode: '1P102S', locationCode: self.headContent.processesCode, productBarcode: self.headContent.sfcCode, }
