Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r31221 -r31223 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 31221) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 31223) @@ -4062,8 +4062,9 @@ if (ou != null && OrgUnit.STATUS_DISABLED.equals(ou.getStatus())) { throw new SystemException("当前申请科室已停用,不能进行申领!"); } - // 一个科室只能填写一张未打印并且未发货的一次性物品申请单(GDSZYY-64) - if(!DatabaseUtil.isPoIdValid(recyclingApplication.getId()) && StringUtils.equals(recyclingApplication.getType(), InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM)){ + // 一个科室只能填写一张未打印并且未发货的一次性物品申请单;暂存的一次性物品申请单提交时也要检查(GDSZYY-64) + if((!DatabaseUtil.isPoIdValid(recyclingApplication.getId()) || (committedStatus && !recyclingApplication.committed())) + && StringUtils.equals(recyclingApplication.getType(), InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM)){ JSONObject result = limitDisposableGoodsApply(); if(result != null && !result.optBoolean("success") && DatabaseUtil.isPoIdValid(result.optLong("recyclingApplicationId"))){ throw new SystemException("本科室还有未处理的一次性物品申请单,处理前不允许提交新申请单,可打开原申请单进行修改");