Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/instrumentConfig.js
===================================================================
diff -u -r37871 -r37952
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/instrumentConfig.js	(.../instrumentConfig.js)	(revision 37871)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/instrumentConfig.js	(.../instrumentConfig.js)	(revision 37952)
@@ -65,7 +65,7 @@
 					thiz.baseParams["UDICode"] = top.Ext.getCmp('UDICode').getValue();
 				}
 				if (top.Ext.getCmp('materialEntryItemSupplier')) {
-					thiz.baseParams["materialEntryItemSupplier"] = top.Ext.getCmp('materialEntryItemSupplier').getValue();
+					thiz.baseParams["materialEntryItemSupplier"] = top.Ext.getCmp('materialEntryItemSupplier').getRawValue();
 				}
 				if (top.Ext.getCmp('instrumentBarcode2')) {
 					thiz.baseParams["instrumentBarcode"] = top.Ext.getCmp('instrumentBarcode2').getValue();
@@ -136,7 +136,7 @@
 				var id = record.get('id') || '';
 				var newMaterialDefinitionName = record.get('materialDefinitionName') || '';
 				if (oid == 0 || oid == '0') {
-					return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().bindInstrument('" + id + "','" + idCardInstanceId + "');\">添加</a>";
+					return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().bindInstrument('" + id + "','" + idCardInstanceId + "','" + materialDefinitionName + "','" + newMaterialDefinitionName + "');\">添加</a>";
 				} else {
 					return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().replaceInstrument('" + id + "','" + oid + "','" + idCardInstanceId + "','" + materialDefinitionName + "','" + newMaterialDefinitionName + "');\">替换</a>";
 				}
@@ -401,8 +401,18 @@
 }
 
 //绑定器械
-function bindInstrument(instrumentInstanceId, IDCardInstanceId) {
+function bindInstrument(instrumentInstanceId, IDCardInstanceId, materialDefinitionName, newMaterialDefinitionName, isConfirm) {
 	var replaceMaterialDefinitionId = top.Ext.getCmp('replaceMaterialDefinitionId').getValue();
+	if (materialDefinitionName.indexOf(newMaterialDefinitionName) == -1 && !isConfirm) {
+		top.Ext.MessageBox.confirm("请确认", "替换后将同步更换包定义中的材料，是否继续？", function (btn) {
+			if (btn == 'yes') {
+				bindInstrument(newInstrumentInstanceId, IDCardInstanceId, materialDefinitionName, newMaterialDefinitionName, true)
+			} else {
+				return false;
+			}
+		});
+		return
+	}
 	Ext.Ajax.request({
 		url: WWWROOT + '/disinfectSystem/baseData/IDCardInstanceBindInstrumentController/IDCardInstanceBindInstrument.mhtml',
 		async: false,