Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java =================================================================== diff -u -r16621 -r16629 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 16621) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 16629) @@ -25,7 +25,6 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; -import com.forgon.tools.string.StringTools; /** * @author Angus @@ -363,4 +362,19 @@ return rowCount; } + + /** + * 通过审核篮筐条码获取ReviewedBasket对象集合 + * @param basketBarcode 审核篮筐条码 + * @param pageNow 请求的当前页 + * @param pageSize 每一页的大小 + * @return + */ + @Override + public List getReviewedBasketsByBasketBarcode(String basketBarcode, + Integer pageNow, Integer pageSize) { + String sql = "where po.container.barcode = '"+ basketBarcode + "'"; + Integer firstIndex = pageSize*(pageNow - 1); + return objectDao.findBySql(ReviewedBasket.class.getSimpleName(), sql, firstIndex, pageSize, "id desc"); + } } \ No newline at end of file Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16625 -r16629 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16625) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16629) @@ -2447,21 +2447,6 @@ } return barcodes; } - - /** - * 通过审核篮筐条码获取ReviewedBasket对象集合 - * @param basketBarcode 审核篮筐条码 - * @param pageNow 请求的当前页 - * @param pageSize 每一页的大小 - * @return - */ - @Override - public List getTousseInstanceByBasket(String basketBarcode, - Integer pageNow, Integer pageSize) { - String sql = "where po.container.barcode = '"+ basketBarcode + "'"; - Integer firstIndex = pageSize*(pageNow - 1); - return objectDao.findBySql(ReviewedBasket.class.getSimpleName(), sql, firstIndex, pageSize, "id desc"); - } @Override public TousseInstance getExpireNearest(TousseInstance tousseInstance,List acceptStatus) { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java =================================================================== diff -u -r16621 -r16629 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java (.../ReviewedBasketManager.java) (revision 16621) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java (.../ReviewedBasketManager.java) (revision 16629) @@ -64,4 +64,14 @@ * @return */ public Integer getReviewedBasketCountByBarcode(String basketBarcode); + + /** + * 通过审核篮筐条码获取ReviewedBasket对象集合 + * @param basketBarcode 审核篮筐条码 + * @param pageNow 请求当前页 + * @param pageSize 每一页的大小 + * @return + */ + public List getReviewedBasketsByBasketBarcode( + String basketBarcode, Integer pageNow, Integer pageSize); } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r16621 -r16629 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 16621) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 16629) @@ -557,7 +557,7 @@ JSONArray array = new JSONArray(); - Integer rowCount = reviewedBasketManager.getReviewedBasketCountByBarcode(basketBarcode); + Integer rowCount = reviewedBasketManager.getReviewedBasketCountByBarcode(basketBarcode); //此条码所有审核篮筐实例数量 Integer pageSize = Integer.parseInt(pageSizeString); Integer pageNow = Integer.parseInt(pageNowString); Integer pageCount=(rowCount-1)/pageSize+1; @@ -573,7 +573,7 @@ endIndex = rowCount; } - List baskets = tousseInstanceManager.getTousseInstanceByBasket(basketBarcode, pageNow, pageSize); + List baskets = reviewedBasketManager.getReviewedBasketsByBasketBarcode(basketBarcode, pageNow, pageSize); boolean flag = true; if(baskets != null){ for (ReviewedBasket basket : baskets) { Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java =================================================================== diff -u -r16625 -r16629 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 16625) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 16629) @@ -349,16 +349,6 @@ * 获取申请记录 */ public InvoicePlan getInvoicePlan(String invoicePlanId); - - /** - * 通过审核篮筐条码获取ReviewedBasket对象集合 - * @param basketBarcode 审核篮筐条码 - * @param pageNow 请求当前页 - * @param pageSize 每一页的大小 - * @return - */ - public List getTousseInstanceByBasket(String basketBarcode, - Integer pageNow, Integer pageSize); /** * 获取跟对应包实例同一个包定义的,失效期在此包实例之前,也是最靠近失效期的包实例对象