jcdm-admin/src/main/resources/application-druid.yml
@@ -17,9 +17,11 @@ # 主库数据源 master: # url: jdbc:sqlserver://192.168.0.189:1433;DataBaseName=Jcdm042-Mes url: jdbc:sqlserver://183.134.244.158:1433;DataBaseName=Jcdm042-Mes # url: jdbc:sqlserver://183.134.244.158:1433;DataBaseName=Jcdm042-Mes url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm042-Mes username: sa password: JCDM@2023 # password: JCDM@2023 password: admin@123 # 从库数据源 slave: # 从数据源开关/默认关闭 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -147,8 +147,9 @@ BsFormulaChildInfo checkInfo = new BsFormulaChildInfo(); checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode()); checkInfo.setProductCode(bsFormulaChildInfo.getProductCode()); bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2)); List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(bsFormulaChildInfo); checkInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2)); // bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2)); List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(checkInfo); if(bsFormulaChildInfos.size()>0){ bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getScanBarcode()); bsFormulaChildInfos.get(0).setResults("OK"); @@ -185,6 +186,7 @@ public AjaxResult updateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo) { BsFormulaChildInfo listQuery = new BsFormulaChildInfo(); listQuery.setParamCode(bsFormulaChildInfo.getParamCode()); listQuery.setOperationType("1"); String paramCode = bsFormulaChildInfo.getTightenTheArray(); if(paramCode.contains("N")){ List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery); @@ -208,7 +210,7 @@ // List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection); // daPassingStationCollections.get(0).setOutboundTime(new Date()); // daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0)); miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("OP."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build()); miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build()); WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "OUT"); } catch (Exception e) { throw new RuntimeException(e); jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -52,16 +52,18 @@ */ public List<String> getSubList(){ List<String> lists = new ArrayList<>(); lists.add(OPCElement.OP_OP010_RecordSN);//请求下发SN号 lists.add(OPCElement.OP_OP230_RecordData);//请求记录数据 lists.add(OPCElement.OP_OP240_RecordData);//请求记录数据 lists.add(OPCElement.OP_OP240_AngleResult);//请求记录数据 lists.add(OPCElement.OP_OP250_RecordData);//请求记录数据 lists.add(OPCElement.OP_OP250_AngleResult);//请求记录数据 lists.add(OPCElement.OP_OP380_RecordData);//请求记录数据 lists.add(OPCElement.OP_OP380_AngleResult);//请求记录数据 lists.add(OPCElement.OP_OP300_RecordData);//请求记录数据 lists.add(OPCElement.OP_OP300_AngleResult);//请求记录数据 lists.add(OPCElement.PACK_OP010_RecordSN);//请求下发SN号 lists.add(OPCElement.PACK_OP230_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP240_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP240_AngleResult);//请求记录数据 lists.add(OPCElement.PACK_OP250_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP250_AngleResult);//请求记录数据 lists.add(OPCElement.PACK_OP380_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP380_AngleResult);//请求记录数据 lists.add(OPCElement.PACK_OP300_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP300_AngleResult);//请求记录数据 lists.add(OPCElement.PACK_OP270_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP270_AngleResult);//请求记录数据 return lists; } } jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
@@ -10,36 +10,43 @@ /** * OP230 */ public static final String OP_OP010_RecordSN = "TestOP.OP1010.RecordSN";//请求下发SN号 public static final String OP_OP230_RecordData = "OP.OP230.RecordData";//请求记录数据 public static final String PACK_OP010_RecordSN = "PACK.OP1010.RecordSN";//请求下发SN号 public static final String PACK_OP230_RecordData = "PACK.OP230.RecordData";//请求记录数据 /** * OP240 */ public static final String OP_OP240_RecordData = "OP.OP240.RecordData";//请求记录数据 public static final String PACK_OP240_RecordData = "PACK.OP240.RecordData";//请求记录数据 public static final String OP_OP240_AngleResult = "OP.OP240.AngleResult";//请求拧紧数据 public static final String PACK_OP240_AngleResult = "PACK.OP240.AngleResult";//请求拧紧数据 /** * OP250 */ public static final String OP_OP250_RecordData = "OP.OP250.RecordData";//请求记录数据 public static final String PACK_OP250_RecordData = "PACK.OP250.RecordData";//请求记录数据 public static final String OP_OP250_AngleResult = "OP.OP250.AngleResult";//请求拧紧数据 public static final String PACK_OP250_AngleResult = "PACK.OP250.AngleResult";//请求拧紧数据 /** * OP380 */ public static final String OP_OP380_RecordData = "OP.OP380.RecordData";//请求记录数据 public static final String PACK_OP380_RecordData = "PACK.OP380.RecordData";//请求记录数据 public static final String OP_OP380_AngleResult = "OP.OP380.AngleResult";//请求拧紧数据 public static final String PACK_OP380_AngleResult = "PACK.OP380.AngleResult";//请求拧紧数据 /** * OP300 */ public static final String OP_OP300_RecordData = "OP.OP300.RecordData";//请求记录数据 public static final String PACK_OP300_RecordData = "PACK.OP300.RecordData";//请求记录数据 public static final String OP_OP300_AngleResult = "OP.OP300.AngleResult";//请求拧紧数据 public static final String PACK_OP300_AngleResult = "PACK.OP300.AngleResult";//请求拧紧数据 /** * OP270 */ public static final String PACK_OP270_RecordData = "PACK.OP270.RecordData";//请求记录数据 public static final String PACK_OP270_AngleResult = "PACK.OP270.AngleResult";//请求拧紧数据
@@ -117,7 +117,7 @@ } //保存拧紧数据 else if (("AngleResult").equals(tab)) { if("OK".equals(tabVlaue)||"NG".equals(tabVlaue)){ if("1".equals(tabVlaue)||"2".equals(tabVlaue)){ List<String> list = new ArrayList<>(); String[] suffixes = {"Torque", "Angle", "TorqueResult", "AngleResult"};
@@ -361,7 +361,7 @@ }, content: '', activeName: 'first', url: "ws://192.168.10.40:8080/websocket/message/", url: "ws://192.168.1.102:8080/websocket/message/", message: "", text_content: "", ws: null, @@ -371,7 +371,7 @@ input: "", keepReading: true, form1: { baudRate: "9600", baudRate: "115200", dataBits: "8", stopBits: "1", parity: "none",
