Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r19486 -r19492 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 19486) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 19492) @@ -1133,7 +1133,7 @@ //设置申请单的使用记录 recyclingApplication.setUseRecord((UseRecord)objectDao.getByProperty(UseRecord.class.getSimpleName(), "id", useRecordId)); - boolean needInvoice = isNeedInvoiceForRecyclingApplication(recyclingApplication); + boolean needInvoice = isUseRecord2ApplicationNeedInvoice(recyclingApplication); if(needInvoice){ recyclingApplication.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); }else{ @@ -1265,21 +1265,16 @@ recyclingApplication.setIncludeRecyclingItems(InvoicePlan.SIGNED_FALSE); } - boolean needInvoice = isNeedInvoiceForRecyclingApplication(recyclingApplication); + boolean needInvoice = isUseRecord2ApplicationNeedInvoice(recyclingApplication); if(needInvoice){ recyclingApplication.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); }else{ recyclingApplication.setDeliverStatus(""); } recyclingApplication.setIncludeInvoiceItems(includeInvoiceItems); } - - /** - * 使用记录转换的申请单是否需要发货 - * @return - */ @Override - public boolean isNeedInvoiceForRecyclingApplication(RecyclingApplication application){ + public boolean isUseRecord2ApplicationNeedInvoice(RecyclingApplication application){ boolean needInvoice = true; if (application != null && application.getUseRecord() != null && StringUtils.isNotBlank(application.getDepartCoding())) { @@ -3049,7 +3044,7 @@ && (StringUtils.isBlank(application.getDeliverStatus()) || InvoicePlan.DELIVERSTATUS_AWAITDELIVER .equals(application.getDeliverStatus()))) { - boolean needInvoice = isNeedInvoiceForRecyclingApplication(application); + boolean needInvoice = isUseRecord2ApplicationNeedInvoice(application); if(needInvoice){ application.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); // invoicePlanManager.computeAndSetInvoiceStatus(application); Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r19486 -r19492 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 19486) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 19492) @@ -2182,7 +2182,7 @@ invoicePlanManager.computeAndSetStatus(application); //手术室使用记录转换的申请单是否需要发货 if(application instanceof RecyclingApplication){ - boolean needInvoice = recyclingApplicationManager.isNeedInvoiceForRecyclingApplication((RecyclingApplication)application); + boolean needInvoice = recyclingApplicationManager.isUseRecord2ApplicationNeedInvoice((RecyclingApplication)application); if(!needInvoice){ application.setDeliverStatus(""); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java =================================================================== diff -u -r18645 -r19492 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 18645) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 19492) @@ -54,8 +54,11 @@ public List findSignedRecyclingApplicationByDepartCoding( String deparCoding); - - public boolean isNeedInvoiceForRecyclingApplication(RecyclingApplication application); + /** + * 使用记录转换的申请单是否需要发货 + * @return + */ + public boolean isUseRecord2ApplicationNeedInvoice(RecyclingApplication application); public void saveOrUpdateRecyclingApplication( RecyclingApplication recyclingApplication,Boolean isCommit);