Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r13424 -r13541 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 13424) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 13541) @@ -60,6 +60,7 @@ import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsIdentification; +import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveDisposablegoods; import com.forgon.disinfectsystem.entity.basedatamanager.cleanmethod.CleanMethod; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; @@ -1196,7 +1197,8 @@ BarcodeDevice barcodeDevice = barcodeManager .getBarcodeByBarcode(barcode); - if (barcodeDevice == null || !(barcodeDevice instanceof TousseInstance)) { + if (barcodeDevice == null /*|| (!(barcodeDevice instanceof TousseInstance) && !(barcodeDevice instanceof ExpensiveDisposablegoods) + && !(barcodeDevice instanceof DisposableGoodsBatch))*/) { //可能是使用记录 UseRecord useRecord = useRecordManager.getSyncUseRecordByHostpitalNumOrTreatmentNum(barcode, "hospitalNum"); if(useRecord == null){ @@ -1211,7 +1213,13 @@ } return JSONUtil.buildErrorMsgJsonResult("查无此物品"); } - + if(barcodeDevice instanceof DisposableGoodsBatch){ + return JSONUtil.buildErrorMsgJsonResult("暂不支持登记一次性物品"); + } + if(barcodeDevice instanceof ExpensiveDisposablegoods){ + return JSONUtil.buildErrorMsgJsonResult("暂不支持登记高值耗材"); + } + // ***验证器械包*** TousseInstance tousseInstance = (TousseInstance) barcodeDevice; // 暂不支持登记除普通器械包以外的包