Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
===================================================================
diff -u -r41317 -r41467
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js	(.../config.js)	(revision 41317)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js	(.../config.js)	(revision 41467)
@@ -268,6 +268,8 @@
   OCRServerAddress: 'http://192.168.2.229:5000',
   //启用第三方标识牌条码功能
   enbaleThirdPartyIdCard:true,
+  //灭菌耗材数量消耗方式
+  sterilizationConsumablesQuantityConsumptionMethod:1,
   // 是否启用未录入使用记录器械包报表 ZSYKEQ-26
   enableUnusedTousseInstanceReport: true,
   // 是否启用未及时回收处理的器械包统计报表 ZSYKEQ-12
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r41195 -r41467
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 41195)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 41467)
@@ -4711,7 +4711,6 @@
                             store: sterilizationPurposeJsonStore,
                             triggerAction: 'all',
                             mode: 'remote',
-                            listWidth: 120,
                             editable: false,
                             forceSelection: true,
                             name: "sterilizationPurpose",
@@ -4899,11 +4898,21 @@
                                                                 }
                                                                 if (newResult.dataType == 'disposableGoodsBatchStock') {
                                                                     var barcodeIsTrue = false;
+                                                                    var newUseAmount = 1;
+                                                                    var newBarcode = '';
                                                                     for (var k = 0; k < sterilizationPurposeStore.getCount(); k++) {
                                                                         var item = sterilizationPurposeStore.getAt(k);
                                                                         if (item.data.batchBarcode == barcode) {
-                                                                            barcodeIsTrue = true;
-                                                                            continue;
+                                                                            if(sstsConfig.sterilizationConsumablesQuantityConsumptionMethod == 1){
+                                                                                newUseAmount = item.data.useAmount + 1;
+                                                                                newBarcode = barcode;
+                                                                                sterilizationPurposeStore.remove(item);
+                                                                                top.Ext.getCmp('inputBarcode').setValue("");
+                                                                                continue;
+                                                                            }else {
+                                                                                barcodeIsTrue = true;
+                                                                                continue;
+                                                                            }
                                                                         }
                                                                     }
                                                                     if (barcodeIsTrue) {
@@ -4927,7 +4936,7 @@
                                                                             disposableGoodsBatchStockId: data.disposableGoodsBatchStockId,
                                                                             disposableGoodsId: data.disposableGoodsId,
                                                                             disposableGoodsName: data.disposableGoodsName,
-                                                                            useAmount: 1,
+                                                                            useAmount: newUseAmount,
                                                                             specification: data.specification,
                                                                             batchBarcode: data.batchBarcode
                                                                         });
@@ -4937,15 +4946,24 @@
                                                                         if (steriConsumeMaterialStr !== '') {
                                                                             steriConsumeMaterialArr = JSON.parse(steriConsumeMaterialStr);
                                                                         }
-                                                                        steriConsumeMaterialArr.push({
-                                                                            disposableGoodsBatchId: data.disposableGoodsBatchId,
-                                                                            disposableGoodsBatchStockId: data.disposableGoodsBatchStockId,
-                                                                            disposableGoodsId: data.disposableGoodsId,
-                                                                            disposableGoodsName: data.disposableGoodsName,
-                                                                            amount: 1,
-                                                                            specification: data.specification,
-                                                                            batchBarcode: data.batchBarcode
-                                                                        })
+                                                                        if(newBarcode == ''){
+                                                                            steriConsumeMaterialArr.push({
+                                                                                disposableGoodsBatchId: data.disposableGoodsBatchId,
+                                                                                disposableGoodsBatchStockId: data.disposableGoodsBatchStockId,
+                                                                                disposableGoodsId: data.disposableGoodsId,
+                                                                                disposableGoodsName: data.disposableGoodsName,
+                                                                                amount: 1,
+                                                                                specification: data.specification,
+                                                                                batchBarcode: data.batchBarcode
+                                                                            })
+                                                                        }else {
+                                                                            for(var i=0;i<steriConsumeMaterialArr.length;i++){
+                                                                                if(steriConsumeMaterialArr[i].batchBarcode == newBarcode){
+                                                                                    steriConsumeMaterialArr[i].amount = newUseAmount;
+                                                                                    continue;
+                                                                                }
+                                                                            }
+                                                                        }
                                                                         top.Ext.getCmp("steriConsumeMaterialArr").setValue(JSON.stringify(steriConsumeMaterialArr));
                                                                     } else {
                                                                         var recordItem = new sterilizationPurposeRecord({
@@ -5296,21 +5314,37 @@
                         columnWidth: .85,
                         layout: 'form',
                         hidden: !sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction,
-                        items: [new top.Ext.grid.GridPanel({
+                        items: [new top.Ext.grid.EditorGridPanel({
                             id: 'consumptiveMaterialGrid',
                             height: 150,
                             frame: false,
                             border: true,
                             viewConfig: {
                                 forceFit: true
                             },
+                            selModel : new top.Ext.grid.RowSelectionModel({
+                                singleSelect : false
+                            }),
                             anchor: '98.5%',
                             store: sterilizationPurposeStore,
-                            cm: new Ext.grid.ColumnModel([
+                            cm: new top.Ext.grid.ColumnModel([
                                 { header: "名称", width: 100, menuDisabled: true, dataIndex: 'disposableGoodsName' },
                                 { header: "规格", width: 60, menuDisabled: true, dataIndex: 'specification' },
                                 { header: "批次条码", width: 60, menuDisabled: true, dataIndex: 'batchBarcode' },
-                                { header: "已添加数量", width: 60, menuDisabled: true, dataIndex: 'useAmount' },
+                                { header: "已添加数量", width: 60, menuDisabled: true, dataIndex: 'useAmount',
+                                    editor : new top.Ext.form.NumberField({
+                                        allowDecimals : false,
+                                        allowNegative: false,
+						                minValue:1,
+                                        allowBlank : false,
+                                        listeners:{
+                                            change :function(field,newVal,oldVal){
+                                                var selectedData = top.Ext.getCmp('consumptiveMaterialGrid').getSelectionModel().getSelections()[0];
+                                                selectedData.set('useAmount',newVal);
+                                            }
+                                        }
+                                    })
+                                 },
                                 {
                                     header: "操作", width: 40, menuDisabled: true, renderer: function (v, p, record, rowIndex, columnIndex, store) {
                                         var detailId = record.data.detailId || '';
@@ -5322,7 +5356,14 @@
                             ]),
                             stripeRows: true,
                             autoExpandColumn: 'count',
-                            bodyStyle: 'border:1px solid #afd7af;margin-bottom: 10px;'
+                            bodyStyle: 'border:1px solid #afd7af;margin-bottom: 10px;',
+                            listeners:{
+                                beforeedit: function (record) {
+                                    if(sstsConfig.sterilizationConsumablesQuantityConsumptionMethod !== 1){
+                                        return false
+                                    }
+                                }
+                            }
                         })]
                     }, {
                         columnWidth: 1,