Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r38114 -r38257
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 38114)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 38257)
@@ -10,6 +10,7 @@
 var lastSelectTdId;
 var lastSelectTaskId;
 var sterilizerTypeStore;
+var waitPackingJsonObj;
 
 //XJJQZYY-120：配置项改进为可配置为必填、选填
 //检查人
@@ -854,7 +855,11 @@
 
 	newParams.tousseType = params.tousseType1;
 	var node = Ext4.create('cModel', newParams);
-	node.set("checked", false);
+	if(params.checked){
+		node.set("checked", params.checked);
+	}else {
+		node.set("checked", false);
+	}
 	return node;
 }
 
@@ -3786,6 +3791,18 @@
 						}
 					}
 				});
+				if(waitPackingJsonObj){
+					node.cascade(function (note) {
+						var taskId = note.data.taskId;
+						var tousseID = note.data.tousseID;
+						if(taskId == '' && tousseID !== ''){
+							note.set("checked", waitPackingJsonObj[tousseID]);
+						}else if(taskId !== ''){
+							note.set("checked", waitPackingJsonObj[taskId]);
+						}
+					});
+					waitPackingJsonObj = null
+				}
 				var pageNow = Ext4.getCmp('pageNow').getValue();
 				var waitPackingPageSize = Ext4.getCmp('waitPackingPageSize').getValue();
 				var tousseOrDepart = Ext4.getCmp('tousseOrDepart').getValue();
@@ -8141,10 +8158,33 @@
 	//刷新装配和待装配任务列表(须参考需求的预期结果进行前端业务的开发:ZSWY-110 多人同时进行装配和审核时界面上的待处理任务要自动实时刷新)
 	var basketBarcodeArrAll = getBasketBarcode();
 	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();
-		if (!splitForeignTousseFlag) {
-			Ext4.getCmp('waitPackingTreeGrid').getStore().reload();
-		}
+		Ext4.getCmp('waitPackingTreeGrid').getStore().reload();
 		for (var i = 0; i < basketBarcodeArrAll.length; i++) {
 			Ext4.Ajax.request({
 				url: WWWROOT + '/disinfectSystem/packingAction!loadPackingTaskByBasketBarCode.do',
@@ -8205,6 +8245,10 @@
 							if (n == 0 && !isChecked) {
 								checked = true;
 							}
+							var oldChecked = false;
+							if(oldJsonObj && oldJsonObj[td_id]){
+								oldChecked = oldJsonObj[td_id]
+							}
 							var params = {
 								taskId: '',
 								td_id: td_id,
@@ -8250,6 +8294,7 @@
 								errorDamageRemarkInfo: '',
 								tousseID: td_id,
 								maxAmount: 0,
+								checked:oldChecked,
 								needInspectMaterials: needInspectMaterials
 							}
 							parentNode = addTaskNode(params);
@@ -8299,7 +8344,10 @@
 							var supplierName = task.supplierName;
 							var packageSize = task.packageSize;
 							var maxAmount = task.maxAmount;
-
+							var oldChecked = false;
+							if(oldJsonObj && oldJsonObj[taskId]){
+								oldChecked = oldJsonObj[taskId]
+							}
 							if (task.tousseType == '外来器械包') {
 								haveForeignTousseNode = true;
 							}
@@ -8329,6 +8377,7 @@
 								task.packageType = packageType;
 								task.sterilingMethod = sterilingMethod;
 								task.maxAmount = maxAmount;
+								task.checked = oldChecked;
 
 								var childNode = addTaskNode(task);
 								parentNode.appendChild(childNode);
@@ -8345,17 +8394,29 @@
 								parentNode.expand();
 							}
 						}
-						if (sstsConfig.packingView_autoSelectTousseWhenScanBasket && checked) {
-							basketColumnTreeGrid.getView().fireEvent('itemClick', '', parentNode, '', '');
-							Ext4.getCmp('basketBarcodeInput').focus('', 10);
-						}
+						// if (sstsConfig.packingView_autoSelectTousseWhenScanBasket && checked) {
+						// 	basketColumnTreeGrid.getView().fireEvent('itemClick', '', parentNode, '', '');
+						// 	Ext4.getCmp('basketBarcodeInput').focus('', 10);
+						// }
 					}
 					speakBasket.speakContent();
 				},
 				failure: function () { myMask.hide(); }
 			});
 		}
 	} else {
+		var rootNode2 = Ext4.getCmp('waitPackingTreeGrid').getStore().getRootNode();
+		waitPackingJsonObj = {}
+		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;
+			}
+		});
 		reflushWaitPackingTreeGrid();
 	}
 }
\ No newline at end of file