Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r34756 -r34865 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 34756) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 34865) @@ -7028,6 +7028,17 @@ if(barcodeList.size()==0){ return false; } + + //即将放入物品的篮筐,如果篮筐状态不是灭菌装载或者空闲,则需要新建篮筐实例(SSTS-570) + ReviewedBasket reviewedBasket = reviewedBasketManager.getReviewedBasketById(Long.valueOf(reviewedBasketId)); + //根据barcode找篮筐,如果没找到则根据taskGroup新建一个.会把篮筐状态变成灭菌装载,慎用! + ReviewedBasket basket = reviewedBasketManager + .getReviewedBasketButNew(reviewedBasket.getBarcode()); + if (basket.getId() == null) { + reviewedBasketManager.saveOrUpdate(basket); + reviewedBasketId = basket.getId().toString(); + } + String updateSql = "update "+TousseInstance.class.getSimpleName()+" set reviewBasket_id =%d where id in(select ti.id from TousseInstance ti " + "join barcodeDevice bd on bd.id = ti.id where bd.barcode in(%s))"; StringBuffer sb = new StringBuffer();