Index: ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.jsp =================================================================== diff -u -r12331 -r14098 --- ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.jsp (.../stockTakeInfoView.jsp) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.jsp (.../stockTakeInfoView.jsp) (revision 14098) @@ -1,7 +1,7 @@ <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> <%@ include file="/common/includeExtJsAndCss.jsp"%> -<%@ page import="com.forgon.tools.SpringBeanManger,com.forgon.disinfectsystem.entity.stocktakemanager.StockTakeInfo" %> +<%@ page import="com.forgon.tools.SpringBeanManger,com.forgon.disinfectsystem.entity.stocktakemanager.InventoryRecord" %> <% String userName = AcegiHelper.getLoginUser().getUserFullName(); request.setAttribute("userName",userName); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java =================================================================== diff -u -r13624 -r14098 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 13624) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 14098) @@ -206,8 +206,8 @@ objectDao.executeUpdate("update Invoice set warehouseName='" + wareHouse.getName() + "' where warehouseID=" + wareHouse.getId()); objectDao.executeUpdate(String.format("update %s set sourceWarehouseName='%s' where sourceWarehouseId=%s",Invoice.class.getSimpleName(), wareHouse.getName(),wareHouse.getId())); objectDao.executeUpdate("update InvoiceItem set wareHouseName='" + wareHouse.getName() + "' where wareHouseId=" + wareHouse.getId()); - objectDao.executeUpdate("update StockTakeInfo set wareHouseName='" + wareHouse.getName() + "' where wareHouseId=" + wareHouse.getId()); - objectDao.executeUpdate("update StockTakeItem set wareHouseName='" + wareHouse.getName() + "' where wareHouseId=" + wareHouse.getId()); + objectDao.executeUpdate("update InventoryRecord set wareHouseName='" + wareHouse.getName() + "' where wareHouseId=" + wareHouse.getId()); + objectDao.executeUpdate("update InventoryItem set wareHouseName='" + wareHouse.getName() + "' where wareHouseId=" + wareHouse.getId()); objectDao.executeUpdate("update ReturnGoodsRecord set warehouseName='" + wareHouse.getName() + "' where warehouseID=" + wareHouse.getId()); objectDao.executeUpdate(String.format("update %s set srcWarehouseName='%s' where srcWarehouseID=%s",ReturnGoodsRecord.class.getSimpleName(), wareHouse.getName(),wareHouse.getId())); objectDao.executeUpdate("update ReturnGoodsItem set warehouseName='" + wareHouse.getName() + "' where warehouseID=" + wareHouse.getId()); Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java =================================================================== diff -u -r13802 -r14098 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 13802) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 14098) @@ -253,14 +253,14 @@ } public void deleteStockTakeRecords(){ - objectDao.excuteSQL("delete from StockTakeItem"); + objectDao.excuteSQL("delete from InventoryItem"); objectDao.excuteSQL("delete from StockIdentificationOfGoods"); objectDao.excuteSQL("delete from StockDiposableGoodBatch"); objectDao.excuteSQL("delete from StockDiposableGoods"); objectDao.excuteSQL("delete from StockTakeRecord"); - objectDao.excuteSQL("delete from stockTakeInfo"); + objectDao.excuteSQL("delete from InventoryRecord"); }