修改采集

cl

2024-07-29 0a65c6094ad3cbdae90348f2548d49e875ede1b7

修改采集

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

@@ -309,7 +309,6 @@

    public synchronized void receivingWorkOrders(String thoroughfare ,String device ,String materialCode)
    {
        String paramProductNum = "";
        try {

            //先查询表中是否有剩余工单
@@ -321,8 +320,6 @@
                Long id = orderList.get(0).getId();
                String productNum = orderList.get(0).getProductNum();//模组码
                String orderNum = orderList.get(0).getWorkOrderNo();

                paramProductNum = productNum;

                //下发产品模组码
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build());
@@ -337,13 +334,14 @@

                log.info("请求工厂MES工单：入参device{},materialCode：{}", device, materialCode);
                String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode);
                log.info("请求工厂MES工单：出参pack：{}", orderJsonString);

                JSONObject jsonObject = new JSONObject(orderJsonString);
                // 从JSONObject中获取data对象
                JSONObject dataObject = jsonObject.getJSONObject("data");
                String code = jsonObject.getStr("code");
                // 判断接单是否成功
                if(code.equals("success")) {
                    log.info("请求工厂MES工单：入参pack{}出参pack：{}", paramProductNum, dataObject.getStr("productNum"));
                    OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
                    omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
                    omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
@@ -1072,6 +1070,11 @@
            );
            if (CollUtil.isNotEmpty(list)){
                for(DaCollectionParamConf conf:list){
                    //1P1S生成
                    if(conf.getCollectParameterId().equals("OCV_1P1SMID")){
                        String result = "";
                        conf.setParamCentral(result);
                    }
                    ChildVO childVO = new ChildVO();
                    childVO.setItemCode(conf.getCollectParameterId());//参数
                    childVO.setItemType(conf.getItemType());