Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r34667 -r34670
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 34667)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 34670)
@@ -67,6 +67,7 @@
 var confirmLabel = "灭菌情况确认人";
 
 var sterilizationPurposeStore;
+var sterilizationPurposeDeleteArr = [];
 
 var _biologicalMonitoringTime = 0;  //此灭菌炉的生物监测持续时间
 
@@ -212,11 +213,9 @@
 
 //删除已添加耗材
 function deleteSterilizationPurpose(detailId, batchBarcode) {
-    var removeItem;
     for (var k = 0; k < sterilizationPurposeStore.getCount(); k++) {
         var item = sterilizationPurposeStore.getAt(k);
         if (item.data.batchBarcode == batchBarcode) {
-            removeItem = item;
             sterilizationPurposeStore.remove(item);
         }
     }
@@ -230,10 +229,10 @@
         }
         top.Ext.getCmp("steriConsumeMaterialArr").setValue(JSON.stringify(steriConsumeMaterialArr));
     } else {
-        var deleteDetailIds = top.Ext.getCmp("deleteDetailIds").getValue();
-        deleteDetailIds += detailId + ',';
-        deleteDetailIds = deleteDetailIds.substr(0, deleteDetailIds.length - 1);
-        top.Ext.getCmp("deleteDetailIds").setValue(deleteDetailIds);
+        sterilizationPurposeDeleteArr.push({
+            batchBarcode: batchBarcode,
+            detailId: detailId
+        })
     }
 }
 
@@ -2803,6 +2802,8 @@
         })
     });
 
+    sterilizationPurposeDeleteArr = [];
+
     var bioreaderStore = new Ext.data.Store({
         proxy: new top.Ext.data.HttpProxy({
             url: WWWROOT + '/disinfectSystem/sterilization/bioreaderAction!getBioreaderNameAndIdList.do?',
@@ -4009,28 +4010,55 @@
                                                                         top.Ext.getCmp('inputBarcode').setValue("");
                                                                         return;
                                                                     }
+                                                                    var detailId = '';
+                                                                    if (sterilizationPurposeDeleteArr.length > 0) {
+                                                                        for (var m = 0; m < sterilizationPurposeDeleteArr.length; m++) {
+                                                                            if (sterilizationPurposeDeleteArr[m].batchBarcode == newResult.data.barcode) {
+                                                                                detailId = sterilizationPurposeDeleteArr[m].detailId;
+                                                                                sterilizationPurposeDeleteArr.splice(m, 1);
+                                                                            }
+                                                                        }
+                                                                    }
                                                                     var data = newResult.data;
-                                                                    var recordItem = new sterilizationPurposeRecord({
-                                                                        disposableGoodsBatchId: data.disposableGoodsBatchId,
-                                                                        disposableGoodsBatchStockId: data.disposableGoodsBatchStockId,
-                                                                        disposableGoodsId: data.disposableGoodsId,
-                                                                        disposableGoodsName: data.disposableGoodsName,
-                                                                        useAmount: 1,
-                                                                        specification: data.specification,
-                                                                        batchBarcode: data.barcode
-                                                                    });
-                                                                    sterilizationPurposeStore.add(recordItem);
-                                                                    var steriConsumeMaterialArr = [];
-                                                                    steriConsumeMaterialArr.push({
-                                                                        disposableGoodsBatchId: data.disposableGoodsBatchId,
-                                                                        disposableGoodsBatchStockId: data.disposableGoodsBatchStockId,
-                                                                        disposableGoodsId: data.disposableGoodsId,
-                                                                        disposableGoodsName: data.disposableGoodsName,
-                                                                        amount: 1,
-                                                                        specification: data.specification,
-                                                                        batchBarcode: data.barcode
-                                                                    })
-                                                                    top.Ext.getCmp("steriConsumeMaterialArr").setValue(JSON.stringify(steriConsumeMaterialArr));
+                                                                    if (detailId == '') {
+                                                                        var recordItem = new sterilizationPurposeRecord({
+                                                                            disposableGoodsBatchId: data.disposableGoodsBatchId,
+                                                                            disposableGoodsBatchStockId: data.disposableGoodsBatchStockId,
+                                                                            disposableGoodsId: data.disposableGoodsId,
+                                                                            disposableGoodsName: data.disposableGoodsName,
+                                                                            useAmount: 1,
+                                                                            specification: data.specification,
+                                                                            batchBarcode: data.barcode
+                                                                        });
+                                                                        sterilizationPurposeStore.add(recordItem);
+                                                                        var steriConsumeMaterialStr = top.Ext.getCmp("steriConsumeMaterialArr").getValue();
+                                                                        var steriConsumeMaterialArr = [];
+                                                                        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.barcode
+                                                                        })
+                                                                        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,
+                                                                            specification: data.specification,
+                                                                            batchBarcode: data.barcode,
+                                                                            detailId: detailId
+                                                                        });
+                                                                        sterilizationPurposeStore.add(recordItem);
+                                                                    }
                                                                 }
                                                             }
                                                         } else {
@@ -5718,6 +5746,16 @@
         top.Ext.getCmp("barcodePositionInfo").setValue(barcodePostionInfo);
         Ext.getCmp("formSubmitResult").setValue(0);
 
+        if (sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction) {
+            var deleteDetailIds = '';
+            if (sterilizationPurposeDeleteArr.length > 0) {
+                for (var k = 0; k < sterilizationPurposeDeleteArr.length; k++) {
+                    deleteDetailIds += sterilizationPurposeDeleteArr[k].detailId + ',';
+                }
+                deleteDetailIds = deleteDetailIds.substr(0, deleteDetailIds.length - 1);
+            }
+            top.Ext.getCmp("deleteDetailIds").setValue(deleteDetailIds);
+        }
         formObj.form.submit({
             url: url,
             method: 'POST',