Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r16806 -r16809 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 16806) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 16809) @@ -980,7 +980,18 @@ public boolean isRecycled(){ return StringTools.equals(STATUS_RECYCLED, status); } + /** + * 是否聚合包实例 + * @return + */ @Transient + public boolean isComboTousse(){ + if(tousseDefinition == null){ + return false; + } + return tousseDefinition.isComboTousse(); + } + @Transient public boolean canInvoice() { if (!TousseInstance.STATUS_STERILED.equals(status) && !TousseInstance.STATUS_DISINFECTED.equals(status) Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r16806 -r16809 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 16806) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 16809) @@ -929,6 +929,14 @@ return StringTools.equals(tousseType, PACKAGE_TYPE_HOMEMADE); } /** + * 是否聚合包实例 + * @return + */ + @Transient + public boolean isComboTousse(){ + return StringTools.equals(tousseType, PACKAGE_TYPE_COMBO); + } + /** * 判断是否是整包清洗 * @return */