Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r34801 -r34843 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 34801) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 34843) @@ -7010,7 +7010,7 @@ String washStartTime = wRecord.getStartDateStr(); if(StringUtils.isNotBlank(washStartTime)){ List tis = new ArrayList(); - String key = washStartTime +"_" + wRecord.getId() + "_" + toussei.getClassifyBasket_id(); + String key = washStartTime +"_" + wRecord.getId() + "_" + toussei.getClassifyBasket_id() + "_" + toussei.getDepart(); if(wtMap.containsKey(key)){ tis = wtMap.get(key); tis.add(toussei); @@ -7022,7 +7022,7 @@ } }else{ List tis = new ArrayList(); - String key = "notWashInstance"; + String key = "notWashInstance" + "_" + toussei.getDepart(); if(wtMap.containsKey(key)){ tis = wtMap.get(key); tis.add(toussei);