Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.jsp
===================================================================
diff -u -r40839 -r40862
--- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.jsp	(.../instrumentRepairManagementView.jsp)	(revision 40839)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.jsp	(.../instrumentRepairManagementView.jsp)	(revision 40862)
@@ -36,7 +36,7 @@
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/PackingTableManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/TousseMaintainTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="instrumentRepairManagementView.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="instrumentRepairManagementForm.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="instrumentRepairManagementForm2.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js
===================================================================
diff -u -r40846 -r40862
--- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js	(.../instrumentRepairManagementForm.js)	(revision 40846)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js	(.../instrumentRepairManagementForm.js)	(revision 40862)
@@ -28,27 +28,13 @@
 
 //扫描标识牌条码
 function loadIdCardByBarcode(barcode, index) {
-	PackingTableManager.getIDCardInfo(barcode, function (resultJsonStr) {
-		var tousseInfo = JSON.parse(resultJsonStr);
-		if (tousseInfo.success) {
-			var tousseDefinitionID = tousseInfo.idCard.tousseDefinition.id;
-			var name = tousseInfo.idCard.tousseDefinition.name;
-			if (index == undefined) {
-				var oldName = top.Ext4.getCmp('hiddenTousseDefinitionName').getValue();
-				if (oldName !== '' && oldName !== name) {
-					top.Ext4.MessageBox.confirm("请确认", "当前标识牌条码和所选的器械包不匹配，是否变更器械包名称？", function (button, text) {
-						if ("yes" == button) {
-							top.Ext4.getCmp('tousseDefinitionID').setValue(tousseDefinitionID);
-							top.Ext4.getCmp('hiddenTousseDefinitionName').setValue(name);
-							top.Ext4.getCmp('tousseDefinitionName').setRawValue(name + '(' + barcode + ')');
-							top.Ext4.getCmp('idCardInstanceBarcode').setValue(barcode);
-							top.Ext4.getCmp('materialDefinitionID').setValue('');
-							top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue('');
-							top.Ext4.getCmp('materialDefinitionName').setValue('');
-							top.Ext4.getCmp('instrumentBarcode').setValue('');
-						}
-					});
-				} else {
+	TousseMaintainTableManager.getMaintainMsgByIdcardID(barcode, function (responseText) {
+		if (!isUndefinedOrNullOrEmpty(responseText)) {
+			var result = top.Ext4.JSON.decode(responseText);
+			if (result.success) {
+				var tousseDefinitionID = result.tousseDefinitionId;
+				var name = result.tousseName;
+				if (index == undefined) {
 					top.Ext4.getCmp('tousseDefinitionID').setValue(tousseDefinitionID);
 					top.Ext4.getCmp('hiddenTousseDefinitionName').setValue(name);
 					top.Ext4.getCmp('tousseDefinitionName').setRawValue(name + '(' + barcode + ')');
@@ -57,22 +43,6 @@
 					top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue('');
 					top.Ext4.getCmp('materialDefinitionName').setValue('');
 					top.Ext4.getCmp('instrumentBarcode').setValue('');
-				}
-			} else {
-				var oldName = top.Ext4.getCmp('hiddenTousseDefinitionName_' + index).getValue();
-				if (oldName !== '' && oldName !== name) {
-					top.Ext4.MessageBox.confirm("请确认", "当前标识牌条码和所选的器械包不匹配，是否变更器械包名称？", function (button, text) {
-						if ("yes" == button) {
-							top.Ext4.getCmp('tousseDefinitionID_' + index).setValue(tousseDefinitionID);
-							top.Ext4.getCmp('hiddenTousseDefinitionName_' + index).setValue(name);
-							top.Ext4.getCmp('tousseDefinitionName_' + index).setRawValue(name + '(' + barcode + ')');
-							top.Ext4.getCmp('idCardInstanceBarcode_' + index).setValue(barcode);
-							top.Ext4.getCmp('materialDefinitionID_' + index).setValue('');
-							top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).setValue('');
-							top.Ext4.getCmp('materialDefinitionName_' + index).setValue('');
-							top.Ext4.getCmp('instrumentBarcode_' + index).setValue('');
-						}
-					});
 				} else {
 					top.Ext4.getCmp('tousseDefinitionID_' + index).setValue(tousseDefinitionID);
 					top.Ext4.getCmp('hiddenTousseDefinitionName_' + index).setValue(name);
@@ -84,10 +54,9 @@
 					top.Ext4.getCmp('instrumentBarcode_' + index).setValue('');
 				}
 			}
+		} else {
+			showResult('找不到该条码所对应的信息', null, sstsConfig.messagePauseTimeOnPackingPage);
 		}
-		else {
-			showResult(tousseInfo.message);
-		}
 	});
 }
 
@@ -109,7 +78,7 @@
 		instrumentBarcode: instrumentBarcode,
 		tousseDefinitionId: tousseDefinitionId
 	}
-	if(idCardInstanceBarcode !== ''){
+	if (idCardInstanceBarcode !== '') {
 		params.idCardInstanceBarcode = idCardInstanceBarcode;
 	}
 	Ext4.Ajax.request({
@@ -123,39 +92,15 @@
 					var materialDefinitionName = result.data.materialDefinitionName;
 					var materialDefinitionId = result.data.materialDefinitionId;
 					if (index == undefined) {
-						var oldName = top.Ext4.getCmp('hiddenMaterialDefinitionName').getValue();
-						if (oldName !== '' && oldName !== materialDefinitionName) {
-							top.Ext4.MessageBox.confirm("请确认", "当前器械条码和所选的器械不匹配，是否变更器械名称？", function (button, text) {
-								if ("yes" == button) {
-									top.Ext4.getCmp('materialDefinitionID').setValue(materialDefinitionId);
-									top.Ext4.getCmp('materialDefinitionName').setRawValue(materialDefinitionName + '(' + instrumentBarcode + ')');
-									top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue(materialDefinitionName);
-									top.Ext4.getCmp('instrumentBarcode').setValue(instrumentBarcode);
-								}
-							});
-						} else {
-							top.Ext4.getCmp('materialDefinitionID').setValue(materialDefinitionId);
-							top.Ext4.getCmp('materialDefinitionName').setRawValue(materialDefinitionName + '(' + instrumentBarcode + ')');
-							top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue(materialDefinitionName);
-							top.Ext4.getCmp('instrumentBarcode').setValue(instrumentBarcode);
-						}
+						top.Ext4.getCmp('materialDefinitionID').setValue(materialDefinitionId);
+						top.Ext4.getCmp('materialDefinitionName').setRawValue(materialDefinitionName + '(' + instrumentBarcode + ')');
+						top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue(materialDefinitionName);
+						top.Ext4.getCmp('instrumentBarcode').setValue(instrumentBarcode);
 					} else {
-						var oldName = top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).getValue();
-						if (oldName !== '' && oldName !== materialDefinitionName) {
-							top.Ext4.MessageBox.confirm("请确认", "当前器械条码和所选的器械不匹配，是否变更器械名称？", function (button, text) {
-								if ("yes" == button) {
-									top.Ext4.getCmp('materialDefinitionID_' + index).setValue(materialDefinitionId);
-									top.Ext4.getCmp('materialDefinitionName_' + index).setRawValue(materialDefinitionName + '(' + instrumentBarcode + ')');
-									top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).setValue(materialDefinitionName);
-									top.Ext4.getCmp('instrumentBarcode_' + index).setValue(instrumentBarcode);
-								}
-							});
-						} else {
-							top.Ext4.getCmp('materialDefinitionID_' + index).setValue(materialDefinitionId);
-							top.Ext4.getCmp('materialDefinitionName_' + index).setRawValue(materialDefinitionName + '(' + instrumentBarcode + ')');
-							top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).setValue(materialDefinitionName);
-							top.Ext4.getCmp('instrumentBarcode_' + index).setValue(instrumentBarcode);
-						}
+						top.Ext4.getCmp('materialDefinitionID_' + index).setValue(materialDefinitionId);
+						top.Ext4.getCmp('materialDefinitionName_' + index).setRawValue(materialDefinitionName + '(' + instrumentBarcode + ')');
+						top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).setValue(materialDefinitionName);
+						top.Ext4.getCmp('instrumentBarcode_' + index).setValue(instrumentBarcode);
 					}
 				} else {
 					showResult('该所属器械包的器械不存在');