修改1P1S

cl

2024-09-04 4ab63d9ad3094643b2f098dbb523315fff43dd83

 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());
            }
        }
@@ -1078,7 +1078,7 @@
            if (CollUtil.isNotEmpty(list)){
                for(DaCollectionParamConf conf:list){
                    //1P1S生成
                    if(conf.getCollectParameterId().equals("1P1S")){
                    if("1P1S".equals(conf.getCollectParameterId())){
                        String result = get1P1S(sfcCode);
                        conf.setParamCentral(result);
                    }
@@ -1127,12 +1127,17 @@
                String batteryTypeCode = list.get(0).getBatteryTypeCode();//电池类型代码
                String specificationsCode = list.get(0).getSpecificationsCode();//规格代码
                String traceInfoCode = list.get(0).getTraceInfoCode();//追溯信息代码

                String oldDateCode = list.get(0).getProDateCode();
                String proDateCode = Constants.YEARSMAP.get(now.getYear())
                        + Constants.MONTHSMAP.get(now.getMonthValue())
                        + Constants.DAYMAP.get(now.getDayOfMonth());//生产日期

                String code = list.get(0).getSfcCode();//序列号
                String code = "";
                if(oldDateCode.equals(proDateCode)){
                    code = list.get(0).getSfcCode();//序列号
                }else {
                    code = "0";
                }
                code = StringUtils.leftPad(String.valueOf(Integer.valueOf(code)+1),7, "0");;//序列号
                result = mfCode+proTypeCode+batteryTypeCode+specificationsCode+traceInfoCode+proDateCode+code;