Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16734 -r16735 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16734) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16735) @@ -245,7 +245,7 @@ } //获取包实例的虚拟篮筐 String virtualBasketSeqNum = tousseInstance.getVirtualBasketSeqNum(); - if(!virtualBasketNameList.contains(virtualBasketSeqNum)){ + if(StringUtils.isNotBlank(virtualBasketSeqNum) && !virtualBasketNameList.contains(virtualBasketSeqNum)){ virtualBasketNameList.add(virtualBasketSeqNum); } tousseInstance.setVirtualBasketSeqNum(null); @@ -1012,7 +1012,7 @@ for (TousseInstance tousseInstance : tousses) { //获取审核前虚拟篮筐 String virtualBasketSeqNum = tousseInstance.getVirtualBasketSeqNum(); - if(!virtualBasketNameList.contains(virtualBasketSeqNum)){ + if(StringUtils.isNotBlank(virtualBasketSeqNum) && !virtualBasketNameList.contains(virtualBasketSeqNum)){ virtualBasketNameList.add(virtualBasketSeqNum); } } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r16730 -r16735 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16730) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16735) @@ -2221,7 +2221,7 @@ for (TousseInstance tousseInstance : tousses) { //获取审核前虚拟篮筐 String virtualBasketSeqNum = tousseInstance.getVirtualBasketSeqNum(); - if(!virtualBasketNameList.contains(virtualBasketSeqNum)){ + if(StringUtils.isNotBlank(virtualBasketSeqNum) && !virtualBasketNameList.contains(virtualBasketSeqNum)){ virtualBasketNameList.add(virtualBasketSeqNum); } tousseInstance.setReviewTime(now);