Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r25663 -r25737 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 25663) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 25737) @@ -189,12 +189,26 @@ public static final String RECYCLINGSTATUS_PARTRECYCLE = "部分回收"; public static final String RECYCLINGSTATUS_TALLIED = "已清点"; - //外来器械申请单专用状态 + + /** + * 外来器械申请单专用状态,待接收 + */ public static final String RECYCLINGSTATUS_AWAITRECEIVE = "待接收"; + + /** + * 外来器械申请单专用状态,已接收 + */ public static final String RECYCLINGSTATUS_AWAITRECEIVED = "已接收"; - private String recyclingStatus;//回收状态 + /** + * 回收状态 + * + * 回收状态的值有如下几个:待回收、已回收、部分回收、已清点、待接收、已接收 + * 见前缀为 RECYCLINGSTATUS_ 的常量。 + */ + private String recyclingStatus; + public static final String STATUS_END = "已终止"; public static final String STATUS_PART_END = "部分终止"; public static final String DELIVERSTATUS_AWAITDELIVER = "待发货"; @@ -631,6 +645,11 @@ return RECYCLINGSTATUS_RECYCLED.equals(recyclingStatus); } + + /** + * 判断状态是否为已清点 + * @return + */ @Transient public boolean recyclingstatusTallied(){ return RECYCLINGSTATUS_TALLIED.equals(recyclingStatus); Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java =================================================================== diff -u -r25337 -r25737 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java (.../RecyclingContext.java) (revision 25337) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java (.../RecyclingContext.java) (revision 25737) @@ -203,7 +203,12 @@ public Boolean getConfirmation() { return confirmation; } - + + /** + * 是否清点确认 + * + * @return 是则返回true,否则返回false + */ public boolean isTally() { return tally; }