Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java =================================================================== diff -u -r35327 -r35328 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java (.../XinHuaDataManagerImpl.java) (revision 35327) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java (.../XinHuaDataManagerImpl.java) (revision 35328) @@ -940,11 +940,10 @@ String t1Temp = line.substring(34,39); detail.setP1Mbar(StringTools.romoveUselessZeroToNumberStr(piMbar));//室内压力(去掉前面无用的0) detail.setT1Temp(StringTools.romoveUselessZeroToNumberStr(t1Temp));//室内温度(去掉前面无用的0) - String programNo_source = line.substring(12,14);//程序编号 String phase_source = line.substring(14,17);//程序阶段号 String phase = SterilizerRecord.STERILIZERRECORD_PHASE_XINHUA.get(phase_source);//阶段号对应的阶段 detail.setStageName(phase);//阶段 - detail.setStageNo(programNo_source); + detail.setStageNo(phase_source); detail.setCommonSterilizerRecord(record); details.add(detail); record.getCommonStageDetailsList().addAll(details); @@ -962,17 +961,18 @@ record.setStartDate(startDate); record.setCycles(machineData.optLong("cycleCounter")); record.setMachineNumber(machineNumber); + String programNo_source = line.substring(12,14);//程序编号 + record.setProgramNo(programNo_source); } detail.setTime(startDate); String piMbar = line.substring(28,33); String t1Temp = line.substring(33,38); detail.setP1Mbar(StringTools.romoveUselessZeroToNumberStr(piMbar));//室内压力(去掉前面无用的0) detail.setT1Temp(StringTools.romoveUselessZeroToNumberStr(t1Temp));//室内温度(去掉前面无用的0) - String programNo_source = line.substring(12,14);//程序编号 String phase_source = line.substring(14,16);//程序阶段号 String phase = SterilizerRecord.STERILIZERRECORD_PHASE_XINHUA.get(phase_source);//阶段号对应的阶段 detail.setStageName(phase);//阶段 - detail.setStageNo(programNo_source); + detail.setStageNo(phase_source); detail.setCommonSterilizerRecord(record); details.add(detail); }