Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js =================================================================== diff -u -r38539 -r38584 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js (.../sterilizationTransitionForm.js) (revision 38539) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js (.../sterilizationTransitionForm.js) (revision 38584) @@ -3,21 +3,21 @@ //交接物品的Ext4.tree.Panel的数据仓库 var treePanelStore = null; -function getNodeSterilizationMode(){ +function getNodeTousseInstanceId(){ var arr = []; var rootNode = treePanelStore.getRootNode(); rootNode.eachChild(function (childNode) { childNode.eachChild(function(node) { - var sterilizationMode = node.get('sterilizationMode'); + var tousseInstanceId = node.get('tousseInstanceId'); var index = -1; for(var i = 0;i < arr.length;i++){ - if (arr[i] == sterilizationMode) { + if (arr[i] == tousseInstanceId) { index = i; break; } } if(index == -1){ - arr.push(sterilizationMode); + arr.push(tousseInstanceId); } }); }) @@ -107,15 +107,14 @@ if (index == -1) { var url = WWWROOT + '/disinfectSystem/tousseInstanceAction!loadTousseInstanceByBarcodeforSterilizationTransition.do?sterilizationTransitionId=' + id; var params = {barcode: barcode}; - var sterilizationMode = getNodeSterilizationMode(); - if(sterilizationMode !== false){ - params.sterilizationMode = sterilizationMode; - }else { - var containerSterilizationMode = Ext4.getCmp('containerSterilizationMode').getValue(); - if(containerSterilizationMode !== 'null'){ - params.sterilizationMode = containerSterilizationMode; - } + var tousseInstanceId = getNodeTousseInstanceId(); + if(tousseInstanceId !== false){ + params.tousseInstanceIdsOfScanned = tousseInstanceId; } + var containerBarcode = Ext4.getCmp('containerBarcode').getValue() || ''; + if(containerBarcode !== ''){ + params.containerBarcodeOfScanned = containerBarcode; + } loadBarcode(params, url, function(result){ if(result.success){ var data = result.data; @@ -126,7 +125,6 @@ if(data.containerName!=null && data.containerName !=""){ Ext4.getCmp('containerName').setValue(data.containerName);//设置篮筐名 Ext4.getCmp('containerBarcode').setValue(Ext4.getCmp('barcode').getValue());//设置篮筐条码,用于后续保存转载到篮筐 - Ext4.getCmp('containerSterilizationMode').setValue(data.sterilizationMode); thisTextfield.setValue(''); showResult("当前灭菌篮筐:【"+data.containerName+"】"); return false; @@ -244,7 +242,6 @@ {xtype: 'hidden', name: 'id', id : 'id', value: id}, {xtype: 'hidden', name: 'handoverCode', id : 'handoverCode'}, {xtype: 'hidden', name: 'takeoverCode', id : 'takeoverCode'}, - {xtype: 'hidden', name: 'containerSterilizationMode', id : 'containerSterilizationMode', value: 'null'}, {xtype: 'hidden', name: 'sterilizationTransitionItems', id : 'sterilizationTransitionItems'}, {