修改采集参数

cl

2024-07-30 d819b10d18dc61a53c6f375d82f29d9f953cce4e

修改采集参数

 jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java

@@ -59,10 +59,10 @@
    public static final Integer INT_THREE= 3;
    public static final Integer INT_FOUR= 4;
    public static final Integer INT_ZERO= 0;
 /*   public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/";
    public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface/";*/
    public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/";
    public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/interface/";
    public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/";
    public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface/";
/*    public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/";
    public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/interface/";*/
    public static final String FACTORY_EMS_SITE_CODE = "3983";



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

@@ -3,16 +3,13 @@

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.constant.Constants;
import com.jcdm.main.da.cellData.domain.DaCellData;
import com.jcdm.main.da.cellData.service.IDaCellDataService;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
@@ -20,7 +17,6 @@
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.da.testDeviceInterfaceTemp.domain.DaTestDeviceInterfaceTemp;
import com.jcdm.main.da.testDeviceInterfaceTemp.service.IDaTestDeviceInterfaceTempService;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
@@ -32,9 +28,7 @@
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;

import javax.websocket.Session;
import java.text.SimpleDateFormat;
@@ -106,18 +100,266 @@

    public void subHandle(String thoroughfare,String device,String tab,String valueString){
        try{
            //出入站
            if (Constants.RECORD_DATA.equals(tab)) {
            if (Constants.RECORD_DATA.equals(tab)) {  //出入站
                if (Constants.ONE.equals(valueString)) {//入站
                    Integer recordDataDone = 11;
                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(recordDataDone).build());
                } else if(Constants.TWO.equals(valueString)){//出站
                    Integer recordDataDone = 21;
                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(recordDataDone).build());
                    Integer result = 21;
                    //先判断是否有产品SN
                    Object snCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".SNCode").getValue();
                    Object orderObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".WorkOrderNumber").getValue();
                    if (ObjectUtil.isNull(snCodeObjcet)){
                        result = 25;//未获取要生产的工单，请联系管理员
                    }else{
                        String snCode = snCodeObjcet.toString();//产品SN
                        String orderNumber = orderObjcet.toString();//工单号
                        Object stationStatusObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus").getValue();//站状态地址
                        if (ObjectUtil.isNotNull(stationStatusObjcet)){
                            String stationStatus = stationStatusObjcet.toString();
                            result = savePassingStation(thoroughfare, device,snCode,orderNumber,stationStatus);//保存过站
                            if(result == 21) {
                                result = saveParamCollection(device,snCode,orderNumber,stationStatus);//保存参数，发送工厂MES
                            }
                        }else{
                            result = 23;
                            log.info("读取到工位{}StationStatus数据：{},返回RecordDataDone的值为{}",device,"IS NULL！",result);
                        }
                    }
                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
                }
            }else if (Constants.RECORD_SN.equals(tab)){//请求产品序列号
                if (Constants.ONE.equals(valueString)){
                    Integer recordSNDone = 11;
                    //进站PLC给产品类型，MES读取产品类型
                    Object productTypeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ProductType").getValue();//产品类型
                    if (ObjectUtil.isNotNull(productTypeObjcet)){
                        String productType = productTypeObjcet.toString();//产品类型
                        String materialCode = Constants.materialMap.get(productType);
                        //接收工单，保存到数据库,并且将工单传给PLC
                        CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                            receivingWorkOrders(thoroughfare, device,materialCode);
                        });
                    }else{
                        recordSNDone = 12;
                    }
                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(recordSNDone).build());
                }
            }
        }catch (Exception e) {
            log.error(e.getMessage());
        }
    }

    /**
     * 保存过站数据
     * @param thoroughfare 通道
     * @param device 工位
     * @param snCode 产品序列号
     * @param stationStatus 站状态
     * @return Integer
     * @throws Exception e
     */
    private static Integer savePassingStation(String thoroughfare, String device,String snCode,String orderNumber,String stationStatus){
        Integer result = 21;
        try {
            //读进站时间
            Date startTime = new Date();
            ReadWriteEntity startTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime");//进站时间
            if (ObjectUtil.isNotNull(startTimeRead.getValue())){
                startTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(startTimeRead.getValue().toString())));
            }else{
                result = 23;
                log.info("读取到工位{}的StartTime数据：{},返回RecordDataDone的值为{}",device,"IS NULL！",result);
                return result;
            }

            DaPassingStationCollection passingStationCollection = new DaPassingStationCollection();
            passingStationCollection.setSfcCode(snCode);//产品序列号
            passingStationCollection.setWorkOrderNo(orderNumber);//工单号
            passingStationCollection.setLocationCode(device);//工位
            passingStationCollection.setInboundTime(startTime);//进站时间
            passingStationCollection.setOutboundTime(new Date());//出站时间
            passingStationCollection.setOutRsSign(stationStatus);//站状态值
            passingStationCollection.setCollectionTime(new Date());//采集时间
            daPassingStationCollectionService.save(passingStationCollection);

        } catch (Exception e) {
            throw new RuntimeException(e);
        }

        return result;
    }

    /**
     * 保存参数数据和发送工厂MES
     * @param device 工位
     * @param snCode 产品SN
     * @param orderNumber 工单号
     * @param stationStatus 站状态
     * @return result
     * @throws Exception e
     */
    private static Integer saveParamCollection(String device,String snCode,String orderNumber,String stationStatus){
        Integer result = 21;//返回结果
        try {
            //查询参数配置表
            List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
                    .eq(DaCollectionParamConf::getProcessesCode, device)//工位
                    .eq(DaCollectionParamConf::getWhetherToCollect, Constants.ONE)//是否采集
            );
            if (CollUtil.isNotEmpty(list)){

                List<String> collect = list.stream()
                        .map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
                List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(collect);

                List<DaParamCollection> collectionList = new ArrayList<>();
                List<ChildVO> mesList = new ArrayList<>();
                for (int i = 0; i < readWriteEntityList.size(); i++) {
                    DaParamCollection daParamCollection = new DaParamCollection();
                    daParamCollection.setSfcCode(snCode);//产品SN
                    daParamCollection.setWorkOrderNo(orderNumber);//工单号
                    daParamCollection.setParamCode(list.get(i).getCollectParameterId());//参数编码
                    daParamCollection.setParamName(list.get(i).getCollectParameterName());//参数名称
                    String paramValue = "";
                    if (ObjectUtil.isNotNull(readWriteEntityList.get(i).getValue())){
                        paramValue = readWriteEntityList.get(i).getValue().toString();//参数值
                        if("DATE".equals(list.get(i).getCollectParameterType()) && !paramValue.isEmpty()){
                            paramValue = format.parse(TimeUtil.test(TimeUtil.stringProcessing(paramValue))).toString();
                        }else if("MODEL".equals(list.get(i).getCollectParameterType()) && !paramValue.isEmpty()){
                            paramValue = Constants.materialMap.get(paramValue);
                        }
                    }
                    daParamCollection.setParamValue(paramValue);//参数值
                    daParamCollection.setLocationCode(device);//工位
                    daParamCollection.setCollectionTime(new Date());//采集时间
                    collectionList.add(daParamCollection);//封装参数采集list

                    //发送给工厂mes参数封装
                    ChildVO childVO = new ChildVO();
                    childVO.setItemCode(list.get(i).getCollectParameterId());//参数编码
                    childVO.setItemType(list.get(i).getItemType());
                    childVO.setItemValue(paramValue);//参数值
                    childVO.setItemText(list.get(i).getCollectParameterName());
                    childVO.setCheckResult("1");
                    childVO.setCheckTime(format.format(new Date()));
                    mesList.add(childVO);
                }

               /* CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                    //插入参数采集表
                    daParamCollectionService.insertBatch(collectionList);
                    //生产报工（首工位和末工位）
                    if(Constants.OP010.equals(device)) {
                        reportFactoryMes(snCode, device, format.format(new Date()));
                    }
                    //上传到工厂mes
                    ParentVO parentVO = new ParentVO();
                    parentVO.setStationCode(device);//工位
                    parentVO.setSiteCode("3983");
                    parentVO.setRecordId(UUID.randomUUID().toString());
                    if("2".equals(stationStatus)){//工站状态
                        parentVO.setTotalResult("0");
                    }else {
                        parentVO.setTotalResult("1");
                    }
                    parentVO.setProductNum(snCode);
                    parentVO.setCheckList(mesList);
                    log.info("执行工厂MES方法start，工位号{} 传入数据：{}",device ,parentVO);
                    HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
                    log.info("执行工厂MES方法end，工位号{} 返回数据：{}",device,execute.body());

                });*/
            }
        }catch (Exception e) {
            throw new RuntimeException(e);
        }
        return result;
    }

    /**
     * 接收工单信息
     * @param thoroughfare 通道
     * @param device 工位
     * @param materialCode 物料号
     * @throws Exception e
     */
    public synchronized void receivingWorkOrders(String thoroughfare ,String device ,String materialCode)
    {
        try {
            String productNum = "";//模组码
            String orderNum = "";//工单号

            //先查询表中是否有剩余工单
            List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>()
                    .eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE)
                    .eq(OmProductionOrdeInfo::getStationCode,device)//工位
                    .eq(OmProductionOrdeInfo::getProductCode,materialCode));//产品类型
            if (CollUtil.isNotEmpty(orderList)){
                Long id = orderList.get(0).getId();
                productNum = orderList.get(0).getProductNum();//模组码
                orderNum = orderList.get(0).getWorkOrderNo();
            }else{
                // 查询最新的工单信息
                OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();

                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")) {
                    OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
                    omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
                    omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
                    omProductionOrdeInfo.setStationCode(device);
                    omProductionOrdeInfo.setProductCode(dataObject.getStr("materialCode"));
                    omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity")));
                    omProductionOrdeInfo.setOnlineCompletionMark("0");
                    omProductionOrdeInfo.setSfResult("0");
                    omProductionOrdeInfo.setProductModel(dataObject.getStr("model"));
                    omProductionOrdeInfo.setCreateTime(new Date());
                    omProductionOrdeInfo.setCreateUser("工厂MES");
                    omProductionOrdeInfoService.save(omProductionOrdeInfo);

                    productNum = dataObject.getStr("productNum");
                    orderNum = dataObject.getStr("productionOrderNum");
                }
            }
            //下发产品SN和工单号
            if(!productNum.isEmpty() && !orderNum.isEmpty()){
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build());
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(orderNum).build());
            }

        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }

    /**
     * 工厂MES报工
     * @param productNum  通道
     * @param stationCode 工位
     * @param confirmTime 物料号
     * @throws Exception e
     */
    //{"code":"success","data":{"productNum":"LCV123456P0600036","stationCode":"1HZ01","resultCode":"S","resultText":"报工成功"},"message":"API调用成功"}
    public static void reportFactoryMes(String productNum, String stationCode, String confirmTime)
    {
        String result = "";
        try {
            String url = Constants.FACTORY_EMS_UAT_GET_RUL + "workReportResultFeedback?siteCode="+Constants.FACTORY_EMS_SITE_CODE+"&stationCode="+stationCode+"&productNum="+productNum+"&confirmTime="+confirmTime;
            HttpResponse response = HttpRequest.get(url).execute();
            /*HttpRequest httpRequest = HttpRequest.get(url);*/
            result =  response.body();
        }catch (Exception e){
            throw new RuntimeException(e);
        }
    }
}