修改数据采集

cl

2024-05-23 ba1a7a9ef126296e2798e313dc5b43f775a1123c

 guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP050Callback.java

@@ -1,11 +1,14 @@
package cn.stylefeng.guns.plcserver.callback;


import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.stylefeng.guns.modular.bs.collectionParamConf.model.params.CollectionParamConfParam;
import cn.stylefeng.guns.modular.bs.collectionParamConf.model.result.CollectionParamConfResult;
import cn.stylefeng.guns.modular.bs.collectionParamConf.service.CollectionParamConfService;
import cn.stylefeng.guns.modular.bs.equipmentInfo.service.EquipmentInfoService;
import cn.stylefeng.guns.modular.bs.locationInfo.service.LocationInfoService;
import cn.stylefeng.guns.modular.cm.paramCollection.entity.ParamCollection;
import cn.stylefeng.guns.modular.cm.paramCollection.model.params.ParamCollectionParam;
import cn.stylefeng.guns.modular.cm.paramCollection.service.ParamCollectionService;
import cn.stylefeng.guns.modular.cm.passingStationCollection.model.params.PassingStationCollectionParam;
@@ -28,7 +31,6 @@
import cn.stylefeng.guns.plcserver.opc.GlobalVariable;
import cn.stylefeng.guns.plcserver.opc.OPCElement;

import cn.stylefeng.guns.plcserver.opc.unit.OPCUnit;
import cn.stylefeng.guns.plcserver.tool.DateTool;
import cn.stylefeng.guns.plcserver.tool.LogUtil;
import com.kangaroohy.milo.model.ReadWriteEntity;
@@ -94,7 +96,7 @@
    private static String PRODUCTION_LINE  = "OP";//产线号
    private static String LOCATION_CODE  = "OP050";//工位号
    private static List list = null;

    private static String PRODUCT_STATE = "合格";
    public OP050Callback(MiloService miloService,
                         ProductionOrdeInfoService productionOrdeInfoService,
                         PassingStationCollectionService passingStationCollectionService,
@@ -180,7 +182,9 @@
        if(null != object){
            S_PRODUCT_STATE_CODE = object.toString();
        }

        if("2".equals(S_PRODUCT_STATE_CODE)){
            PRODUCT_STATE = "不合格";
        }

        ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP050_J_PC_FINISH,true);
        miloService.writeToOpcUa(entity);//写PC完成
@@ -218,7 +222,7 @@
        logger.info("bopSfcCode:"+bopSfcCode);

        //查询COP和BOP是否合格
     /*   PassingStationCollectionParam passingStationCollectionParam = new PassingStationCollectionParam();
        PassingStationCollectionParam passingStationCollectionParam = new PassingStationCollectionParam();
        passingStationCollectionParam.setSfcCode(S_SFC_CODE);
        List<PassingStationCollectionResult> passingStationCollectionResultList =
                passingStationCollectionService.findListBySpec(passingStationCollectionParam);
@@ -233,6 +237,7 @@
        }
        //修改报工记录
        if("2".equals(S_PRODUCT_STATE_CODE) || "false".equals(isProductState)){
            isProductState = "true";
            ProductionOrderRecordsParam productionOrderRecordsParam = new ProductionOrderRecordsParam();
            productionOrderRecordsParam.setWorkOrderNo(S_ORDER_CODE);
            productionOrderRecordsParam.setProductNo(S_SFC_CODE);
@@ -240,16 +245,19 @@
            if(list.size()>0){
                ProductionOrderRecordsResult productionOrderRecordsResult = list.get(0);
                productionOrderRecordsParam.setId(productionOrderRecordsResult.getId());
                productionOrderRecordsParam.setWhetherPass("2");
                productionOrderRecordsParam.setWhetherPass("不合格");
                productionOrderRecordsParam.setEndTime(DateTool.getLocalTimeForDate());
                productionOrderRecordsService.update(productionOrderRecordsParam);
            }
        }*/
        }


        logger.info("handleFinsh PC处理完成！");
    }
    public void handleMaterial() {

        if(S_ORDER_CODE.isEmpty()){
            return;
        }
        //查询批次上料信息
        ProductionOrderBatchInfoParam productionOrderBatchInfoParam = new ProductionOrderBatchInfoParam();
        productionOrderBatchInfoParam.setWorkOrderNo(S_ORDER_CODE);
@@ -290,13 +298,36 @@
            list = collectionParamConfService.findListBySpec(collectionParamConfParam);
        }
        if(null != list && !list.isEmpty()) {

            List<String> nodeIdList = new ArrayList<>();
            for (int i = 0; i < list.size(); i++) {
                CollectionParamConfResult result = (CollectionParamConfResult) list.get(i);
                Object value = miloService.
                        readFromOpcUa(result.getGatherAddress())
                        .getValue();//读参数值
                if(null != value) {
                    ParamCollectionParam paramCollectionParam = new ParamCollectionParam();
                nodeIdList.add(result.getGatherAddress());
            }

            List<ReadWriteEntity> readWriteEntityList = new ArrayList<>();
            if(CollUtil.isNotEmpty(nodeIdList)){
                readWriteEntityList = miloService.readFromOpcUa(nodeIdList);
            }

            List<ParamCollection> paramCollectionlist = new ArrayList<>();
            if (CollUtil.isNotEmpty(nodeIdList)){
                for(int i=0;i<nodeIdList.size();i++){
                    if(ObjectUtil.isNotEmpty(readWriteEntityList.get(i).getValue())){
                        CollectionParamConfResult result = (CollectionParamConfResult) list.get(i);

                        String value = "0";
                        if (readWriteEntityList.get(i).getValue() != null){
                            value = readWriteEntityList.get(i).getValue().toString();
                        }
                        if(result.getParamName() != null && result.getParamName().contains("状态")){
                            if("2".equals(value)){
                                value = "不合格";
                            }else {
                                value = "合格";
                            }
                        }
                        ParamCollection paramCollectionParam = new ParamCollection();
                    paramCollectionParam.setParamCode(result.getParamCode());
                    paramCollectionParam.setParamName(result.getParamName());
                    paramCollectionParam.setWorkOrderNo(S_ORDER_CODE);
@@ -310,9 +341,12 @@
                    paramCollectionParam.setParamStandard(result.getParamCentral());
                    paramCollectionParam.setCollectionTime(DateTool.getLocalTimeForDate());
                    paramCollectionParam.setUnit(result.getUnit());
                    paramCollectionService.add(paramCollectionParam);
                        paramCollectionParam.setSpareField2(PRODUCT_STATE);
                        paramCollectionlist.add(paramCollectionParam);
                }
            }
                paramCollectionService.saveBatch(paramCollectionlist);
            }
        }

        logger.info("handleInfo END！");