Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
===================================================================
diff -u -r31301 -r32017
--- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 31301)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 32017)
@@ -9,7 +9,7 @@
  * @param tousseDefinitionId 包定义id
  * @param isLook 是查看还是拍摄 true查看 false需要拍摄和上传
  */
-function takeImgAndVideoSplit(imageIdsArry,videoIdsArry,isLook,tousseDefinitionId){
+function takeImgAndVideoSplit(imageIdsArry,videoIdsArry,isLook,tousseDefinitionId,rowNum){
 	var imageType = '包实例装配采集图片';
 	if(Ext4.chromeVersion < 62){
 	   showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage);
@@ -44,6 +44,12 @@
                 var splitedTousseStore = top.Ext4.getCmp("splitedTousseGrid").getStore();
                 var item = [];
                 for(var i=0;i<splitedTousseStore.getCount();i++){
+                    var imageIdsArry = splitedTousseStore.getAt(i).get('imageIdsArry');
+                    var videoIdsArry = splitedTousseStore.getAt(i).get('videoIdsArry');
+                    if(!returnValue && rowNum == splitedTousseStore.getAt(i).get('rowNum')){
+                        imageIdsArry = [];
+                        videoIdsArry = [];
+                    }
                     item[i] = {
                         tousseName : splitedTousseStore.getAt(i).get('tousseName'),
                         tousseNameAlias : splitedTousseStore.getAt(i).get('tousseNameAlias'),
@@ -56,8 +62,8 @@
                         sterilingType:splitedTousseStore.getAt(i).get('sterilingType'),
                         partialSplitForeignTousse:splitedTousseStore.getAt(i).get('partialSplitForeignTousse'),
                         rowNum:splitedTousseStore.getAt(i).get('rowNum'),
-                        imageIdsArry:returnValue?splitedTousseStore.getAt(i).get('imageIdsArry'):[],
-                        videoIdsArry:returnValue?splitedTousseStore.getAt(i).get('videoIdsArry'):[]
+                        imageIdsArry:imageIdsArry,
+                        videoIdsArry:videoIdsArry
                     };
                 }
                 splitedTousseStore.reload();
@@ -1300,7 +1306,8 @@
 			videoIdsArry = data.videoIdsArry;
         }
         var tousseDefinitionId = '';
-		takeImgAndVideoSplit(imageIdsArry,videoIdsArry,false,tousseDefinitionId);
+        var rowNum = data.rowNum;
+		takeImgAndVideoSplit(imageIdsArry,videoIdsArry,false,tousseDefinitionId,rowNum);
 		
 		// 弹出窗口
 		/* var pageUrl = WWWROOT + '/disinfectsystem/test/video_split.jsp';
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js
===================================================================
diff -u -r31997 -r32017
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js	(.../interfereForeignTousseApplicationForm.js)	(revision 31997)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js	(.../interfereForeignTousseApplicationForm.js)	(revision 32017)
@@ -4,6 +4,7 @@
 var addSplitMaterial;
 var rightMaterialGridPanel;
 var rightMaterialStore;
+var rowNum = 0;
 
 var childPackagePanel;
 var childPackageStore;
@@ -281,12 +282,15 @@
         j++;
         var record = new addMaterial({
             tousseName : packageName,
+            tousseNameAlias : '',
             materialNames : materialsStr,
             materialsJsonArray : materialsArray,
             packingType : type,
             bigPackage : "否",
             toolAmount : toolAmount,
-            implantAmount : implantAmount
+            implantAmount : implantAmount,
+            sterilingType:'',
+			rowNum:rowNum++
         });
         childPackageStore.add(record);
          //删除
@@ -317,12 +321,18 @@
         }
         var tousse = {};
         tousse.tousseName = tousseName;
+        if(record.get('tousseNameAlias') == record.get('tousseName') || record.get('tousseNameAlias') == '' || record.get('tousseNameAlias') == null){
+            tousse.tousseNameAlias = tousseName;
+        }else {
+            tousse.tousseNameAlias = tousseNameAlias;
+        }
         tousse.materialNames = record.get('materialNames');
         tousse.materialsJsonArray = record.get('materialsJsonArray');
         tousse.bigPackage = record.get('bigPackage');
         tousse.packingType = record.get('packingType');
         tousse.toolAmount = record.get('toolAmount');
         tousse.implantAmount = record.get('implantAmount');
+        tousse.sterilingMethod = record.get('sterilingType');
         packages.push(tousse);
         
     }
@@ -390,7 +400,8 @@
         videoIdsArry = data.videoIdsArry;
     }
     var tousseDefinitionId = '';
-    takeImgAndVideoSplit(imageIdsArry,videoIdsArry,false,tousseDefinitionId);
+    var rowNum = data.rowNum;
+    takeImgAndVideoSplit(imageIdsArry,videoIdsArry,false,tousseDefinitionId,rowNum);
 }
 
 function isSplitComplete(){
@@ -410,7 +421,7 @@
     return true;
 }
 
-function takeImgAndVideoSplit(imageIdsArry,videoIdsArry,isLook,tousseDefinitionId){
+function takeImgAndVideoSplit(imageIdsArry,videoIdsArry,isLook,tousseDefinitionId,rowNum){
 	var imageType = '包实例装配采集图片';
 	if(Ext4.chromeVersion < 62){
 	   showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage);
@@ -446,6 +457,12 @@
                 var item = [];
                 for(var i=0;i<childPackageStore.getCount();i++){
                     var record = childPackageStore.getAt(i);
+                    var imageIdsArry = record.get('imageIdsArry');
+                    var videoIdsArry = record.get('videoIdsArry');
+                    if(!returnValue && rowNum == record.get('rowNum')){
+                        imageIdsArry = [];
+                        videoIdsArry = [];
+                    }
                     item[i] = new addSplitMaterial({
                         tousseName : record.get('tousseName'),
                         tousseNameAlias : record.get('tousseNameAlias'),
@@ -458,8 +475,8 @@
                         sterilingType:record.get('sterilingType'),
                         partialSplitForeignTousse:record.get('partialSplitForeignTousse'),
                         rowNum:record.get('rowNum'),
-                        imageIdsArry:returnValue?record.get('imageIdsArry'):[],
-                        videoIdsArry:returnValue?record.get('videoIdsArry'):[]
+                        imageIdsArry:imageIdsArry,
+                        videoIdsArry:videoIdsArry
                     }); 
                 }
                 childPackageStore.removeAll();
@@ -1007,13 +1024,17 @@
             {name : 'packingType'},
             {name : 'total'},
             {name : 'bigPackage'},{
+                name : 'rowNum'
+            },{
                 name : 'partialSplitForeignTousse'
             },{
-                name : 'haveImageFileAmount'
+                name : 'sterilingType'
             },{
-                name : 'imageIdsArry'
+                name : 'tousseNameAlias'
             },{
                 name : 'haveImageFileAmount'
+            },{
+                name : 'imageIdsArry'
             }
         ]
     });