Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js =================================================================== diff -u -r34543 -r34544 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 34543) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 34544) @@ -8,6 +8,8 @@ var waitSterileLoadingTousseGrid;//待灭菌装载的器械包 var reviewedBasketId; var pageSize = 100; +var fixedBarcodeArray = []; +var fixedBarcodeIndex = 0; var firstSterilingTypeOfTousseInBasket;//灭菌篮筐内的第一个器械包的灭菌程序 //是否在待灭菌装载器械包列表中,显示“科室”列和搜索框 var showDepartOfTousseInstanceSterile = sstsConfig.showDepartOfTousseInstanceSterile ? true : false; @@ -966,12 +968,16 @@ var amountArr = []; var result = Ext.decode(response.responseText); if (result.message == "成功放入篮筐") { + fixedBarcodeIndex++; reloadReviewedPanel(reviewedPanel, function () { isLoading = false; }); if (sstsConfig.combineBasketItemStatisticsAndBasketItemDetailsInTheSterilizationLoadingModule && result.data && result.data.length > 0) { reloadBasketGrid(basketBarcode, ''); waitSterileLoadingTousseStore.reload(); + if(fixedBarcodeIndex < fixedBarcodeArray.length){ + scanBarcodeAndAddToBasket(fixedBarcodeArray[fixedBarcodeIndex].barcode, 'scanBarcode'); + } return; } if (result.data && result.data.length > 0) { @@ -1025,6 +1031,9 @@ Ext.getCmp('barcode').setValue(''); Ext.getCmp('barcodeEnd').setValue(''); Ext.getCmp('barcode').focus(); + if(fixedBarcodeIndex < fixedBarcodeArray.length){ + scanBarcodeAndAddToBasket(fixedBarcodeArray[fixedBarcodeIndex].barcode, 'scanBarcode'); + } } else { showResult(result.message); isLoading = false; @@ -1878,7 +1887,8 @@ } } var selectedBarcodeArray = []; - var fixedBarcodeArray = []; + fixedBarcodeArray = []; + fixedBarcodeIndex = 0; if (selectRows && selectRows.length && selectRows.length > 0) { var obj = {}; var sterilingModeObject = {}; @@ -1909,6 +1919,8 @@ } if (selectedBarcodeArray.length > 0) { DWREngine.setAsync(false); + var barcode = Ext.getCmp('barcode').getValue(); + var barcodeEnd = Ext.getCmp('barcodeEnd').getValue(); SterileLoadingTableManager.getResultJsonStrByBarcode(barcode + ";" + barcodeEnd, getTousseStoreBarcodes(), Ext.getCmp('basketBarcode').getValue(), function (jsonStr) { var obj = Ext.util.JSON.decode(jsonStr); var returnType = obj.returnType; @@ -1945,9 +1957,7 @@ DWREngine.setAsync(true); } if (fixedBarcodeArray.length > 0) { - for (var i = 0; i < fixedBarcodeArray.length; i++) { - scanBarcodeAndAddToBasket(fixedBarcodeArray[i].barcode, 'scanBarcode'); - } + scanBarcodeAndAddToBasket(fixedBarcodeArray[0].barcode, 'scanBarcode'); } } else { showResult("请选择需要载入的器械包");