Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16728 -r16730 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16728) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16730) @@ -245,7 +245,7 @@ } //获取包实例的虚拟篮筐 String virtualBasketSeqNum = tousseInstance.getVirtualBasketSeqNum(); - if(virtualBasketNameList.contains(virtualBasketSeqNum)){ + if(!virtualBasketNameList.contains(virtualBasketSeqNum)){ virtualBasketNameList.add(virtualBasketSeqNum); } tousseInstance.setOperateUser(operateUser); @@ -989,10 +989,6 @@ }*/ if(CollectionUtils.isNotEmpty(tousseInstanceBarcodes)){ - Query updateQuery = objectDao.getHibernateSession().createQuery("update TousseInstance set virtualBasketSeqNum = null, reviewBasket_id=" + basket.getId() + - " where barcode in :barcode"); - updateQuery.setParameterList("barcode", tousseInstanceBarcodes); - updateQuery.executeUpdate(); JSONObject json = new JSONObject(); JSONUtil.addLogProperty(json, "操作", "器械包入筐"); JSONUtil.addLogProperty(json, "reviewedBasketId", basket.getId()); @@ -1015,14 +1011,18 @@ for (TousseInstance tousseInstance : tousses) { //获取审核前虚拟篮筐 String virtualBasketSeqNum = tousseInstance.getVirtualBasketSeqNum(); - if(virtualBasketNameList.contains(virtualBasketSeqNum)){ + if(!virtualBasketNameList.contains(virtualBasketSeqNum)){ virtualBasketNameList.add(virtualBasketSeqNum); } } if(CollectionUtils.isNotEmpty(virtualBasketNameList)){ //重新计算虚拟篮筐状态 countVirtualContainerStatus(virtualBasketNameList); } + Query updateQuery = objectDao.getHibernateSession().createQuery("update TousseInstance set virtualBasketSeqNum = null, reviewBasket_id=" + basket.getId() + + " where barcode in :barcode"); + updateQuery.setParameterList("barcode", tousseInstanceBarcodes); + updateQuery.executeUpdate(); return tousses; } return null; Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r16727 -r16730 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16727) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16730) @@ -2221,7 +2221,7 @@ for (TousseInstance tousseInstance : tousses) { //获取审核前虚拟篮筐 String virtualBasketSeqNum = tousseInstance.getVirtualBasketSeqNum(); - if(virtualBasketNameList.contains(virtualBasketSeqNum)){ + if(!virtualBasketNameList.contains(virtualBasketSeqNum)){ virtualBasketNameList.add(virtualBasketSeqNum); } tousseInstance.setReviewTime(now);