-

admin

2024-04-25 5316c506119ad056a5640650e5e79babe4194d38

 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java

@@ -34,11 +34,17 @@

    public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

    //新自动工站
    public List<String> automaticList = Arrays.asList("OP280", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470");

    //自动工位
    public List<String> automaticList = Arrays.asList("OP300","OP280", "OP320", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540");
//    public List<String> automaticList = Arrays.asList("OP300","OP280", "OP320A","OP320B", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540");

    //采集模组工位
    public List<String> moduleCodeList = Arrays.asList("OP300","OP310", "OP320", "OP340", "OP350", "OP330");
    public List<String> moduleCodeList = Arrays.asList("OP300","OP310", "OP340", "OP350", "OP330");

    //区分pack型号的工位
    public List<String> packIdList = Arrays.asList("OP280");

    //空的
    public List<String> nullList = Arrays.asList("OP250","OP260");
@@ -104,24 +110,26 @@
//                        }

                        //自动工位
                        //plc给我们一个pack码，拿pack码校验出型号
                        if(moduleCodeList.stream().anyMatch(s -> s.equals(device))){
                            //读模组码
                            String moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue().toString();
                            String productTye = thoroughfare + "." + device + ".ProductType";
                            if(null!=moduleCode && moduleCode.length() == 24){
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(productTye).value(Integer.valueOf(moduleCode.substring(7,8))).build());
                                //进站保存数据
                        if(automaticList.stream().anyMatch(s -> s.equals(device))){
                            //plc给我们一个模组码，拿模组码校验出型号
                            if(moduleCodeList.stream().anyMatch(s -> s.equals(device))) {
                                //读模组码
                                String moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue().toString();
                                String productTye = thoroughfare + "." + device + ".ProductType";
                                if (null != moduleCode && moduleCode.length() == 24) {
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(productTye).value(Integer.valueOf(moduleCode.substring(7, 8))).build());
                                    //进站保存数据
//                              inSaveDate(thoroughfare,device)
                                //记录数据完成
                                String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                                    //记录数据完成
                                    String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";

                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());


                                //请求工单
                            }else {
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                                    //请求工单
                                } else {
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                                }
                            }
                        }else {
                            //手动工位处理逻辑