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

@@ -62,10 +62,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/CustomRunner.java

@@ -84,6 +84,8 @@
        Constants.ModuleList.add(Constants.OP210);
        Constants.ModuleList.add(Constants.OP220);

        getDate();//将日期放入MAP集合，1P1S用

        OPCUaSubscription opcUaSubscription = new OPCUaSubscription(
                miloService,
                daPassingStationCollectionService,

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

@@ -166,7 +166,7 @@
                            result = 16;//电芯挡位为空
                        }else{
                            String cellGear = cellGearObjcet.toString();
                            /*List<String> cellCodeList = readCellCodeList(thoroughfare, device);
                      /*      List<String> cellCodeList = readCellCodeList(thoroughfare, device);
                            result = checkCellGear(thoroughfare, device,cellCodeList,cellGear);//校验电芯挡位和组别*/
                        }
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
@@ -879,12 +879,12 @@
                        cellStatus = 1;
                    }else {
                        cellStatus = 2;
                        result = 17;//挡位校验不合格
                        result = 16;//挡位校验不合格
                    }
                }else {
                }/*else {
                    cellStatus = 2;
                    result = 17;//查不到要校验的挡位
                }
                }*/
                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_"+(i+1)).value(cellStatus).build());
            }
        }
@@ -1050,7 +1050,7 @@
        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);
           /* HttpRequest httpRequest = HttpRequest.get(url);*/
            result =  response.body();
        }catch (Exception e){
            throw new RuntimeException(e);

 jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java

@@ -37,7 +37,7 @@
        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);
         /*   HttpRequest httpRequest = HttpRequest.get(url);*/
            result =  response.body();
        }catch (Exception e){
            e.printStackTrace();