Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java =================================================================== diff -u -r28349 -r29714 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java (.../Invoice.java) (revision 28349) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java (.../Invoice.java) (revision 29714) @@ -62,6 +62,11 @@ public static final String TYPE_OPERATION_RESERVATION_MERGE = "手术预约多单合并发货"; public static final String TYPE_CUSTOM = "自定义发货"; public static final String TYPE_EXPRESS = "快速发货"; + + /** + * 聚合包按大包发货时的类型 + */ + public static final String INVOICEPLANTYPE_COMBOTOUSSEWRAPPER = "聚合包发货"; private Long id; private String serialNumber; // 流水号 @@ -121,10 +126,18 @@ private String wbCode;// 五笔 - //器械包工作量统计数量 + /** + * 器械包工作量统计数量 + * 通过InvoiceManagerImpl.updateInvoiceStatistics方法看到: + * 当器械包类型为外来器械包或外来器械拆分小包时,一个包实例数量算1.否则取包实例的统计数量字段的值 + */ private Integer workloadAmount; - //器械包发货总数量(消毒物品、自定义器械包按材料统计) + /** + * 器械包发货总数量(消毒物品、自定义器械包按材料统计) + * 通过InvoiceManagerImpl.updateInvoiceStatistics方法看到: + * 当器械包类型为消毒物品或自定义器械包时,取包内材料(一次性物品不算)总件数之和,其它类型一个包实例对应的数量算1 + */ private Integer tousseAmount = 0; private Integer diposableGoodsAmount = 0;//一次性物品总数量