Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r28457 -r28487
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28457)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28487)
@@ -4149,7 +4149,7 @@
 	                        success : function(result){
 	                        	myMask.destroy();
 	                        	Ext4.getCmp('basketBarcodeInput').setValue('');
-	                        	var jsonObj = Ext4.JSON.decode(result.responseText);
+								var jsonObj = Ext4.JSON.decode(result.responseText);
 	                        	if(!jsonObj.success){
 	                        		showResult(jsonObj.message , null , sstsConfig.messagePauseTimeOnPackingPage);
 	                        		return;
@@ -4159,6 +4159,9 @@
 	                        	if(nLength == 0){
 									showResult('该篮筐在'+taskGroup+'内无装配任务！' , null , sstsConfig.messagePauseTimeOnPackingPage);
 								}
+								if(jsonObj.notWashedInfo !== ''){
+									showResult(jsonObj.notWashedInfo);
+								}
 	                        	var speakBasket = new SpeakBasket();
 								
 	                        	for(var n = 0;n < nLength; n++){
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
===================================================================
diff -u -r24087 -r28487
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 24087)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 28487)
@@ -1607,7 +1607,7 @@
 	var washRecordMsg = top.Ext.getCmp('washRecordMsg').getValue();
 	formObj.form.submit({
 		url : WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!interfereWashAndDisinfectRecord.do',
-		params : {conCurrent :conCurrent, orgWashStartTime : orgWashStartTime, orgWashEndTime : orgWashEndTime,washRecordMsg : washRecordMsg, washPersonInCharge : washPersonInCharge, washPersonInChargeCode : washPersonInChargeCode},
+		params : {conCurrent :conCurrent, orgWashStartTime : orgWashStartTime, orgWashEndTime : orgWashEndTime,washRecordMsg : washRecordMsg, washPersonInCharge : washPersonInCharge, washPersonInChargeCode : washPersonInChargeCode,skipNewBasketVerification:false},
 		method : 'POST',
 		waitMsg : '正在保存数据，请稍候',
 		waitTitle : '提交表单',
@@ -1627,11 +1627,52 @@
 			oldPersonCode = null;
 		},
 		failure : function(form, action) {
-			showResult(action.result.message);
-			Ext.getCmp('washSaveSubmitResult').setValue("-1");
-			top.Ext.getCmp("saveBtn").enable();
-			oldPerson = null; //失败清空旧的责任人
-			oldPersonCode = null;
+			if(action.result.newBasketVerificationMsg){
+				if(action.result.newBasketVerificationMsg.length > 0){
+					var str = '【' + action.result.newBasketVerificationMsg.join(',') + '】';
+					var msg = '清洗篮筐内的'+str+'已经装配，修改清洗记录会导致该包的清洗记录追溯信息修改，是否确认进行修改？'
+				}
+				top.Ext.MessageBox.confirm("请确认",msg,
+				function(button, text) {
+					if ("yes" == button){
+						formObj.form.submit({
+							url : WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!interfereWashAndDisinfectRecord.do',
+							params : {conCurrent :conCurrent, orgWashStartTime : orgWashStartTime, orgWashEndTime : orgWashEndTime,washRecordMsg : washRecordMsg, washPersonInCharge : washPersonInCharge, washPersonInChargeCode : washPersonInChargeCode,skipNewBasketVerification:true},
+							method : 'POST',
+							waitMsg : '正在保存数据，请稍候',
+							waitTitle : '提交表单',
+							success : function(form, action) {
+								var validate = Ext.decode(action.result.success);
+								if(validate){
+									Ext.getCmp('washSaveSubmitResult').setValue("1");
+									showResult(action.result.message);
+									grid.dwrReload();
+									washAndDisinfectRecordWin.close();
+								}else{
+									showResult(action.result.message);
+									Ext.getCmp('washSaveSubmitResult').setValue("-1");
+									top.Ext.getCmp("saveBtn").enable();
+								}
+								oldPerson = null; //成功保存清空旧的责任人
+								oldPersonCode = null;
+							},
+							failure : function(form, action) {
+								showResult(action.result.message);
+								Ext.getCmp('washSaveSubmitResult').setValue("-1");
+								top.Ext.getCmp("saveBtn").enable();
+								oldPerson = null; //失败清空旧的责任人
+								oldPersonCode = null;
+							}
+						});
+					}
+				});
+			}else {
+				showResult(action.result.message);
+				Ext.getCmp('washSaveSubmitResult').setValue("-1");
+				top.Ext.getCmp("saveBtn").enable();
+				oldPerson = null; //失败清空旧的责任人
+				oldPersonCode = null;
+			}
 		}
 	});
 }