Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
===================================================================
diff -u -r13067 -r14857
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 13067)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 14857)
@@ -151,6 +151,10 @@
 	});
 
 	idCardInstancesGridStore = new top.Ext.data.Store({
+		proxy : new top.Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/idCardDefinitionAction!loadIDCardInstanceInfo.do',
+			method : 'POST'
+		}),
 		reader : new top.Ext.data.JsonReader({
 			fields : idCardInstanceFields
 		})
@@ -216,10 +220,15 @@
 	});
 
 	signMaterileGridStore = new top.Ext.data.Store({
+		proxy : new top.Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/idCardDefinitionAction!loadTraceableMaterialInfo.do',
+			method : 'POST'
+		}),
 		reader : new top.Ext.data.JsonReader({
 			fields : traceableMaterialFields
 		})
 	});
+		
 	signMaterilenStore = new top.Ext.data.Store({
 		proxy : new top.Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/idCardDefinitionAction!loadMaterilenByid.do',
@@ -1007,27 +1016,39 @@
 			return;
 		}
 		var idCardInstances = record.data.idCardInstances;
-		var useAmount = 0;
-		if(isUndefinedOrNull(idCardInstances)){
-			return;
-		}
-		if(idCardInstances !=null && idCardInstances.length > 0 ){
-			for(var i=0;i<idCardInstances.length;i++){
-					var idCardInstance = idCardInstances[i];
-					var id = idCardInstance.id;
-					var barcode = idCardInstance.barcode;
-					var status = idCardInstance.status;
-					var printDate = idCardInstance.printDate;
-					
-					if('使用中' == status){
-						record.set("barcode",barcode);
+		if(record.data.idCardInstancesLoad){
+			
+		}else{
+			idCardInstancesGridStore.baseParams['idCardDefinitionId'] = record.data.id;
+			idCardInstancesGridStore.load({
+				callback:function(records,options,success){
+					if(success){
+						
 					}
-					var d = new IDCardInstance(idCardInstance);
-					useAmount += idCardInstance.useAmount;
-					idCardInstancesGridPanel.getStore().add(d);
-			}
-			record.set("useAmount",useAmount);
+					}});
 		}
+		
+//		var useAmount = 0;
+//		if(isUndefinedOrNull(idCardInstances)){
+//			return;
+//		}
+//		if(idCardInstances !=null && idCardInstances.length > 0 ){
+//			for(var i=0;i<idCardInstances.length;i++){
+//					var idCardInstance = idCardInstances[i];
+//					var id = idCardInstance.id;
+//					var barcode = idCardInstance.barcode;
+//					var status = idCardInstance.status;
+//					var printDate = idCardInstance.printDate;
+//					
+//					if('使用中' == status){
+//						record.set("barcode",barcode);
+//					}
+//					var d = new IDCardInstance(idCardInstance);
+//					useAmount += idCardInstance.useAmount;
+//					idCardInstancesGridPanel.getStore().add(d);
+//			}
+//			record.set("useAmount",useAmount);
+//		}
 	}
 
 	function loadDataToSignMaterileGridStore(){
@@ -1037,15 +1058,22 @@
 		if(isUndefinedOrNull(record)){
 			return;
 		}
-		var traceableMaterials = record.data.traceableMaterials;
-		if(traceableMaterials != null && traceableMaterials.length > 0 ){
-			for(var i=0;i<traceableMaterials.length;i++){
-					var traceableMaterial = traceableMaterials[i];
-//					dumpObj(traceableMaterial)
-					var traceableMaterialsRecord = new TraceableMaterial(traceableMaterial);
-					traceableMaterialStore.add(traceableMaterialsRecord);
-			}
-		}
+		traceableMaterialStore.baseParams['idCardDefinitionId'] = record.data.id;
+		traceableMaterialStore.load({
+			callback:function(records,options,success){
+				if(success){
+					
+				}
+				}});
+//		var traceableMaterials = record.data.traceableMaterials;
+//		if(traceableMaterials != null && traceableMaterials.length > 0 ){
+//			for(var i=0;i<traceableMaterials.length;i++){
+//					var traceableMaterial = traceableMaterials[i];
+////					dumpObj(traceableMaterial)
+//					var traceableMaterialsRecord = new TraceableMaterial(traceableMaterial);
+//					traceableMaterialStore.add(traceableMaterialsRecord);
+//			}
+//		}
 	}
 	
 	function loadIDCardDefinitions(){
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java
===================================================================
diff -u -r12922 -r14857
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java	(.../IDCardInstanceManagerImpl.java)	(revision 12922)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java	(.../IDCardInstanceManagerImpl.java)	(revision 14857)
@@ -77,6 +77,12 @@
 						Long.valueOf(id));
 	}
 	
+	public IDCardInstance getIDCardInstanceById_ForUpdate(String id){
+		return (IDCardInstance) objectDao
+				.getByProperty_ForUpdate(IDCardInstance.class.getSimpleName(), "id",
+						Long.valueOf(id));
+	}
+	
 	public IDCardInstance getIDCardInstanceByBarcode(String barcode) {
 
 		return (IDCardInstance) objectDao
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInstanceManager.java
===================================================================
diff -u -r12922 -r14857
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInstanceManager.java	(.../IDCardInstanceManager.java)	(revision 12922)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInstanceManager.java	(.../IDCardInstanceManager.java)	(revision 14857)
@@ -18,6 +18,7 @@
 	public void delete_TRANS_MANDATORY(IDCardInstance idCardInstance);
 
 	public IDCardInstance getIDCardInstanceByID(String id);
+	public IDCardInstance getIDCardInstanceById_ForUpdate(String id);
 
 	public IDCardInstance getIDCardInstanceByBarcode(String barcode);
 
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java
===================================================================
diff -u -r14799 -r14857
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java	(.../IDCardDefinitionAction.java)	(revision 14799)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java	(.../IDCardDefinitionAction.java)	(revision 14857)
@@ -12,9 +12,11 @@
 import org.apache.struts2.convention.annotation.ParentPackage;
 
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
+import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.TraceableMaterial;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.idcarddefinition.IDCardDefinition;
+import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance;
 import com.forgon.disinfectsystem.idcarddefinition.service.IDCardDefinitionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.serialnumber.model.SerialNum;
@@ -69,6 +71,20 @@
 		}
 
 	}
+	public void loadIDCardInstanceInfo() {
+		String idCardDefinitionId = StrutsParamUtils.getPraramValue("idCardDefinitionId", "");
+		JSONArray data = idCardDefinitionManager
+				.getIDCardInstanceByIDCardDefinitionId(idCardDefinitionId);
+		
+		StrutsResponseUtils.output(data);
+	}
+	
+	public void loadTraceableMaterialInfo() {
+		String idCardDefinitionId = StrutsParamUtils.getPraramValue("idCardDefinitionId", "");
+		JSONArray data = idCardDefinitionManager
+				.getTraceableMaterialByIDCardDefinitionId(idCardDefinitionId);
+		StrutsResponseUtils.output(data);
+	}
 
 	public void loadMaterilenByid() {
 		String id = StrutsParamUtils.getPraramValue("id", "");