jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -58,9 +58,10 @@ public List<String> getSubList(){ List<String> lists = new ArrayList<>(); lists.add(OPCElement.PACK_OP230_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP230_AngleResult);//请求记录数据 lists.add(OPCElement.PACK_OP240_RecordData);//请求记录数据. lists.add(OPCElement.PACK_OP240_AngleResult);//请求记录数据 lists.add(OPCElement.PACK_OP2502_RecordData);//请求记录数据. lists.add(OPCElement.PACK_OP2502_AngleResult);//请求记录数据 lists.add(OPCElement.PACK_OP260_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP260_AngleResult);//请求记录数据 lists.add(OPCElement.PACK_OP270_RecordData);//请求记录数据 @@ -87,15 +88,15 @@ lists.add(OPCElement.PACK_OP460_AngleResult);//请求记录数据 lists.add(OPCElement.PACK_OP500_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP500_AngleResult);//请求记录数据 lists.add(OPCElement.PACK_OP280_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP320_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP340_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP350_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP360_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP370_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP390_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP470_RecordData);//请求记录数据 // // lists.add(OPCElement.PACK_OP280_RecordData);//请求记录数据 // lists.add(OPCElement.PACK_OP320_RecordData);//请求记录数据 // lists.add(OPCElement.PACK_OP340_RecordData);//请求记录数据 // lists.add(OPCElement.PACK_OP350_RecordData);//请求记录数据 // lists.add(OPCElement.PACK_OP360_RecordData);//请求记录数据 // lists.add(OPCElement.PACK_OP370_RecordData);//请求记录数据 // lists.add(OPCElement.PACK_OP390_RecordData);//请求记录数据 // lists.add(OPCElement.PACK_OP470_RecordData);//请求记录数据 return lists; } jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
@@ -19,6 +19,9 @@ public static final String PACK_OP240_RecordData = "PACK.OP240.RecordData";//请求记录数据 public static final String PACK_OP240_AngleResult = "PACK.OP240.AngleResult";//请求拧紧数据 public static final String PACK_OP2502_RecordData = "PACK.OP250-2.RecordData";//请求记录数据 public static final String PACK_OP2502_AngleResult = "PACK.OP2502-2.AngleResult";//请求拧紧数据 /** * OP260 */ jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -73,7 +73,7 @@ public void onSubscribe(String identifier, Object value) { try { if(null != value) { if(null != value && Integer.valueOf(value.toString())!= 0) { String[] nodes = identifier.split("[.]"); String thoroughfare = nodes[0];//通道 String device = nodes[1];//设备 @@ -143,7 +143,7 @@ recordDataDoneValue = outSaveDate(thoroughfare,device); //记录数据完成 String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone"; miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(RecordDataDoneAddress)).build()); miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(recordDataDoneValue)).build()); }else { //手动工位 WebSocketUsers.sendMessageToUserByText(map.get(device), "END"); jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
@@ -6,6 +6,11 @@ import org.springframework.web.bind.annotation.RequestParam; public class RestfulService { public static void main(String[] args) { String str = "uuuuuu11uuuuuuuuuuuuuuu"; System.out.println(str.length()); } public static final String getRealmName = "https://imes-test-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration"; public static final String postRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface"; @@ -77,4 +82,5 @@ .execute(); return response.body(); } //HttpResponse response = HttpRequest.post(url).body(JSONUtil.toJsonStr(vo)).execute(); } jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -95,11 +95,11 @@ <!-- </el-col>--> <!-- </el-row>--> <el-row style="margin-top: 20px"> <el-row v-show="showInput" style="margin-top: 20px"> <el-col></el-col> <span style="width: 130px;" class="head-font">预装总成号 : {{headContent.yzSfcCode}}</span> </el-row> <el-row style="margin-top: 20px"> <el-row v-show="showInput" style="margin-top: 20px"> <!-- <el-button @click="Release" type="primary">绑定</el-button>--> <el-button @click="bindYzSfc" type="primary">绑定</el-button> @@ -322,6 +322,7 @@ name: "stationTerminal", data() { return { showInput: true, serialPortContent: '', // 查询参数 formulaChildParams: { @@ -369,7 +370,7 @@ }, content: '', activeName: 'first', url: "ws://192.168.1.101:8080/websocket/message/", url: "ws://192.168.1.103:8080/websocket/message/", message: "", text_content: "", ws: null,
