修改OP020

cl

2024-07-17 09dec78835ac5d573f56377ae22d9306459b08d4

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

@@ -161,17 +161,25 @@
                        if (ObjectUtil.isNotNull(productTypeObjcet)){
                            String productType = productTypeObjcet.toString();//产品类型
                            String materialCode = Constants.materialMap.get(productType);
                            CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                                //调用工厂MES，保存到数据库,并且将工单传给PLC (目前临时用该方法）
                                receivingWorkOrders(thoroughfare, device,materialCode);
                            });

                            //调用工厂MES，保存到数据库,并且将工单传给PLC
                            receivingWorkOrders(thoroughfare, device,materialCode);
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                            log.info("写入到工位{}的RecordDataDone数据：{}",device,11);
                        }else{
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                        }

                    }else if (Constants.OP150.contains(device)){//人工工位
                        Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
                        if (ObjectUtil.isNull(modulCodeObjcet)){
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                        }else{
                            String productNum = modulCodeObjcet.toString();
                            //将产品SN发送到前台
                            productNum = "productNum,"+ productNum;
                            WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                        }
                    }else if (Constants.ModuleList.contains(device)){//有模组码的工位
                        Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
                        if (ObjectUtil.isNull(modulCodeObjcet)){
@@ -194,9 +202,21 @@
                        Integer result = 21;
                        //读取电芯码
                        List<String> cellCodeList = readCellCodeList(thoroughfare, device);
                        if(ObjectUtil.isNull(cellCodeList) || cellCodeList.size() != 4){
                        if(ObjectUtil.isNull(cellCodeList) || cellCodeList.size() != 4 ){
                            result = 23;
                        }else{

                            String cellCode1 = cellCodeList.get(0);
                            String cellCode2 = cellCodeList.get(1);
                            String cellCode3 = cellCodeList.get(2);
                            String cellCode4 = cellCodeList.get(3);
                            if ((!cellCode1.isEmpty() && cellCode2.isEmpty()) || (cellCode1.isEmpty() && !cellCode2.isEmpty())
                            || (!cellCode3.isEmpty() && cellCode4.isEmpty()) || (!cellCode4.isEmpty() && cellCode3.isEmpty())) {
                                result = 23;
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
                                return;
                            }

                            result = savePassingStation(thoroughfare, device,cellCodeList);//保存过站
                            if(result == 21) {
                                result = saveParamCollection(device,cellCodeList);//保存参数，发送工厂MES
@@ -236,38 +256,6 @@
            log.error(e.getMessage());
        }
    }
/*    public void receivingWorkOrders(String thoroughfare ,String device) {
        String paramProductNum = "";
        try {

            List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>()
                    .eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE));//工单状态

            if (CollUtil.isNotEmpty(orderList)){
                Long id = orderList.get(0).getId();
                String productNum = orderList.get(0).getProductNum();//模组码
                String orderNum = orderList.get(0).getWorkOrderNo();
                //下发产品模组码
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build());
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(orderNum).build());
                //miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(1).build());

                //更新工单状态为执行中
                OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
                omProductionOrdeInfo.setId(id);
                omProductionOrdeInfo.setOrderStatus("3");
                omProductionOrdeInfoService.updateOmProductionOrdeInfo(omProductionOrdeInfo);

                //将产品SN发送到前台
                productNum = "productNum,"+ productNum;
                WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
            }*//*else{
                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(2).build());//没有要生产的工单
            }*//*
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }*/

    public void receivingWorkOrders(String thoroughfare ,String device ,String materialCode)
    {
@@ -298,12 +286,15 @@
                omProductionOrdeInfo.setCreateUser("工厂MES");
                omProductionOrdeInfoService.save(omProductionOrdeInfo);

                //发送给前台
                WebSocketUsers.sendMessageToUserByText(map.get(device), dataObject.getStr("productNum"));
                String productNum = dataObject.getStr("productNum");
                String orderNum = dataObject.getStr("productionOrderNum");
                //下发产品模组码
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build());
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(orderNum).build());

                //写PLC
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(dataObject.getStr("productNum")).build());
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(dataObject.getStr("productionOrderNum")).build());
                //将产品SN发送到前台
                productNum = "productNum,"+ productNum;
                WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);

            }
        } catch (Exception e) {
@@ -330,11 +321,11 @@
        try {
            List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(readList);//电芯码
            for (ReadWriteEntity readWriteEntity : readWriteEntityList) {
                if (ObjectUtil.isNotNull(readWriteEntity.getValue()) && !"".equals(readWriteEntity.getValue().toString().trim())){
                if (ObjectUtil.isNotNull(readWriteEntity.getValue()) && !readWriteEntity.getValue().toString().trim().isEmpty()){
                    cellCodeList.add(readWriteEntity.getValue().toString());//封装电芯码
                }/*else{
                }else{
                    cellCodeList.add("");//封装电芯码
                }*/
                }
            }

        } catch (Exception e) {
@@ -509,7 +500,7 @@

                    //如果220工位，进行报工
                    if("M1OP220".equals(device)) {
                        RestfulService.getWorkReportResultFeedback(moduleCode, "M1OP220", format.format(new Date()));
                        getWorkReportResultFeedback(moduleCode, "M1OP220", format.format(new Date()));
                    }

                    //上传到工厂mes
@@ -526,7 +517,7 @@
                    parentVO.setProductNum(moduleCode);

                    //添加基础数据
                    List<ChildVO> basicList = getCollectParamBasicData(device);
                    List<ChildVO> basicList = getCollectParamBasicData(device,moduleCode);
                    mesList.addAll(basicList);

                    parentVO.setCheckList(mesList);
@@ -770,7 +761,7 @@
                            }

                            //添加基础数据
                            List<ChildVO> basicList = getCollectParamBasicData(device);
                            List<ChildVO> basicList = getCollectParamBasicData(device,cellCodeList.get(i));
                            mesChildList.addAll(basicList);

                            parentVO.setCheckList(mesChildList);//参数
@@ -943,10 +934,12 @@
    /**
     * 获取采集参数基础数据
     * @param stationCode
     * @param sfcCode
     * @return list
     */
    public static List<ChildVO> getCollectParamBasicData(String stationCode) {
    public static List<ChildVO> getCollectParamBasicData(String stationCode,String sfcCode) {
        List<ChildVO> basicList = new ArrayList<>();
        List<DaParamCollection> collectionList = new ArrayList<>();
        try {
            //查询参数配置表
            List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
@@ -963,7 +956,18 @@
                    childVO.setCheckResult("1");
                    childVO.setCheckTime(format.format(new Date()));
                    basicList.add(childVO);

                    DaParamCollection daParamCollection = new DaParamCollection();
                    daParamCollection.setSfcCode(sfcCode);//模组码
                    daParamCollection.setParamCode(conf.getCollectParameterId());//参数编码
                    daParamCollection.setParamName(conf.getCollectParameterName());//参数名称

                    daParamCollection.setParamValue(conf.getParamCentral());//参数值
                    daParamCollection.setLocationCode(stationCode);//工位
                    daParamCollection.setCollectionTime(new Date());//采集时间
                    collectionList.add(daParamCollection);//封装参数采集list
                }
                daParamCollectionService.insertBatch(collectionList);
            }
            return basicList;
        }catch (Exception e) {