Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r18113 -r18114 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 18113) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 18114) @@ -4020,6 +4020,7 @@ final TousseDefinition tousseDefinition = tousseInstance .getTousseDefinition(); + String tousseNameAndBarcode = String.format("%s%s", tousseInstance.getTousseName(),barcode); if(!tousseDefinition.isInsideTousse() && !tousseDefinition.isDressing() && !tousseDefinition.isForeignTousse() && !tousseDefinition.isSplit()){ if(Invoice.TYPE_OPERATION_RESERVATION.equals(invoiceType)){ return buildErrorMsgJsonResult(String.format("手术预约发货暂时不支持类型为%s的器械包!", tousseDefinition.getTousseType())); @@ -4045,7 +4046,7 @@ } } if(tousseInstance.isBelongsToComboTousse()){ - return buildErrorMsgJsonResult(String.format("[%s] 属于聚合包,请扫描聚合包实例条码!",tousseInstance.getTousseName())); + return buildErrorMsgJsonResult(String.format("[%s] 属于聚合包,请扫描聚合包实例条码!",tousseNameAndBarcode)); } //如果器械包实例条件(尾)不为空 if(StringUtils.isNotBlank(barcodeEnd)){ @@ -4058,7 +4059,7 @@ return buildErrorMsgJsonResult("条码/篮筐(首)与条码/篮筐(尾)尾参数类型不一致!"); } } - String tousseNameAndBarcode = String.format("%s%s", tousseInstance.getTousseName(),barcode); + //如果器械包实例条件(尾)为空 if(StringUtils.isBlank(barcodeEnd)){ // 不追溯的消毒物品,发货扫描固定条码,返回多个器械包