jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -221,7 +221,7 @@ } BsFormulaChildInfo listQuery = new BsFormulaChildInfo(); listQuery.setParamCode(bsFormulaChildInfo.getParamCode()); listQuery.setLocationCode(bsFormulaChildInfo.getLocationCode()); listQuery.setProcessesCode(bsFormulaChildInfo.getLocationCode()); String paramCode = bsFormulaChildInfo.getTightenTheArray(); if(paramCode.contains("N")){ result = "3"; @@ -455,7 +455,7 @@ } BsFormulaChildInfo listQuery = new BsFormulaChildInfo(); listQuery.setParamCode(bsFormulaChildInfo.getParamCode()); listQuery.setLocationCode(bsFormulaChildInfo.getLocationCode()); listQuery.setProcessesCode(bsFormulaChildInfo.getLocationCode()); String paramCode = bsFormulaChildInfo.getTightenTheArray(); if(paramCode.contains("N")){ List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery); jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -251,7 +251,7 @@ } } catch (Exception e) { logger.info("订阅方法报错:{}"+e.getMessage()); e.printStackTrace(); logger.error("订阅方法报错",e); } } @@ -279,15 +279,14 @@ read = read + "ModuleCode"; if(device.equals("OP365")){ try { saveStationInfo365(thoroughfare,device); result = saveStationInfo365(thoroughfare,device); return result; }catch (Exception e){ e.printStackTrace(); } } }else { read = read + "PACKCode"; } } snCode = miloService.readFromOpcUa(read).getValue().toString(); if(null == snCode || "".equals(snCode)){ @@ -324,6 +323,9 @@ result = "21"; } } } }catch (Exception e) { System.out.println(e.getMessage()); @@ -551,7 +553,7 @@ /** * 保存过站采集 */ public void saveStationInfo365(String thoroughfare,String device) throws Exception { public String saveStationInfo365(String thoroughfare,String device) throws Exception { String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone"; String prefix = thoroughfare+"."+device+"."; List<DaPassingStationCollection> passingStationCollections = new ArrayList<>(); @@ -588,11 +590,11 @@ passingStationCollections.add(daPassingStationCollection); } daPassingStationCollectionService.saveBeachDaPassingStationCollection(passingStationCollections); miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build()); return; //miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build()); return "21"; }else { miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build()); return; //miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build()); return "22"; } } jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
@@ -533,6 +533,10 @@ locationCode: self.headContent.processesCode, productBarcode: self.headContent.sfcCode, } if(formulaChilds.paramCode === null||formulaChilds.paramCode ===''){ self.$message('未找到参数码,请检查参数码是否正确'); return; } addTighteningParameters(param).then(response => {}); yzUpdateTighteningFormula(param).then(response => { console.log(response) jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -675,6 +675,12 @@ const orderParam = { productNum: self.headContent.sfcCode, } if(self.headContent.sfcCode=== ''||self.headContent.sfcCode=== null){ self.$message('总成码为空,请检查!') return } checkCarCode(orderParam).then(response => { console.log(response.data) if(response.data === 1){ @@ -734,6 +740,11 @@ locationCode: self.headContent.processesCode, productBarcode: self.headContent.sfcCode, } if(formulaChilds.paramCode === null||formulaChilds.paramCode ===''){ self.$message('未找到参数码,请检查参数码是否正确'); return; } if(self.headContent.sfcCode!==null||self.headContent.sfcCode!==''){ addTighteningParameters(param).then(response => {}); updateTighteningFormula(param).then(response => { self.getListFormulaChild() @@ -741,6 +752,7 @@ self.getListFormulaChild() }); } } }; },