Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r19266 -r19292 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 19266) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 19292) @@ -2139,25 +2139,43 @@ var basketTreeGridSelectionNodes = basketTreeGrid.getView().getSelectionModel().getSelection(); var waitPackingTreeSelectionNodes = waitPackingTreeGrid.getView().getSelectionModel().getSelection(); var totalSelectionNodesLength = basketTreeGridSelectionNodes.length + waitPackingTreeSelectionNodes.length; - if(totalSelectionNodesLength != 1){ + if(totalSelectionNodesLength > 2){ return false; } +// if(totalSelectionNodesLength != 1){ +// return false; +// } var checkedNode = null; if(basketTreeGridCheckedNodes.length > 0){ checkedNode = basketTreeGridCheckedNodes[0]; }else{ checkedNode = waitPackingTreeCheckedNodes[0]; } - var selectionNode = null; + var tousseName = checkedNode.get("tousseName"); if(basketTreeGridSelectionNodes.length > 0){ - selectionNode = basketTreeGridSelectionNodes[0]; - }else{ - selectionNode = waitPackingTreeSelectionNodes[0]; + for(var i=0;i 0){ + for(var i=0;i 0){ +// selectionNode = basketTreeGridSelectionNodes[0]; +// }else{ +// selectionNode = waitPackingTreeSelectionNodes[0]; +// } +// if(checkedNode != selectionNode ){ +//// alert('checkedNode != selectionNode') +// return false; +// } // var tousseName = checkedNode.get("tousseName"); // if(tousseName != lastSelectedTousseName){ // return false; @@ -2495,6 +2513,7 @@ if(useManualSelectPackageType()){ packageType = Ext4.getCmp('packageType').getValue(); } +// alert('useManualSelectPackageType='+useManualSelectPackageType()) sterilingType = cNode.get("sterilingMethod"); if(isUndefinedOrNullOrEmpty(sterilingType) || useManualSelectPackageType()){ sterilingType = Ext4.getCmp('sterilingType').getValue();