Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r22653 -r22674 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 22653) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 22674) @@ -2783,7 +2783,7 @@ if(CollectionUtils.isEmpty(tousseItemIds)){ throw new OperationException("没有待终止的物品"); } - List list = this.getCancelItemsInfo(tousseItemIds); + List list = tousseItemManager.getCollection(tousseItemIds); //用来保存不能终止的器械包名字 List result = new ArrayList<>(); for (TousseItem tousseItem : list) { @@ -2805,7 +2805,7 @@ } //如果单的终止状态是已终止,则不让终止 if (InvoicePlan.STATUS_END.equals(tousseItem.getInvoicePlan().getEndStatus())){ - throw new OperationException("改申请单已经是终止了的,请不要重复终止!"); + throw new OperationException("该申请单已经是终止了的,请不要重复终止!"); } } if (result.size() > 0){ @@ -2814,16 +2814,6 @@ } - /** - * 根据tousseItemId列表获得对应的tousseItem情况 - * @param tousseItemIds tousseItemId列表 - * @return {@link TousseItem} - */ - private List getCancelItemsInfo(Collection tousseItemIds){ - String hql = "from TousseItem po where po.id in(:ids)"; - return objectDao.getHibernateSession().createQuery(hql).setParameterList("ids", tousseItemIds).list(); - } - @Override public JSONObject getUnReturnTips(String departCode) { try {