Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r41467 -r41473
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 41467)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 41473)
@@ -257,14 +257,7 @@
         }
     }
     if (detailId == '') {
-        var steriConsumeMaterialStr = top.Ext.getCmp("steriConsumeMaterialArr").getValue();
-        var steriConsumeMaterialArr = JSON.parse(steriConsumeMaterialStr);
-        for (var i = 0; i < steriConsumeMaterialArr.length; i++) {
-            if (steriConsumeMaterialArr[i].batchBarcode == batchBarcode) {
-                steriConsumeMaterialArr.splice(i, 1);
-            }
-        }
-        top.Ext.getCmp("steriConsumeMaterialArr").setValue(JSON.stringify(steriConsumeMaterialArr));
+       
     } else {
         sterilizationPurposeDeleteArr.push({
             batchBarcode: batchBarcode,
@@ -4896,18 +4889,22 @@
                                                                     showMultipleResult(result);
                                                                     return;
                                                                 }
+                                                                top.Ext.getCmp('inputBarcode').setValue("");
+                                                                if(sstsConfig.sterilizationConsumablesQuantityConsumptionMethod == 1 && (id !== '' && id !== 0)){
+                                                                    showMultipleResult("灭菌耗材只能在添加记录时增加数量。", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
+                                                                    top.Ext.getCmp('inputBarcode').setValue("");
+                                                                    return
+                                                                }
                                                                 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) {
                                                                             if(sstsConfig.sterilizationConsumablesQuantityConsumptionMethod == 1){
                                                                                 newUseAmount = item.data.useAmount + 1;
                                                                                 newBarcode = barcode;
                                                                                 sterilizationPurposeStore.remove(item);
-                                                                                top.Ext.getCmp('inputBarcode').setValue("");
                                                                                 continue;
                                                                             }else {
                                                                                 barcodeIsTrue = true;
@@ -4941,37 +4938,13 @@
                                                                             batchBarcode: data.batchBarcode
                                                                         });
                                                                         sterilizationPurposeStore.add(recordItem);
-                                                                        var steriConsumeMaterialStr = top.Ext.getCmp("steriConsumeMaterialArr").getValue();
-                                                                        var steriConsumeMaterialArr = [];
-                                                                        if (steriConsumeMaterialStr !== '') {
-                                                                            steriConsumeMaterialArr = JSON.parse(steriConsumeMaterialStr);
-                                                                        }
-                                                                        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({
                                                                             disposableGoodsBatchId: data.disposableGoodsBatchId,
                                                                             disposableGoodsBatchStockId: data.disposableGoodsBatchStockId,
                                                                             disposableGoodsId: data.disposableGoodsId,
                                                                             disposableGoodsName: data.disposableGoodsName,
-                                                                            useAmount: 1,
+                                                                            useAmount: newUseAmount,
                                                                             specification: data.specification,
                                                                             batchBarcode: data.batchBarcode,
                                                                             detailId: detailId
@@ -5359,7 +5332,9 @@
                             bodyStyle: 'border:1px solid #afd7af;margin-bottom: 10px;',
                             listeners:{
                                 beforeedit: function (record) {
-                                    if(sstsConfig.sterilizationConsumablesQuantityConsumptionMethod !== 1){
+                                    if(sstsConfig.sterilizationConsumablesQuantityConsumptionMethod == 1 && (id == 0 || id == '')){
+
+                                    }else {
                                         return false
                                     }
                                 }
@@ -7041,6 +7016,15 @@
 
             var consumptiveMaterialVolumes = top.Ext.getCmp("consumptiveMaterialVolumes").getValue();
             var consumptionPattern = top.Ext.getCmp("consumptionPattern").getValue();
+            if(id == '' || id == 0){
+                var steriConsumeMaterialArr = [];
+                for (var k = 0; k < sterilizationPurposeStore.getCount(); k++) {
+                    var item = sterilizationPurposeStore.getAt(k);
+                    item.data.amount = item.data.useAmount;
+                    steriConsumeMaterialArr.push(item.data);
+                }
+                top.Ext.getCmp("steriConsumeMaterialArr").setValue(JSON.stringify(steriConsumeMaterialArr));
+            }
             if (consumptiveMaterialVolumes !== '') {
                 var consumptiveMaterialVolumesArr = consumptiveMaterialVolumes.split('|');
                 var newArr = [];