Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java =================================================================== diff -u -r12821 -r12824 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 12821) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 12824) @@ -133,6 +133,28 @@ } return null; } + + public String loadDisposableGoodsStock() { + String id = StrutsParamUtils.getPraramValue("id", ""); + DisposableGoodsStock disposableGoodsStock = null; + if (StringUtils.isNotBlank(id) && !id.equals("0")) { + disposableGoodsStock = diposableGoodsManager.getDiposableGoodsStockById(id); + } else { + disposableGoodsStock = new DisposableGoodsStock(); + } + StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); + + Map map = new HashMap(); + map.put("success", true); + map.put("data", disposableGoodsStock); + try { + String jsonStr = JSONUtil.toJSONString(map, true); + StrutsParamUtils.getResponse().getWriter().println(jsonStr); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } public void loadGodownEntryItemByid() { String disposableGoodsID = StrutsParamUtils.getPraramValue("id", ""); Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js =================================================================== diff -u -r12821 -r12824 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js (.../disposableGoodsStockView.js) (revision 12821) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js (.../disposableGoodsStockView.js) (revision 12824) @@ -695,7 +695,7 @@ var disposableGoodsID = records[0].data.disposableGoodsID; addDiposableGoods(id); top.Ext.getCmp('diposableGoodsForm').form.load({ - url : WWWROOT + '/disinfectSystem/diposableGoodsAction!loadDiposableGoods.do', + url : WWWROOT + '/disinfectSystem/diposableGoodsAction!loadDisposableGoodsStock.do', method : 'GET', waitMsg : '正在加载数据,请稍候', params : {id : disposableGoodsID},