Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js =================================================================== diff -u -r33197 -r33204 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js (.../godownOutToSupplyRoomView.js) (revision 33197) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js (.../godownOutToSupplyRoomView.js) (revision 33204) @@ -273,19 +273,11 @@ //往发货详情添加一次性物品记录 function addDiposableGoods() { var diposableGoodsID = top.Ext.getCmp('diposableGoodsID').getValue(); + var name = top.Ext.getCmp('diposableGoodsName').getValue(); + var amount = top.Ext.getCmp('diposableGoodsAmount').getValue(); var batch = getSelectedBatch(); var priceAmount = getSelectedPriceAmount(); - var objID = batch.disposableGoodsBatchID; - var price = priceAmount.price; - var name = top.Ext.getCmp('diposableGoodsName').getValue(); - var amount = top.Ext.getCmp('diposableGoodsAmount').getValue(); - var batchNumber = batch.batchNumber; - var expDate = batch.expDate; - var supplierName = batch.supplierName; - - var storage = priceAmount.amount; - if(top.Ext.getCmp('diposableGoodsName').getValue() == null || top.Ext.getCmp('diposableGoodsName').getValue() == ''){ showResult("请选择一次性物品!"); return false; @@ -312,6 +304,14 @@ top.Ext.getCmp('diposableGoodsAmount').focus(); return false; } + + var objID = batch.disposableGoodsBatchID; + var price = priceAmount.price; + var batchNumber = batch.batchNumber; + var expDate = batch.expDate; + var supplierName = batch.supplierName; + + var storage = priceAmount.amount; var receiveRecordItemGridStore = top.Ext.getCmp('receiveRecordItemGrid').getStore(); for(var i = 0;i < receiveRecordItemGridStore.getCount();i++){ var receiveRecordItem = receiveRecordItemGridStore.getAt(i).data;