Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r38326 -r38388
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 38326)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 38388)
@@ -167,6 +167,13 @@
 	]
 	)
 });
+
+function getBarcode(barcode){
+	top.Ext.getCmp('changeBasketWin').close();
+	var barcodes = [barcode];
+	websocketCallBacks(barcodes);
+}
+
 function reflushWaitPackingTreeGrid() {
 	var tabTitle = parent.currentActiveTabTitle;
 	var taskGroup = getURLParameter("taskGroup", "") + "装配";
@@ -6578,6 +6585,44 @@
 		});
 	}
 
+	function changeBarcode(v, p, record) {
+		return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().getBarcode('" + v + "');\">选择</a>";
+	}
+	
+	//ZSSXLRMYY-231：显示篮筐条码
+	function showBasketBarcodes(items) {
+		var grid = new top.Ext.grid.GridPanel({
+			store: new top.Ext.data.Store({
+				reader: new top.Ext.data.JsonReader({
+					fields : ["startDate", "containerBarcode", "amoumt", "rinserName", "disinfectProgram"]
+				})
+			}),
+			columns: [
+				{header: "清洗时间", width: 120, dataIndex: 'startDate'},
+				{header: "篮筐条码", width: 120,dataIndex: 'containerBarcode'},
+				{header: "物品数量", width: 80,dataIndex: 'amoumt'},
+				{header: "清洗机", width: 100,dataIndex: 'rinserName'},
+				{header: "清洗程序", width: 100,dataIndex: 'disinfectProgram'},
+				{header: "操作", width: 80,dataIndex: 'containerBarcode',renderer : changeBarcode}
+			],
+			stripeRows: true,
+			viewConfig: { forceFit: true },
+			height: 250
+		});
+		grid.getStore().loadData(items);
+		var basketWindow = new top.Ext.Window({
+			aautoHeight:true,
+			title : '选择清洗篮筐',
+			width:700,
+			id:'changeBasketWin',
+			draggable:true,
+			modal:true,
+			closeAction:'close',
+			items:[grid]
+		});
+		basketWindow.show();
+	}
+
 	//扫描篮筐条码,装配完成之后重新扫描条码不提示
 	function scanBasketBarcodes(basketBarcode, scanType) {
 		var myMask = new Ext4.LoadMask({ msg: "正在加载，请稍候...", target: Ext4.getCmp('basketTreeGrid') });
@@ -6593,8 +6638,18 @@
 				Ext4.getCmp('basketBarcodeInput').setValue('');
 				var jsonObj = Ext4.JSON.decode(result.responseText);
 				if (!jsonObj.success) {
-					showMultipleResult(jsonObj.message, null, sstsConfig.messagePauseTimeOnPackingPage);
-					return;
+					if(sstsConfig.enableFuzzySearchCleaningBasketFunction){
+						if(typeof jsonObj.message == 'string'){
+							showMultipleResult(jsonObj.message, null, sstsConfig.messagePauseTimeOnPackingPage);
+							return;
+						}else {
+							showBasketBarcodes(jsonObj.message);
+							return;
+						}
+					}else {
+						showBasketBarcodes(jsonObj.message);
+						return;
+					}
 				}
 				var taskList = jsonObj.data;
 				var nLength = taskList ? taskList.length : 0;
@@ -8527,37 +8582,42 @@
 	}
 }
 
-function websocketCallBacks() {
+function websocketCallBacks(barcodes) {
 	//刷新装配和待装配任务列表(须参考需求的预期结果进行前端业务的开发:ZSWY-110 多人同时进行装配和审核时界面上的待处理任务要自动实时刷新)
 	var basketBarcodeArrAll = getBasketBarcode();
+	if(barcodes){
+		basketBarcodeArrAll = barcodes;
+	}
 	if (basketBarcodeArrAll.length > 0) {
 		//ZSYKZX-177：刷新时应保持待装配任务的勾选状态
-		var rootNode = Ext4.getCmp('basketTreeGrid').getStore().getRootNode();
-		var rootNode2 = Ext4.getCmp('waitPackingTreeGrid').getStore().getRootNode();
-		var oldJsonObj = {};
-		waitPackingJsonObj = {}
-		rootNode.cascade(function (note) {
-			var taskId = note.data.taskId || '';
-			var tousseID = note.data.tousseID || '';
-			var checked = note.data.checked;
-			if(taskId == '' && tousseID !== ''){
-				oldJsonObj[tousseID] = checked;
-			}else if(taskId !== ''){
-				oldJsonObj[taskId] = checked;
-			}
-		});
-		rootNode2.cascade(function (note) {
-			var taskId = note.data.taskId || '';
-			var tousseID = note.data.tousseID || '';
-			var checked = note.data.checked;
-			if(taskId == '' && tousseID !== ''){
-				waitPackingJsonObj[tousseID] = checked;
-			}else if(taskId !== ''){
-				waitPackingJsonObj[taskId] = checked;
-			}
-		});
-		Ext4.getCmp('basketTreeGrid').getStore().reload();
-		Ext4.getCmp('waitPackingTreeGrid').getStore().reload();
+		if(!barcodes){
+			var rootNode = Ext4.getCmp('basketTreeGrid').getStore().getRootNode();
+			var rootNode2 = Ext4.getCmp('waitPackingTreeGrid').getStore().getRootNode();
+			var oldJsonObj = {};
+			waitPackingJsonObj = {}
+			rootNode.cascade(function (note) {
+				var taskId = note.data.taskId || '';
+				var tousseID = note.data.tousseID || '';
+				var checked = note.data.checked;
+				if(taskId == '' && tousseID !== ''){
+					oldJsonObj[tousseID] = checked;
+				}else if(taskId !== ''){
+					oldJsonObj[taskId] = checked;
+				}
+			});
+			rootNode2.cascade(function (note) {
+				var taskId = note.data.taskId || '';
+				var tousseID = note.data.tousseID || '';
+				var checked = note.data.checked;
+				if(taskId == '' && tousseID !== ''){
+					waitPackingJsonObj[tousseID] = checked;
+				}else if(taskId !== ''){
+					waitPackingJsonObj[taskId] = checked;
+				}
+			});
+			Ext4.getCmp('basketTreeGrid').getStore().reload();
+			Ext4.getCmp('waitPackingTreeGrid').getStore().reload();
+		}
 		for (var i = 0; i < basketBarcodeArrAll.length; i++) {
 			Ext4.Ajax.request({
 				url: WWWROOT + '/disinfectSystem/packingAction!loadPackingTaskByBasketBarCode.do',
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
===================================================================
diff -u -r33155 -r38388
--- ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js	(.../config.js)	(revision 33155)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js	(.../config.js)	(revision 38388)
@@ -107,6 +107,8 @@
   auxiliaryInvoiceTousseTypes: '敷料包,普通器械包,外来器械包,外部代理灭菌包',
   //控制PDA的回收清点模块的功能是预回收还是器械交接
   prepareRecycleVersion:1,
+  //启用模糊搜索清洗篮筐功能
+  enableFuzzySearchCleaningBasketFunction:true,
   //启用设备接口
   disableDeviceInterface:false
 }
\ No newline at end of file