Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r31180 -r31272
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31180)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31272)
@@ -3733,13 +3733,13 @@
 					damages = cNode.get("damages");
 					errors = cNode.get("errors");
 					department = cNode.get("department");
-					if(sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.get("tousseType") == '外来器械包'){
+					if(sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.get("tousseType") == '外来器械包' && msg == ''){
 						if(cNode.get("partPacking")){
 							msg = cNode.get("tousseName") +'已经做了拆包，请点击拆包进入完成操作!';
 							packedPhotographed = false;
 						}
 					}
-					if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && cNode.get("tousseType") == '外来器械包'){
+					if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && cNode.get("tousseType") == '外来器械包' && msg == ''){
 						if(cNode.get("packedPhotographed") == '' || cNode.get("packedPhotographed") == false){
 							msg = cNode.get("tousseName") +'还未上传照片，不能装配，请先上传照片!';
 							packedPhotographed = false;