Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java =================================================================== diff -u -r20633 -r21847 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java (.../DiposableGoodsTableManager.java) (revision 20633) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java (.../DiposableGoodsTableManager.java) (revision 21847) @@ -284,8 +284,8 @@ JSONObject jsonObj = (JSONObject) object; //获得rows中的diposableGoods json对象 JSONObject diposableGoods = jsonObj.optJSONObject("diposableGoods"); - String id = diposableGoods.getString("id"); - List DisposableGoodsBatchStocks = diposableGoodsManager.getExpdateDisposableGoodsBatchStocks(Long.valueOf(id), expdateType); + String disposableGoodsId = diposableGoods.getString("disposableGoodsID"); + List DisposableGoodsBatchStocks = diposableGoodsManager.getExpdateDisposableGoodsBatchStocks(Long.valueOf(disposableGoodsId), expdateType); int expDateAmount = 0; for (DisposableGoodsBatchStock disposableGoodsBatchStock : DisposableGoodsBatchStocks) { expDateAmount += disposableGoodsBatchStock.getStorage(); Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js =================================================================== diff -u -r20633 -r21847 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js (.../diposableGoodsWarningView.js) (revision 20633) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js (.../diposableGoodsWarningView.js) (revision 21847) @@ -342,7 +342,7 @@ showResult("一次只能修改一个一次性物品!"); return false; } - id = records[0].data['diposableGoods.id']; + id = records[0].data['diposableGoods.disposableGoodsID']; addDiposableGoods(id); top.Ext.getCmp('diposableGoodsForm').form.load({ url : WWWROOT + '/disinfectSystem/diposableGoodsAction!loadExpiredDiposableGoods.do', @@ -399,7 +399,7 @@ ]; var readerDetail = [ - {name : 'diposableGoods.id'}, + {name : 'diposableGoods.disposableGoodsID'}, {name : 'diposableGoods.name'}, {name : 'diposableGoods.externalCode'}, {name : 'diposableGoods.specification'},