Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r29931 -r29933 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 29931) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 29933) @@ -2304,24 +2304,6 @@ }); } -//修改灭菌中的物品数量时修改状态为待灭菌 -function substractFixedBarcodeGoodsOfSterilizationRecord(id,barcode,amount,isDelAll){ - Ext.Ajax.request({ - url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!substractFixedBarcodeGoodsOfSterilizationRecord.do', - params: { - fixedBarcode: barcode, - id:id, - subAmount:amount - }, - waitMsg: '正在处理,请稍候...', - success: function (response, options) { - if(isDelAll){ - leftFixedBarcodeMapBySterilization.delete(barcode) - } - } - }) -} - /** * 修改leftFixedBarcodeMap和rightFixedBarcodeMap * @param {固定条码} fixedBarcode @@ -2568,6 +2550,7 @@ return false; } if (newAmount > 2000) { + showResult('已超过'+attr.name+'的最大待灭菌物品总数2000!'); newAmount = parseInt(rigthAmount) + parseInt(oldAmount); newAmount = newAmount>2000?2000:newAmount; } @@ -2745,6 +2728,7 @@ scanFixedBarcode(fixedBarcodeArr[i],true); } } + statisticsTousseAndBasket();//统计总数量 if(waitSterilingBarcodeArray.length > 0){ Ext.Ajax.timeout = 90000; pendingSterilizationColumnTree.getEl().mask("正在加载中.请稍等...", "x-mask-loading"); @@ -2777,6 +2761,7 @@ scanFixedBarcode(fixedBarcodeArr[i],true); } pendingSterilizationColumnTree.getEl().unmask(); + statisticsTousseAndBasket();//统计总数量 top.Ext.getCmp("btnBatchAddTousse").enable(); top.Ext.getCmp('saveBtn').enable(); top.Ext.getCmp('save2').enable();