Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r22662 -r22810
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 22662)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 22810)
@@ -104,6 +104,10 @@
 	    		var tousseId = tousseInfo.idCard.tousseDefinition.id;
 	        	var tousseName = tousseInfo.idCard.tousseDefinition.name;
 	        	var tousseType = tousseInfo.idCard.tousseDefinition.tousseType;
+	        	if(!tousseInfo.idCard.tousseDefinition.isCustomPacking){
+	        		showResult('该器械包不能自定义装配');
+	        		return;
+	        	}
 	        	Ext.getCmp('idCardBarcode').setValue(tousseInfo.idCard.id);
 	        	Ext.getCmp('idCardDefinitionId').setValue(tousseInfo.idCard.idCardDefinitionId);
 	        	Ext.getCmp('idCardName').setValue(tousseName);
@@ -160,6 +164,10 @@
 	    		var tousseId = tousseInfo.tousseDefinitionId;
 	        	var tousseName = tousseInfo.tousseName;
 	        	var tousseType = tousseInfo.tousseType;
+	        	if(!tousseInfo.isCustomPacking){
+	        		showResult('该器械包不能自定义装配');
+	        		return;
+	        	}
 	        	Ext.getCmp('idCardBarcode').setValue(tousseInfo.idCardId);
 	        	Ext.getCmp('idCardDefinitionId').setValue(tousseInfo.idCardDefinitionId);
 	        	Ext.getCmp('idCardName').setValue(tousseName);
@@ -197,10 +205,15 @@
 		PackingTableManager.loadTousseByBarcodeForRepacking(barcode,function(resultJsonStr){
 	    	var tousseInfo = JSON.parse(resultJsonStr);
 	    	if(tousseInfo.success){
+	    		if(!tousseInfo.isCustomPacking){
+	        		showResult('该器械包不能自定义装配');
+	        		return;
+	        	}
 	        	if(Ext.getCmp('packingMode_id').getValue() == "directPacking" && !tousseInfo.isTousseFixedBarcode){
 	        		showResult("自定义装配模式下，只能扫器械包固定条码");
 	        		return false;
 	        	}
+	        	
 	    		var tousseId = tousseInfo.tousseDefinitionId;
 	        	var tousseName = tousseInfo.tousseName;
 	        	var tousseType = tousseInfo.tousseType;
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
===================================================================
diff -u -r22654 -r22810
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 22654)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 22810)
@@ -163,6 +163,7 @@
 				tousseDefinitionObj.put("name", tousseDefinition.getName());
 				tousseDefinitionObj.put("tousseType",
 						tousseDefinition.getTousseType());
+				tousseDefinitionObj.put("isCustomPacking", tousseDefinition.isCustomPacking());
 
 				wci.put("tousseDefinition", tousseDefinitionObj);
 				returnObj.put("idCard", wci);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
===================================================================
diff -u -r22199 -r22810
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 22199)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 22810)
@@ -1022,6 +1022,13 @@
 		return videos;
 	}
 
+	@Transient
+	public boolean isCustomPacking(){
+		if(STR_YES.equals(getIsCustomPacking())){
+			return true;
+		}
+		return false;
+	}
 	public String getIsCustomPacking() {
 		if(isCustomPacking == null || "".equals(isCustomPacking)){
 			isCustomPacking = STR_YES;
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
===================================================================
diff -u -r22768 -r22810
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java	(.../PackingTableManager.java)	(revision 22768)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java	(.../PackingTableManager.java)	(revision 22810)
@@ -707,6 +707,7 @@
 			obj.put("tousseDefinitionId", tousseDefinition.getId());
 			obj.put("tousseName", tousseDefinition.getName());
 			obj.put("tousseType", tousseDefinition.getTousseType());
+			obj.put("isCustomPacking", tousseDefinition.isCustomPacking());
 			obj.put("idCardId", idCardInstance.getId());
 			obj.put("idCardBarcode", idCardInstance.getBarcode());
 			obj.put("idCardDefinitionId", idCardInstance.getIdCardDefinitionID());
@@ -752,6 +753,7 @@
 			obj.put("tousseDefinitionId", tousseDefinition.getId());
 			obj.put("tousseName", tousseDefinition.getName());
 			obj.put("tousseType", tousseDefinition.getTousseType());
+			obj.put("isCustomPacking", tousseDefinition.isCustomPacking());
 //			obj.put("idCardBarcode", idCardInstance.getBarcode());
 //			obj.put("idCardDefinitionId", idCardInstance.getIdCardDefinitionID());
 			obj.put("operator", tousseInstance.getOperator());