Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r20111 -r20112 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 20111) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 20112) @@ -1706,6 +1706,16 @@ }else{ retString = JSONUtil.buildErrorMsgJsonResult("请扫描清洗机的位置!"); } + }else if(barcodeDevice instanceof IDCardInstance){ + //标识牌,需要加载标识牌关联的篮筐 + barcodeType = BarcodeDevice.BARCODE_TYPE_SIGNBOARD; + IDCardInstance idCardInstance = (IDCardInstance)barcodeDevice; + IDCardDefinition idCardDefinition = idCardInstance.getIDCardDefinition(objectDao); + BarcodeDevice container = barcodeManager + .getBarcodeByBarcode(idCardDefinition.getContainerBarcode()); + if(container instanceof Container){ + retString = buildJsonResultForWashContainer((Container) container); + } }else { JSONObject json = userManager.user2json(userManager.getUserByBarcode(barcode)); if(json != null){