Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r12976 -r12987 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 12976) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 12987) @@ -1616,13 +1616,15 @@ Long reviewBasketId = (Long)obj; newReviewedBasket = (ReviewedBasket) objectDao.getByProperty( ReviewedBasket.class.getSimpleName(), "id", reviewBasketId); - //判断该虚拟篮筐是否还存在已装配的器械包实例,如不存在则将虚拟篮筐释放,状态置为空闲 - Container virtualContainer = newReviewedBasket.getContainer(); - if(virtualContainer != null && Container.CONTAINER_PURPOSE_VIRTUAL.equals(virtualContainer.getPurpose())){ - String sql = "where status <> '" + TousseInstance.STATUS_SHIPPED + "' and reviewBasket_id=" + reviewBasketId; - if(objectDao.countObjectBySql("TousseInstance", sql) == 0){ - virtualContainer.setStatus(Container.CONTAINER_STATUS_FREE); - objectDao.saveOrUpdate(virtualContainer); + if(newReviewedBasket != null){ + //判断该虚拟篮筐是否还存在已装配的器械包实例,如不存在则将虚拟篮筐释放,状态置为空闲 + Container virtualContainer = newReviewedBasket.getContainer(); + if(virtualContainer != null && Container.CONTAINER_PURPOSE_VIRTUAL.equals(virtualContainer.getPurpose())){ + String sql = "where status <> '" + TousseInstance.STATUS_SHIPPED + "' and reviewBasket_id=" + reviewBasketId; + if(objectDao.countObjectBySql("TousseInstance", sql) == 0){ + virtualContainer.setStatus(Container.CONTAINER_STATUS_FREE); + objectDao.saveOrUpdate(virtualContainer); + } } } }