Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r36283 -r36284 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36283) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36284) @@ -4686,15 +4686,25 @@ var selNodes = waitPackingTreeGrid.getView().getChecked(); var selLength = selNodes.length; var map = {}, dest = []; + var departmentArr = []; Ext4.each(selNodes, function (pNode) { if (pNode.childNodes.length == 0) { var ai = pNode; + var department = ai.get('department'); if (!map[ai.get('tousseName')]) { dest.push(ai.parentNode); map[ai.get('tousseName')] = ai; } + if(departmentArr.indexOf(department) == -1){ + departmentArr.push(department); + } } }); + if(departmentArr.length > 1){ + onPackingTousseBtnClickComplete(); + showMultipleResult('只支持同科室物品合并生成器械包集合码,请检查物品后重新操作。'); + return + } if (dest.length == 1 && isConfirm == '否') { var sterilingType = Ext4.getCmp('sterilingType').getValue(); if (packingPageAutoSetSterilizationProgramAfterSelectTousse || !sstsConfig.hideSterilingType) {