修改参数采集

cl

2024-07-11 35c489d86b027462dca8bdd06e5fb6dc066fa428

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

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

                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
@@ -227,7 +228,7 @@
            log.error(e.getMessage());
        }
    }
    public void receivingWorkOrders(String thoroughfare ,String device) {
/*    public void receivingWorkOrders(String thoroughfare ,String device) {
        String paramProductNum = "";
        try {

@@ -252,21 +253,21 @@
                //将产品SN发送到前台
                productNum = "productNum,"+ productNum;
                WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
            }/*else{
            }*//*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)
    public void receivingWorkOrders(String thoroughfare ,String device ,String materialCode)
    {
        String paramProductNum = "";
        try {
            // 查询最新的工单信息
            OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
            String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "MOP100");
            String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode);
            JSONObject jsonObject = new JSONObject(orderJsonString);
            // 从JSONObject中获取data对象
            JSONObject dataObject = jsonObject.getJSONObject("data");
@@ -297,7 +298,7 @@
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }*/
    }

    /**
     * 读取电芯码