Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r17114 -r17171 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 17114) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 17171) @@ -1542,6 +1542,14 @@ } pendingSterilizationColumnTree.getRootNode().appendChild(node); + + //如果一键入炉的按钮不可用,则将其变成可用 + //判断表格中的物品数量是否大于0 + if(pendingSterilizationColumnTree.getRootNode().childNodes.length == 0){ + top.Ext.getCmp("btnBatchAddTousse").disable(); + }else{ + top.Ext.getCmp("btnBatchAddTousse").enable(); + } } //生成待灭菌物品节点 Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r17148 -r17171 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 17148) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 17171) @@ -1207,7 +1207,7 @@ boolean isOutBasket = tousseInstanceManager.isTousseInstanceOutOfBasket(tousseInstance.getId()); if (isOutBasket) { //没入灭菌篮筐 - if (tousseInstance.getUnTraceableTousse()) { // 不追溯的器械包(含普通器械包、敷料包、外部代理灭菌包) + if (tousseInstance.getUnTraceableTousse() && tousseInstance.getTousseFixedBarcode()) { // 不追溯的器械包(含普通器械包、敷料包、外部代理灭菌包) String name = tousseDefinition.getName(); String orgUnitCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); Integer scanAmount = tousseDefinition.getScanAmount();