Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java =================================================================== diff -u -r20416 -r20427 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 20416) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 20427) @@ -1365,10 +1365,6 @@ StrutsResponseUtils.output(json); } - - - - /** * 比较一次性物品包定义的修改,用于记录日志 * @param origineDG 修改前的包定义 Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js =================================================================== diff -u -r20416 -r20427 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 20416) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 20427) @@ -438,8 +438,7 @@ columnWidth : 1, layout : 'form', labelWidth : 110, - items : [ - { + items : [{ xtype : 'numberfield', fieldLabel : '参考价', maxLength : '16', Index: ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp =================================================================== diff -u -r20416 -r20427 --- ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp (.../syncStorageEntry.jsp) (revision 20416) +++ ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp (.../syncStorageEntry.jsp) (revision 20427) @@ -29,7 +29,9 @@ InventoryTableManager inventoryTableManager = (InventoryTableManager)SpringBeanManger.getBean("inventoryTableManager"); Collection storageEntryList = inventoryTableManager.findUnSyncStorageEntryByTime(startDate, endDate,entryType); request.setAttribute("storageEntryList",storageEntryList); -HttpOptionManager httpOptionManager = (HttpOptionManager)SpringBeanManger.getBean("httpOptionManager");Collection diposableTypeList = httpOptionManager.getHttpOptionTextById(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE);Collection materialTypeList = httpOptionManager.getHttpOptionTextById(HttpOption.SYSTEMSETTING_MATERIALTYPE); +HttpOptionManager httpOptionManager = (HttpOptionManager)SpringBeanManger.getBean("httpOptionManager"); +Collection diposableTypeList = httpOptionManager.getHttpOptionTextById(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE); +Collection materialTypeList = httpOptionManager.getHttpOptionTextById(HttpOption.SYSTEMSETTING_MATERIALTYPE); request.setAttribute("diposableTypeList",diposableTypeList); request.setAttribute("materialTypeList",materialTypeList);