Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r33881 -r33883 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 33881) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 33883) @@ -8386,7 +8386,7 @@ } scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState = CssdUtils.getSystemSetConfigByNameBool("scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState", false); if(tousseInstance != null && !isFixedBarcode && scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState){ - errorMessage = getScanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedStateErrorMessage(tousseInstance, "包外标签条码"); + errorMessage = getScanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedStateErrorMessage(tousseInstance, "包外标签条码",tousseInstance.getBarcode()); if(StringUtils.isNotBlank(errorMessage)){ break out; } @@ -8549,7 +8549,7 @@ } else { scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState = CssdUtils.getSystemSetConfigByNameBool("scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState", false); if(scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState){ - errorMessage = getScanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedStateErrorMessage(tousseInstance, "标识牌条码"); + errorMessage = getScanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedStateErrorMessage(tousseInstance, "标识牌条码", barcode); if(StringUtils.isNotBlank(errorMessage)){ break out; } @@ -8725,10 +8725,10 @@ * @param scavengingSource 扫码来源 包外标签条码 或 标识牌条码 * @return */ - public String getScanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedStateErrorMessage(TousseInstance tousseInstance, String scavengingSource){ + public String getScanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedStateErrorMessage(TousseInstance tousseInstance, String scavengingSource, String barcode){ String errorMessage = null; if(TousseInstance.STATUS_SHIPPED.equals(tousseInstance.getStatus()) || TousseInstance.STATUS_SIGNED.equals(tousseInstance.getStatus())){ - errorMessage = "【"+ scavengingSource +"】为【"+ tousseInstance.getBarcode() +"】的【"+ tousseInstance.getTousseName() +"】的状态为【"+ tousseInstance.getStatus() +"】,未录入使用记录,请录入使用记录后再进行回收!"; + errorMessage = "【"+ scavengingSource +"】为【"+ barcode +"】的【"+ tousseInstance.getTousseName() +"】的状态为【"+ tousseInstance.getStatus() +"】,未录入使用记录,请录入使用记录后再进行回收!"; } return errorMessage; }