Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r31118 -r31120
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31118)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31120)
@@ -3702,10 +3702,14 @@
 			 Ext4.each(selNodes,function(cNode){
 				if(cNode.childNodes.length > 0){
 					isChackAll = true;
-					if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && cNode.data.tousseType == '外来器械包'){
+					if(cNode.data.tousseType == '外来器械包'){
 						for(var k=0;k<cNode.childNodes.length;k++){
-							if(cNode.childNodes[k].data.packedPhotographed == '' || cNode.childNodes[k].data.packedPhotographed == false){
+							if(sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.childNodes[k].data.partPacking){
 								packedPhotographed = false;
+								msg = cNode.childNodes[k].data.tousseName+'已经做了拆包，请点击拆包进入完成操作!';
+							}
+							if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && !cNode.childNodes[k].data.packedPhotographed){
+								packedPhotographed = false;
 								msg = cNode.childNodes[k].data.tousseName+'还未上传照片，不能装配，请先上传照片!';
 							}
 						}
@@ -3729,6 +3733,12 @@
 					damages = cNode.get("damages");
 					errors = cNode.get("errors");
 					department = cNode.get("department");
+					if(sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.get("tousseType") == '外来器械包'){
+						if(cNode.get("partPacking")){
+							msg = cNode.get("tousseName") +'已经做了拆包，请点击拆包进入完成操作!';
+							packedPhotographed = false;
+						}
+					}
 					if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && cNode.get("tousseType") == '外来器械包'){
 						if(cNode.get("packedPhotographed") == '' || cNode.get("packedPhotographed") == false){
 							msg = cNode.get("tousseName") +'还未上传照片，不能装配，请先上传照片!';