Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r29896 -r29902 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 29896) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 29902) @@ -3987,7 +3987,11 @@ throw new SystemException("当前申请科室已停用,不能进行申领!"); } // 检查申请单是否合法 - String valide = invoicePlanManager.valideApplication(recyclingApplication, recyclingApplication.getOldVersion()); + InvoicePlan ip = new InvoicePlan(); + ip.setRecyclingStatus(oldRecyclingApplication.getRecyclingStatus()); + ip.setDeliverStatus(oldRecyclingApplication.getDeliverStatus()); + ip.setEndStatus(oldRecyclingApplication.getEndStatus()); + String valide = invoicePlanManager.valideApplication(ip, recyclingApplication.getOldVersion()); if(StringUtils.isNotBlank(valide)){ throw new SystemException(valide); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java =================================================================== diff -u -r28123 -r29902 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java (.../RecyclingApplicationVo.java) (revision 28123) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java (.../RecyclingApplicationVo.java) (revision 29902) @@ -86,6 +86,12 @@ * 使用记录id */ private Long useRecordId; + + /** + * 终止状态 + */ + private String endStatus; + public Long getId() { return id; } @@ -261,5 +267,13 @@ public void setUseRecordId(Long useRecordId) { this.useRecordId = useRecordId; } + + public String getEndStatus() { + return endStatus; + } + public void setEndStatus(String endStatus) { + this.endStatus = endStatus; + } + } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r29896 -r29902 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 29896) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 29902) @@ -3978,6 +3978,7 @@ vo.setSettleAccountsDepartCoding(invoicePlan.getSettleAccountsDepartCoding()); vo.setRecyclingStatus(invoicePlan.getRecyclingStatus()); vo.setDeliverStatus(invoicePlan.getDeliverStatus()); + vo.setEndStatus(invoicePlan.getEndStatus()); vo.setType(invoicePlan.getType()); vo.setRemark(invoicePlan.getRemark()); vo.setTousseBarcodes(invoicePlan.getTousseBarcodes());