Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r14193 -r14264 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 14193) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 14264) @@ -772,13 +772,21 @@ public void setIsDisableIDCard(String isDisableIDCard) { this.isDisableIDCard = isDisableIDCard; } + /** + * 判断是否是消毒物品 + * @return + */ @Transient public boolean isDisinfection() { if (StringUtils.equals(tousseType, PACKAGE_TYPE_DISINFECTION)) { return true; } return false; } + /** + * 判断是否是敷料包 + * @return + */ @Transient public boolean isDressing() { if (StringUtils.equals(tousseType, PACKAGE_TYPE_DRESSING)) { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r14224 -r14264 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 14224) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 14264) @@ -99,12 +99,16 @@ public static final String DELIVERSTATUS_AWAITDELIVER = "待发货"; public static final String DELIVERSTATUS_PARTDELIVERED = "部分发货"; public static final String DELIVERSTATUS_DELIVERED = "已发货"; + /** + * 发货状态 + */ + private String deliverStatus; + /** + * true 则为已提交状态(默认值),否则未提交 + */ + private Boolean committedStatus; - private String deliverStatus;//发货状态 - private Boolean committedStatus;//true 则为已提交状态(默认值),否则未提交 - - public static final int PRINT_STATUS_PART_PRINT = 0; // 部分打印 public static final int PRINT_STATUS_UNPRINT = 1; // 未打印 public static final int PRINT_STATUS_PRINTED = 2; // 已打印 @@ -312,13 +316,21 @@ return false; } + /** + * 判断发货状态是否是已发货 + * @return + */ public boolean delivered() { if (DELIVERSTATUS_DELIVERED.equals(deliverStatus)) { return true; } return false; } + /** + * 判断发货状态是否是已终止 + * @return + */ public boolean deliverEnd() { if (STATUS_END.equals(deliverStatus)) { return true;