Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r17609 -r17611 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 17609) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 17611) @@ -2004,10 +2004,10 @@ List result = new ArrayList<>(); for (TousseItem tousseItem : list) { //如果isTerminated为true则不让终止 - if (tousseItem.terminated()){ - result.add(tousseItem.getTousseName()); - continue; - } + // if (tousseItem.terminated()){ + // result.add(tousseItem.getTousseName()); + // continue; + // } Integer recyclingAmount = IntegerUtils.parse(tousseItem.getRecyclingAmount()); Integer sendOutAmount = IntegerUtils.parse(tousseItem.getSendOutAmount()); Integer amount = IntegerUtils.parse(tousseItem.getAmount()); @@ -2026,8 +2026,7 @@ } //如果单的终止状态是已终止,则不让终止 if (InvoicePlan.STATUS_END.equals(tousseItem.getInvoicePlan().getEndStatus())){ - result.add(tousseItem.getTousseName()); - continue; + throw new OperationException("改申请单已经是终止了的,请不要重复终止!"); } } if (result.size() > 0){ Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java =================================================================== diff -u -r17609 -r17611 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java (.../InvoicePlanManager.java) (revision 17609) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java (.../InvoicePlanManager.java) (revision 17611) @@ -188,20 +188,17 @@ /** * 根据tousseItemId列表来校验这些申请物品能否被终止,符合以下一个条件都不能被终止: *
- *
1. isTerminated==true
+ *
1. 单状态是已终止
*
*
- *
2. 单状态是已终止
+ *
2. isInvoice==是
+ *
2.1 isRecycling==是 && recyclingAmount>0 && recyclingAmount-sendOutAmount=0
+ *
2.2 (isRecycling==否 || isRecycling==null) && amount-sendOutAmount=0(一次性物品isRecycling是为null,敷料包isRecycling是否)
*
*
- *
3. isInvoice==是
- *
3.1 isRecycling==是 && recyclingAmount>0 && recyclingAmount-sendOutAmount=0
- *
3.2 (isRecycling==否 || isRecycling==null) && amount-sendOutAmount=0(一次性物品isRecycling是为null,敷料包isRecycling是否)
+ *
3. isInvoice==否
+ *
3.1 isRecycling==是 && recyclingAmount>0
*
- *
- *
4. isInvoice==否
- *
4.1 isRecycling==是 && recyclingAmount>0
- *
* @param tousseItemIds 申请物品的id列表 */ void checkTousseItemCanCancel(Collection tousseItemIds);