Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r17871 -r18111 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 17871) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 18111) @@ -4119,16 +4119,16 @@ } // 可追溯器械包,返回单个器械包实例 if (!checkStatusForInvoice.evaluate(tousseInstance)) { - return buildErrorMsgJsonResult("该器械包状态为" + tousseInstance.getStatus() + ",不能发货!请扫描已消毒或者已灭菌的器械包"); + return buildErrorMsgJsonResult("器械包"+barcode+"状态为" + tousseInstance.getStatus() + ",不能发货!请扫描已消毒或者已灭菌的器械包"); } if (!tousseInstanceManager.checkTousseInstanceHasNotRecall() .evaluate(tousseInstance)) { - return buildErrorMsgJsonResult("器械包已被召回"); + return buildErrorMsgJsonResult("器械包"+barcode+"+已被召回"); } Date validUntil = tousseInstance.getValidUntil(); if (DateTools.isExpire(validUntil, new Date())) { - return buildErrorMsgJsonResult("器械包已过期"); + return buildErrorMsgJsonResult("器械包"+barcode+"已过期"); } Date warningUntil = tousseInstance.getWarningUntil(); if (DateTools.isDuringWarningPeriod(validUntil, warningUntil, @@ -4137,14 +4137,14 @@ Boolean warningTousseWhetherDelivery = cofig .getWarningTousseWhetherDelivery(); if (warningTousseWhetherDelivery) { - tips.add(new JsonPrimitive("器械包即将失效")); + tips.add(new JsonPrimitive("器械包"+barcode+"即将失效")); } else { - return buildErrorMsgJsonResult("器械包处于预警期不能发货"); + return buildErrorMsgJsonResult("器械包"+barcode+"处于预警期不能发货"); } } // 过滤科室 if(filterByDepart(tousseInstance, departCodeOfInvoicePlan)){ - return buildErrorMsgJsonResult(String.format("%s不属于当前科室!", tousseInstance.getTousseName())); + return buildErrorMsgJsonResult(String.format("%s%s不属于当前科室!", tousseInstance.getTousseName(),barcode)); } JsonObject result = new JsonObject();