修改数据采集

cl

2024-01-19 e0fac38b26845f25de479783e0c76cf12a5311e0

 guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP170/impl/OP170ServerInterfaceImpl.java

@@ -8,9 +8,17 @@
import cn.stylefeng.guns.modular.cm.paramCollection.service.ParamCollectionService;
import cn.stylefeng.guns.modular.cm.passingStationCollection.model.params.PassingStationCollectionParam;
import cn.stylefeng.guns.modular.cm.passingStationCollection.service.PassingStationCollectionService;
import cn.stylefeng.guns.modular.dq.materialTraceability.model.params.MaterialTraceabilityParam;
import cn.stylefeng.guns.modular.dq.materialTraceability.service.MaterialTraceabilityService;
import cn.stylefeng.guns.modular.om.productionOrdeInfo.model.params.ProductionOrdeInfoParam;
import cn.stylefeng.guns.modular.om.productionOrdeInfo.model.result.ProductionOrdeInfoResult;
import cn.stylefeng.guns.modular.om.productionOrdeInfo.service.ProductionOrdeInfoService;
import cn.stylefeng.guns.modular.om.productionOrderBatchInfo.model.params.ProductionOrderBatchInfoParam;
import cn.stylefeng.guns.modular.om.productionOrderBatchInfo.model.result.ProductionOrderBatchInfoResult;
import cn.stylefeng.guns.modular.om.productionOrderBatchInfo.service.ProductionOrderBatchInfoService;
import cn.stylefeng.guns.modular.om.productionOrderRecords.model.params.ProductionOrderRecordsParam;
import cn.stylefeng.guns.modular.om.productionOrderRecords.model.result.ProductionOrderRecordsResult;
import cn.stylefeng.guns.modular.om.productionOrderRecords.service.ProductionOrderRecordsService;
import cn.stylefeng.guns.plcserver.opc.GlobalVariable;
import cn.stylefeng.guns.plcserver.opc.OPCComm;
import cn.stylefeng.guns.plcserver.opc.unit.OPCUnit;
@@ -47,10 +55,34 @@
    private static String GROUP_NAME  = "OP170_P";//工位号
    private static List list = null;
    private static Group group = null;

    private int count = 0;

    /**
     * 设置心跳标志位，保存到全局变量
     */
    public void setHeartbeat(String value) {
        if ("false".equals(value)) {
            OPCUnit.write(opc.getOP170_F_HEART_BEAT(), "true");
            GlobalVariable.OP170_F_HEART_BEAT = true;
            count = 0;
        } else {
            count++;
        }
        // 循环读取频率是：500ms一次，如果超过6次，也就是3s认定超时
        if (count > GlobalVariable.HEART_MAX_COUNT) {
            GlobalVariable.OP170_F_HEART_BEAT = false;
        }
    }

    @Override
    public synchronized void monitor() {
        String ecpStr = "";//异常记录标记
        try{

           /* String isHeartBeat = OPCUnit.read(opc.getOP170_F_HEART_BEAT());
            setHeartbeat(isHeartBeat);*/

            if(GlobalVariable.OP170_F_HEART_BEAT) {

                //PC读工单
@@ -68,8 +100,15 @@
                if(isPLCFinish.equals("true")){
                    String isFinish = OPCUnit.read(opc.getOP170_J_PC_FINISH());//PC操作完成
                    if(isFinish.equals("false")){
                        handleInfo();
                        logger.info("handleFinsh开始时间:"+new Date());
                        handleFinsh();
                        logger.info("handleFinsh完成时间:"+new Date());
                        logger.info("handleInfo开始时间:"+new Date());
                        handleInfo();
                        logger.info("handleInfo完成时间:"+new Date());
                        logger.info("handleMaterial开始时间:"+new Date());
                        handleMaterial();
                        logger.info("handleMaterial完成时间:"+new Date());
                    }
                }

@@ -95,6 +134,40 @@
        S_SFC_CODE = OPCUnit.read(opc.getOP170_S_SFC_CODE());//总成编码
        OPCUnit.write(opc.getOP170_J_PC_WRITE_ORDER(), "true"); //PC读工单完成
        logger.info("OP170工位,handleOrder PC处理完成！");
    }

    public void handleMaterial() {

        //查询批次上料信息
        ProductionOrderBatchInfoParam productionOrderBatchInfoParam = new ProductionOrderBatchInfoParam();
        productionOrderBatchInfoParam.setWorkOrderNo(S_ORDER_CODE);
        productionOrderBatchInfoParam.setLocationCode(LOCATION_CODE);
        ProductionOrderBatchInfoService productionOrderBatchInfoService = opc.productionOrderBatchInfoService;
        List<ProductionOrderBatchInfoResult> list1 = productionOrderBatchInfoService.findListBySpec(productionOrderBatchInfoParam);
        for(int i=0;i<list1.size();i++){
            ProductionOrderBatchInfoResult productionOrderBatchInfoResult = list1.get(i);
            int remainingQuantity =  productionOrderBatchInfoResult.getResidueQuantity();//剩余数量
            if(remainingQuantity>0){
                //新增物料追溯
                MaterialTraceabilityParam materialTraceabilityParam = new MaterialTraceabilityParam();
                materialTraceabilityParam.setWorkOrderNo(S_ORDER_CODE);
                materialTraceabilityParam.setProductCode(S_PRODUCT_CODE);
                materialTraceabilityParam.setProductNo(S_SFC_CODE);
                materialTraceabilityParam.setLineCode(PRODUCTION_LINE);
                materialTraceabilityParam.setLocationCode(LOCATION_CODE);
                materialTraceabilityParam.setAssemblyQty(1);
                materialTraceabilityParam.setAssemblyTime(DateTool.getLocalTimeForDate());
                materialTraceabilityParam.setMaterialCode(productionOrderBatchInfoResult.getMaterialCode());//物料编码
                materialTraceabilityParam.setMaterialBatchNo(productionOrderBatchInfoResult.getBatch());//物料批次

                MaterialTraceabilityService materialTraceabilityService = opc.materialTraceabilityService;
                materialTraceabilityService.add(materialTraceabilityParam);
                //更新剩余数量
                productionOrderBatchInfoParam.setId(productionOrderBatchInfoResult.getId());
                productionOrderBatchInfoParam.setResidueQuantity(remainingQuantity-1);//剩余数量
                productionOrderBatchInfoService.update(productionOrderBatchInfoParam);
            }
        }
    }

    //PC读参数信息
@@ -161,6 +234,24 @@
        }
        //处理过站信息
        String S_PRODUCT_STATE_CODE = OPCUnit.read(opc.getOP170_S_PRODUCT_STATE_CODE());

        //修改报工记录
        ProductionOrderRecordsParam productionOrderRecordsParam = new ProductionOrderRecordsParam();
        productionOrderRecordsParam.setWorkOrderNo(S_ORDER_CODE);
        productionOrderRecordsParam.setProductNo(S_SFC_CODE);
        ProductionOrderRecordsService productionOrderRecordsService = opc.productionOrderRecordsService;

        List<ProductionOrderRecordsResult> list2 = productionOrderRecordsService.findListBySpec(productionOrderRecordsParam);
        if(list2.size()>0){
            ProductionOrderRecordsResult productionOrderRecordsResult = list2.get(0);
            productionOrderRecordsParam.setId(productionOrderRecordsResult.getId());
            productionOrderRecordsParam.setWhetherPass(S_PRODUCT_STATE_CODE);
            productionOrderRecordsParam.setEndTime(DateTool.getLocalTimeForDate());
            productionOrderRecordsService.update(productionOrderRecordsParam);
        }



        PassingStationCollectionParam param = new PassingStationCollectionParam();
        param.setWorkOrderNo(S_ORDER_CODE);
        param.setProductCode(S_PRODUCT_CODE);
@@ -178,19 +269,19 @@
        //更新工单完成数量
        ProductionOrdeInfoParam orderParam = new ProductionOrdeInfoParam();
        orderParam.setWorkOrderNo(S_ORDER_CODE);
        ProductionOrdeInfoService productionOrdeInfoService = opc.productionOrdeInfoService;
        List<ProductionOrdeInfoResult> list = productionOrdeInfoService.findListBySpec(orderParam);
        if(list.size()>0) {
            ProductionOrdeInfoResult result = list.get(0);
            orderParam.setId(result.getId());
            if (null == result.getActualQty() || "".equals(result.getActualQty())){
                result.setActualQty(0);
        if(!"".equals(S_ORDER_CODE)&&null!=S_ORDER_CODE){
            ProductionOrdeInfoService productionOrdeInfoService = opc.productionOrdeInfoService;
            List<ProductionOrdeInfoResult> list = productionOrdeInfoService.findListBySpec(orderParam);
            if(list.size()>0) {
                ProductionOrdeInfoResult result = list.get(0);
                orderParam.setId(result.getId());
                if (null == result.getActualQty() || "".equals(result.getActualQty())){
                    result.setActualQty(0);
                }
                orderParam.setActualQty(result.getActualQty()+1);
                productionOrdeInfoService.update(orderParam);
            }
            orderParam.setActualQty(result.getActualQty()+1);
            productionOrdeInfoService.update(orderParam);
        }


        OPCUnit.write(opc.getOP170_J_PC_FINISH(), "true"); //PC完成

        logger.info("OP170工位,handleFinsh PC处理完成！");