Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
===================================================================
diff -u -r33185 -r34895
--- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 33185)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 34895)
@@ -95,7 +95,7 @@
     top.Ext4.getCmp("splitedMaterialGrid").setTitle("已拆分的材料" + str + "材料数量：" + totalAmount);
 }
 
-function addMaterialToSplitGrid(splitedMaterialStore,materialName,materialAmount,includeImplant){
+function addMaterialToSplitGrid(splitedMaterialStore,materialName,materialAmount,includeImplant,materialType){
 	if(materialAmount <= 0){
 		return false;
 	}
@@ -105,7 +105,8 @@
 			materialName : materialName,
 			materialAmount : materialAmount,
 			splitAmount : materialAmount,
-			includeImplant : includeImplant
+			includeImplant : includeImplant,
+            materialType : materialType
 		}]
 		splitedMaterialStore.insert(0,addItem);
 	}else{
@@ -124,7 +125,7 @@
 		var store = waitSplitMaterialGrid.getStore();
 		for(var i = 0 ; i < store.getCount() ; i++){
 			var record = store.getAt(i);
-			addMaterialToSplitGrid(splitedMaterialStore,record.get("materialName"),record.get("materialAmount"),record.get("includeImplant"));
+			addMaterialToSplitGrid(splitedMaterialStore,record.get("materialName"),record.get("materialAmount"),record.get("includeImplant"),record.get("materialType"));
 		}
 		waitSplitMaterialStore.removeAll();
 	}else{
@@ -138,12 +139,12 @@
 			var splitAmount = records[i].data['splitAmount'];//拆分数量
 			var materialAmount = records[i].data["materialAmount"];//总数量
 			var includeImplant = records[i].data["includeImplant"];
-			
+			var materialType = records[i].data["materialType"];
 			if(splitAmount > materialAmount){
                 showResult("拆分数量不能大于剩余数量！" , null , sstsConfig.messagePauseTimeOnPackingPage);
                 return false;
             }
-			addMaterialToSplitGrid(splitedMaterialStore,materialName,splitAmount,includeImplant);
+			addMaterialToSplitGrid(splitedMaterialStore,materialName,splitAmount,includeImplant,materialType);
              
             if(splitAmount == materialAmount){
         	    waitSplitMaterialStore.remove(records[i]);
@@ -166,7 +167,7 @@
 	if(isAllMove){
 		for(var i = 0 ; i < splitedMaterialStore.getCount() ; i++){
 			var record = splitedMaterialStore.getAt(i);
-			addMaterialToSplitGrid(waitSplitMaterialStore,record.get("materialName"),record.get("materialAmount"),record.get("includeImplant"));
+			addMaterialToSplitGrid(waitSplitMaterialStore,record.get("materialName"),record.get("materialAmount"),record.get("includeImplant"),record.get("materialType"));
 		}
 		splitedMaterialStore.removeAll();
 	}else{
@@ -179,7 +180,8 @@
 			var materialName = records[i].data["materialName"];
 			var materialAmount = records[i].data["materialAmount"];//总数量
 			var includeImplant = records[i].data["includeImplant"];
-			addMaterialToSplitGrid(waitSplitMaterialStore,materialName,materialAmount,includeImplant);
+            var materialType = records[i].data["materialType"];
+			addMaterialToSplitGrid(waitSplitMaterialStore,materialName,materialAmount,includeImplant,materialType);
 			splitedMaterialStore.remove(records[i]);
 		}
 	}
@@ -214,6 +216,7 @@
         
         var materialObj = {};
         materialObj.name = record.get('materialName');
+        materialObj.materialType = record.get('materialType');
         materialObj.includeImplant = includeImplant;
         materialObj.materialAmount = record.get('materialAmount');
         materialsArray.push(materialObj);
@@ -536,6 +539,7 @@
         	},fields : [
         	    {name : 'materialName',mapping : 'materialName'}, 
         	    {name : 'splitAmount',mapping : 'splitAmount'}, 
+                {name : 'materialType',mapping : 'materialType'}, 
         	    {name : 'materialAmount',mapping : 'materialAmount'}, 
         	    {name : 'includeImplant',mapping : 'includeImplant'}
         	]
@@ -586,6 +590,7 @@
         	},fields : [
         	    {name : 'materialName',mapping : 'materialName'}, 
         	    {name : 'splitAmount',mapping : 'splitAmount'}, 
+                {name : 'materialType',mapping : 'materialType'}, 
         	    {name : 'materialAmount',mapping : 'materialAmount'}, 
         	    {name : 'includeImplant',mapping : 'includeImplant'}
         	  ]