Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java =================================================================== diff -u -r27243 -r27476 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 27243) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 27476) @@ -181,6 +181,28 @@ } @Override + public ReviewedBasket getReviewedBasketButNew(String basketBarcode, + String statusChange) { + ReviewedBasket basket = null; + if(StringUtils.isNotBlank(basketBarcode)){ + Container container = containerManager + .getContainerByBarcode(basketBarcode); + if(container == null){ + throw new RuntimeException("未找到条码为" + basketBarcode + "的篮筐"); + } + if(StringUtils.isNotBlank(statusChange)){ + container.setStatus(statusChange); + } + containerManager.save(container); + basket = getBasketByBarcode(basketBarcode); + if (basket == null) { + basket = new ReviewedBasket(); + basket.setContainer(container); + } + } + return basket; + } + @Override public ReviewedBasket getBasketByBarcode(String barcode) { if (StringUtils.isNotBlank(barcode)) { String sql = "select po,s from " Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java =================================================================== diff -u -r27243 -r27476 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java (.../ReviewedBasketManager.java) (revision 27243) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java (.../ReviewedBasketManager.java) (revision 27476) @@ -37,13 +37,20 @@ public void deleteReviewedBasket(ReviewedBasket reviewedBasket); /** - * 根据barcode找篮筐,如果没找到则根据taskGroup新建一个. + * 根据barcode找篮筐,如果没找到则根据taskGroup新建一个.会把篮筐状态变成灭菌装载,慎用! * @param basketBarcode * @return */ public ReviewedBasket getReviewedBasketButNew(String basketBarcode); /** + * 根据barcode找篮筐,如果没找到则根据taskGroup新建一个. + * @param basketBarcode 篮筐条码 + * @param statusChange 新的状态 如果为空 则不改变状态 + * @return + */ + public ReviewedBasket getReviewedBasketButNew(String basketBarcode, String statusChange); + /** * 通过条形码获得本任务组正处于整理的篮筐. * @param barcode 容器条码 * @return