Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js =================================================================== diff -u -r25480 -r25766 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 25480) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 25766) @@ -1,7 +1,10 @@ var id; var formObj; var sterilizerWin; - +var enableBioreaderInterface = false; +if(sstsConfig.hasOwnProperty('enableBioreaderInterface') && sstsConfig.enableBioreaderInterface){ + enableBioreaderInterface = true; +} function removeGridItem(gridName){ var configGrid = top.Ext.getCmp(gridName); var rows = configGrid.getSelectionModel().getSelections();// 返回值为 Record 数组 @@ -578,6 +581,7 @@ columnWidth : 0.5, layout : 'form', labelWidth : 100, + hidden : !enableBioreaderInterface, items:[{ xtype : 'combo', fieldLabel : '生物阅读器', @@ -588,9 +592,9 @@ name : 'bioreaderName', queryMode: 'remote', triggerAction : 'all', - allowBlank : false, + allowBlank : true, forceSelection : true, - editable : false, + editable : true, anchor : '95%', store : bioreaderStore, listeners : { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java =================================================================== diff -u -r25480 -r25766 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 25480) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 25766) @@ -121,14 +121,16 @@ String cleanMethodIDs = StrutsParamUtils.getPraramValue("sterilisationID", ""); String bioreaderId = StrutsParamUtils.getPraramValue("bioreaderId", ""); //绑定灭菌炉和生物阅读器 - Bioreader bioreader = new Bioreader(); - bioreader.setId(Long.valueOf(bioreaderId)); - sterilizer.setBioreader(bioreader); + if(StringUtils.isNotBlank(bioreaderId)){ + Bioreader bioreader = new Bioreader(); + bioreader.setId(Long.valueOf(bioreaderId)); + sterilizer.setBioreader(bioreader); + } String consumablesStr = StrutsParamUtils.getPraramValue("consumables", ""); String detectionItemsStr = StrutsParamUtils.getPraramValue("testItems", ""); List extraInfo = new ArrayList(); sterilizerManager.saveSterilizer(sterilizer, cleanMethodIDs, consumablesStr, detectionItemsStr, extraInfo); - + JSONUtil.addProperty(outputJson, "barcode", extraInfo.get(0)); StrutsResponseUtils.output(outputJson); } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r25631 -r25766 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 25631) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 25766) @@ -57,7 +57,10 @@ beginBarcodeLabel = '条码/篮筐(首)'; hiddenEndBarcode = false;//显示尾篮筐 } - +var enableBioreaderInterface = false; +if(sstsConfig.hasOwnProperty('enableBioreaderInterface') && sstsConfig.enableBioreaderInterface){ + enableBioreaderInterface = true; +} //条码扫描模式 var currentScanMode = "single"; if(sstsConfig.sterilePageScanMode && sstsConfig.sterilePageScanMode != null){ @@ -3069,6 +3072,7 @@ columnWidth : 0.5, layout : 'form', labelWidth : 120, + hidden : !enableBioreaderInterface, items:[{ xtype : 'combo', fieldLabel : '生物阅读器', @@ -3095,6 +3099,7 @@ columnWidth : 0.3, layout : 'form', labelWidth : 120, + hidden : !enableBioreaderInterface, items:[{ xtype : 'combo', fieldLabel : '卡位', @@ -3118,6 +3123,7 @@ layout : 'form', cls:'edit-5char-labelwidth', labelWidth : 70, + hidden : !enableBioreaderInterface, items : [{ xtype:'button', text : '获取生物监测结果', name : "getBiologyResult",