Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java =================================================================== diff -u -r34682 -r34684 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 34682) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 34684) @@ -1068,7 +1068,7 @@ for (int i = 1; i <= subMdListSize; i++) { MaterialDefinition subMd = subMdList.get(i-1); String prefixPart1 = StringUtils.isNotBlank(subMd.getInventorySerialNumber()) ? subMd.getInventorySerialNumber() : "MID" + subMd.getId(); - String prefixPart2 = (i < 10) ? ("0" + i) : ("" + i); + String prefixPart2 = Tools.fillZeroReturnString(2, i); //同名材料定义数量大于100但小于1000个的情况 //String prefixPart2 = (i < 10) ? ("00" + i) : (i < 100 ? ("0" + i) : ("" + i))); idToMaterialDefinitionInstrumentInstancePrefixMap.put(subMd.getId(), prefixPart1 + "-" + prefixPart2 + "-"); @@ -1110,7 +1110,7 @@ InstrumentInstance instrumentInstance = mdIdToInstrumentInstanceOfMaxSerialNumberMap.get(mdId); if(instrumentInstance == null){ //产生新的器械实例的流水号从前缀+0001开始 - newInstrumentBarcode = prefix + "-" + Tools.fillZeroReturnString(4, currentSerialNumber); + newInstrumentBarcode = prefix + Tools.fillZeroReturnString(4, currentSerialNumber); }else{ //提取该器械实例的流水号,在后面自增1 String instrumentBarcode = instrumentInstance.getInstrumentBarcode();