Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
===================================================================
diff -u -r18964 -r19287
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 18964)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 19287)
@@ -1166,10 +1166,26 @@
 		});
 	}
 
+	function getNextIdNumber(){
+		var nextIdNumber = '';
+		var prevIdNumber = '';
+		var store = gridPanel.getStore();
+		if(store.getCount() > 0){
+			var r = store.getAt(store.getCount() - 1);
+			if(r){
+				var idNumber = r.get('idNumber');
+				if(!isUndefinedOrNullOrEmpty(idNumber) && isAmount(idNumber)){
+					var curIdNumber = parseInt(idNumber,10);
+					nextIdNumber = curIdNumber + 1;
+				}
+			}
+		}
+		return nextIdNumber;
+	}
 	function addIDCardDefinition(){
 		Ext.Ajax.request({
 			url :  WWWROOT + '/disinfectSystem/idCardDefinitionAction!addIDCardDefinition.do',
-			params : {tousseDefinitionId : tousseDefinitionID},
+			params : {tousseDefinitionId : tousseDefinitionID,idNumber:getNextIdNumber()},
 			success : function(response, options) {
 				var result = Ext.decode(response.responseText);
 //				var barcode = result.barcode;
@@ -1200,6 +1216,7 @@
 				//2
 				var idCardInstance = new IDCardInstance(result.idCardInstance);
 				var idCard = new IDCard(result.idCardDefinition);
+//				idCard.set('idNumber',getNextIdNumber());
 				idCard.data.idCardInstances = [idCardInstance.data];
 				idCard.data.status = idCardInstanceState_using;
 				idCard.data.barcode = result.idCardInstance.barcode;
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java
===================================================================
diff -u -r16018 -r19287
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java	(.../IDCardDefinitionManager.java)	(revision 16018)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java	(.../IDCardDefinitionManager.java)	(revision 19287)
@@ -33,7 +33,7 @@
 
 	public void delete_TRANS_MANDATORY(IDCardDefinition idCardDefinition);
 
-	public JSONObject addIDCardDefinition_TRANS_REQUIRED(String tousseDefinitionId);
+	public JSONObject addIDCardDefinition_TRANS_REQUIRED(String tousseDefinitionId,String idNumber);
 	public String addIDCardInstanceToThisDefinition_TRANS_REQUIRED(
 			String tousseDefinitionID, String idCardDefinitionID);
 	
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
===================================================================
diff -u -r19184 -r19287
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 19184)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 19287)
@@ -371,4 +371,14 @@
 		}
 		return JSONUtil.buildJsonObject(false).toString();
 	}
+	
+	public String getIdCardPaperTypeByTousseDefinitionId(
+			String tousseDefinitionID) {
+		String v = null;
+		TousseDefinition tousseDefinition = tousseDefinitionManager.get(tousseDefinitionID);
+		if(tousseDefinition != null){
+			v = tousseDefinition.getIdCardPaperType();
+		}
+		return v;
+	}
 }
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java
===================================================================
diff -u -r16018 -r19287
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java	(.../IDCardDefinitionAction.java)	(revision 16018)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java	(.../IDCardDefinitionAction.java)	(revision 19287)
@@ -137,7 +137,9 @@
 	public void addIDCardDefinition() {
 		String tousseDefinitionId = StrutsParamUtils.getPraramValue(
 				"tousseDefinitionId", "");
-		JSONObject obj = idCardDefinitionManager.addIDCardDefinition_TRANS_REQUIRED(tousseDefinitionId);
+		String idNumber = StrutsParamUtils.getPraramValue(
+				"idNumber", "");
+		JSONObject obj = idCardDefinitionManager.addIDCardDefinition_TRANS_REQUIRED(tousseDefinitionId,idNumber);
 		StrutsResponseUtils.output(obj);
 	}
 	
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js
===================================================================
diff -u -r18965 -r19287
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js	(.../idCardFormExt4.js)	(revision 18965)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js	(.../idCardFormExt4.js)	(revision 19287)
@@ -381,6 +381,18 @@
 	    	handler:cancel
 	    }]
 	});
+	
+	var idCardPaperType2Cmp = top.Ext4.getCmp("idCardPaperType2");
+	if(idCardPaperType2Cmp){
+		// 获取包定义的标识牌标签
+		DWREngine.setAsync(false);
+		TousseDefinitionTableManager.getIdCardPaperTypeByTousseDefinitionId(tousseDefinitionID,function(jsonStr){
+			if(!isUndefinedOrNullOrEmpty(jsonStr)){
+				idCardPaperType2Cmp.setValue(jsonStr);
+			}
+		});
+		DWREngine.setAsync(true);
+	}
 	function cancel() {
 		suppleIDCardWin.close();
 	}
@@ -624,10 +636,26 @@
 		});
 	}
 
+	function getNextIdNumber(){
+		var nextIdNumber = '';
+		var prevIdNumber = '';
+		var store = gridPanel.getStore();
+		if(store.getCount() > 0){
+			var r = store.getAt(store.getCount() - 1);
+			if(r){
+				var idNumber = r.get('idNumber');
+				if(!isUndefinedOrNullOrEmpty(idNumber) && isAmount(idNumber)){
+					var curIdNumber = parseInt(idNumber,10);
+					nextIdNumber = curIdNumber + 1;
+				}
+			}
+		}
+		return nextIdNumber;
+	}
 	function addIDCardDefinition(){
 		Ext.Ajax.request({
 			url :  WWWROOT + '/disinfectSystem/idCardDefinitionAction!addIDCardDefinition.do',
-			params : {tousseDefinitionId : tousseDefinitionID},
+			params : {tousseDefinitionId : tousseDefinitionID,idNumber:getNextIdNumber()},
 			success : function(response, options) {
 				var result = Ext.decode(response.responseText);
 //				var barcode = result.barcode;
@@ -658,6 +686,7 @@
 				//2
 				var idCardInstance = new IdCardInstanceModel(result.idCardInstance);
 				var idCard = new IdCardDefinitionModel(result.idCardDefinition);
+//				idCard.set('idNumber',getNextIdNumber());
 				idCard.data.idCardInstances = [idCardInstance.data];
 				idCard.data.status = idCardInstanceState_using;
 				idCard.data.barcode = result.idCardInstance.barcode;
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
===================================================================
diff -u -r19136 -r19287
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 19136)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 19287)
@@ -418,10 +418,13 @@
 	}
 
 	@Override
-	public JSONObject addIDCardDefinition_TRANS_REQUIRED(String tousseDefinitionId){
+	public JSONObject addIDCardDefinition_TRANS_REQUIRED(String tousseDefinitionId,String idNumber){
 		JSONObject obj = new JSONObject();
 		IDCardDefinition idCardDefinition = new IDCardDefinition();
 		idCardDefinition.setTousseDefinitionID(Long.valueOf(tousseDefinitionId));
+		if(StringUtils.isNotBlank(idNumber)){
+			idCardDefinition.setIdNumber(idNumber);
+		}
 		objectDao.save(idCardDefinition);
 		
 		TousseDefinition tousseDefinition = tousseDefinitionManager.get(tousseDefinitionId);