Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r20463 -r20480 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 20463) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 20480) @@ -1359,10 +1359,16 @@ } /** * 判断是否可以录使用记录 + * 聚合包如果状态为已发货或已签收或已使用都可以录 + * 其它类型包状态为只能是已发货或已签收才可以录 * @return */ public boolean canUse(){ - return isShipped() || isSigned(); + if(isComboTousse()){ + return isShipped() || isSigned() || isUsed(); + }else{ + return isShipped() || isSigned(); + } } // 校验关联信息是否正确,使用记录