Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r23983 -r23992 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 23983) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 23992) @@ -1139,6 +1139,7 @@ loadUnSupplementMaterial(msg,tmpRow,ti.barcode); } }else{ //扫描标识牌实例条码 + barcode = msg.idCardInstance.barcode; if($('#depart').attr('value') == ''){ $('#depart').val(msg.tousseInstance.locationForDisplay) $('#departCode').val(msg.tousseInstance.location) Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r23635 -r23992 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 23635) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 23992) @@ -875,6 +875,7 @@ boolean isTousseNeedMaintain = false; //扫描的条码是否为标识牌条码 boolean isIDCardInstance = false; + IDCardInstance idCardInstance = null; String errorMessage = null; Long idCardUseAmount = null; List details = null; @@ -951,7 +952,7 @@ } else if (barcodeDevice instanceof User) { user = (User) barcodeDevice; } else if (barcodeDevice instanceof IDCardInstance) { - IDCardInstance idCardInstance = (IDCardInstance) barcodeDevice; + idCardInstance = (IDCardInstance) barcodeDevice; isIDCardInstance = true; Long idCardDefinitionId = idCardInstance.getIdCardDefinitionID(); IDCardDefinition idCardDefinition = idCardDefinitionManager.get(idCardDefinitionId); @@ -1076,6 +1077,7 @@ map.put("errorMessage", errorMessage); map.put("idCardUseAmount", idCardUseAmount); map.put("isIDCardInstance", isIDCardInstance); + map.put("idCardInstance", idCardInstance); map.put("isTousseNeedMaintain", isTousseNeedMaintain); map.put("unSupplementMaterials", details); map.put("unfinishedPackingTask", unfinishedPackingTask);