-

admin

2024-06-18 bdb4046a1ed5358a94cc9ce846f2a1ec88e5d5ec

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

@@ -193,10 +193,10 @@
                        if(automaticList.stream().anyMatch(s -> s.equals(device))){
                            //自动工位
                            //出站保存数据
                            recordDataDoneValue = outSaveDate(thoroughfare,device);
                            outSaveDate(thoroughfare,device);
                            //记录数据完成
                            String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(recordDataDoneValue)).build());
                            /*String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(recordDataDoneValue)).build());*/
                        }else {
                            //手动工位
//                            if(device.contains("OP330")){
@@ -271,26 +271,22 @@
    /**
     * 出站保存数据
     */
    public String outSaveDate(String thoroughfare,String device) {
    public void outSaveDate(String thoroughfare,String device) {
        String snCode = "";
        String result = "";
        String read = thoroughfare + "." + device + ".";

        try {
            if(nullList.stream().noneMatch(s -> s.equals(device))){
            if(nullList.stream().noneMatch(s -> s.equals(device))){//删除……………………………………………………
                if(moduleCodeList.stream().anyMatch(s -> s.equals(device))){
                    read = read + "ModuleCode";

                }else {
                    read = read + "PACKCode";
                }
            }
            if(device.equals("OP365")){
                try {
                    result = saveStationInfo365(thoroughfare,device);
                    return result;
//                    return saveStationInfo365(thoroughfare,device);
//                    return result;
                   saveStationInfo365(thoroughfare,device);
                }catch (Exception e){
                    e.printStackTrace();
                }
@@ -298,7 +294,8 @@
                snCode = miloService.readFromOpcUa(read).getValue().toString();

                if(null == snCode || "".equals(snCode)){
                    result = "22";
                    String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf("22")).build());
                }else{

                    String workOrderNo = "";
@@ -324,19 +321,17 @@
                        //1、更新工单信息
                        updateOrderInfo(snCode);
                    }

                    try{
                        daParamCollectionService.automaticWorkstationPushGeelycvMesFeedback(snCode,device,daParamCollectionList);
                    }catch (Exception e){
                    }
                    result = "21";

                }

            }
        }catch (Exception e) {
            logger.error("出站保存数据异常："+e);
        }
        return result;
    }


@@ -374,6 +369,7 @@
     * 保存过站采集
     */
    public void saveStationInfo(String packCode,String thoroughfare,String device,String workOrderNo,String productCode) throws Exception {
        logger.info("进入工位{}-方法saveStationInfo",device);
        SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
        sdf.setTimeZone(TimeZone.getTimeZone("GMT+8")); // CST通常表示中国标准时间，即东八区
        String prefix = thoroughfare+"."+device+".";
@@ -392,9 +388,11 @@
        daPassingStationCollection.setOutboundTime(format.parse(TimeUtil.test(end)));//出站时间
        daPassingStationCollection.setOutRsSign(stationStatus);//出站是否合格
        daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection);
        logger.info("结束工位{}-方法saveStationInfo",device);
    }

    public static List<DaParamCollection> SaveParamData(String packCode,String thoroughfare,String device,String workOrderNo,String productType) throws Exception {
        logger.info("进入工位{}-方法SaveParamData",device);
        List<DaCollectionParamConf> list;
        DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
        daCollectionParamConf.setGatherAddress(thoroughfare+ "." + device);
@@ -408,23 +406,16 @@

        if(!nodeIdList.isEmpty()){
            List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(nodeIdList);
            for (int i = 0; i < readWriteEntityList.size(); i++) {
            for(int i=0;i<nodeIdList.size();i++){
                if(readWriteEntityList.get(i).getValue() == null){
                    readWriteEntityList.get(i).setValue(" ");
                }
            }

            for(int i=0;i<nodeIdList.size();i++){
                if(!readWriteEntityList.get(i).getValue().toString().equals("0.0")){
                    String tt = readWriteEntityList.get(i).getValue().toString();
                String paramValue = readWriteEntityList.get(i).getValue().toString();
                    DaParamCollection ParamCollection = new DaParamCollection();
                    ChildVO childVO = new ChildVO();
                    ParamCollection.setParamCode(list.get(i).getCollectParameterId());
                    ParamCollection.setLocationCode(device);
                    if(tt.contains("Time")){
//                        String str = TimeUtil.getTimestamp(TimeUtil.stringProcessing(tt));
//                        ParamCollection.setParamValue(str);
                        ParamCollection.setParamValue(TimeUtil.test(TimeUtil.stringProcessing(tt)));
                if(paramValue.contains("Time")){
                    ParamCollection.setParamValue(TimeUtil.test(TimeUtil.stringProcessing(paramValue)));
                    }else {
                        ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
                    }
@@ -440,22 +431,22 @@
                    ParamCollection.setParamUpper(list.get(i).getParamUpper());
                    ParamCollection.setParamLower(list.get(i).getParamLower());
                    ParamCollection.setUnit(list.get(i).getCollectParameterUnit());
                    //ParamCollection.setState("合格");
                    ParamCollection.setType(list.get(i).getCollectParameterType());
                    ParamCollection.setCollectionTime(new Date());
                    ParamCollection.setWorkOrderNo(workOrderNo);
                    ParamCollection.setProductCode(productType);
                    daParamCollectionlist.add(ParamCollection);
//                    daParamCollectionService.insertDaParamCollection(ParamCollection);
                }
            }
        String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf("21")).build());
        logger.info("给工位{}写了21",device);
            daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);

        }
        List<DaParamCollection> baseDataList = addBaseData(workOrderNo,productType,device,packCode);
        for (int i = 0; i < baseDataList.size(); i++){
            daParamCollectionlist.add(baseDataList.get(i));
        }
        logger.info("结束工位{}-方法SaveParamData",device);
        return daParamCollectionlist;
    }

@@ -575,7 +566,7 @@
    /**
     * 保存过站采集
     */
    public String saveStationInfo365(String thoroughfare,String device) throws Exception {
    public void saveStationInfo365(String thoroughfare,String device) throws Exception {
        String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
        String prefix = thoroughfare+"."+device+".";
        List<DaPassingStationCollection> passingStationCollections = new ArrayList<>();
@@ -612,13 +603,11 @@
                passingStationCollections.add(daPassingStationCollection);
            }
            daPassingStationCollectionService.saveBeachDaPassingStationCollection(passingStationCollections);
//            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
            logger.info("工位{}回复21",device);

            return "21";
        }else {
//            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build());
            return "22";
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build());
        }
    }