Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r12892 -r12962 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 12892) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 12962) @@ -4,7 +4,6 @@ import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Statement; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -31,16 +30,15 @@ import com.forgon.directory.model.CssdServiceDepts; import com.forgon.directory.model.OrgUnit; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; -import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager; -import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance; +import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; -import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; +import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock; import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance; import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; @@ -529,7 +527,10 @@ //申请项TousseStock updateSqlList.add("update TousseStock set tousseName='"+ targetTousseName +"' where tousseName='"+ originalTousseName +"'"); - + // CssdHandleTousses + updateSqlList.add(String.format("update %s set tousseName='%s' where tousseDefinitionId=%s",CssdHandleTousses.class.getSimpleName(), targetTousseName,td.getId())); + // GoodsStock + updateSqlList.add(String.format("update %s set name='%s' where tousseDefinitionId=%s",GoodsStock.class.getSimpleName(), targetTousseName,td.getId())); for(String updateSql : updateSqlList){ objectDao.excuteSQL(updateSql); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java =================================================================== diff -u -r12914 -r12962 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 12914) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 12962) @@ -189,15 +189,19 @@ objectDao.executeUpdate("update GodownEntry set targetWareHouseName='" + wareHouse.getName() + "' where targetWareHouseId=" + wareHouse.getId()); objectDao.executeUpdate("update GodownEntryItem set warehouseName='" + wareHouse.getName() + "' where warehouseID=" + wareHouse.getId()); 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 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()); objectDao.executeUpdate("update TousseInstance set wareHouseName='" + wareHouse.getName() + "' where wareHouseId=" + wareHouse.getId()); - objectDao.executeUpdate("update DisposableGoodsStock set warehouseName='" + wareHouse.getName() + "' where warehouseID=" + wareHouse.getId()); - objectDao.executeUpdate("update DisposableGoodsBatchStock set warehouseName='" + wareHouse.getName() + "' where warehouseID=" + wareHouse.getId()); - objectDao.executeUpdate("update IdentificationOfDisposableGoods set warehouseName='" + wareHouse.getName() + "' where warehouseID=" + wareHouse.getId()); + + objectDao.executeUpdate(String.format("update %s set warehouseName='%s' where warehouseID=%s",DisposableGoodsBatchStock.class.getSimpleName(), wareHouse.getName(),wareHouse.getId())); + objectDao.executeUpdate(String.format("update %s set warehouseName='%s' where warehouseID=%s",DisposableGoodsStock.class.getSimpleName(), wareHouse.getName(),wareHouse.getId())); + objectDao.executeUpdate(String.format("update %s set warehouseName='%s' where warehouseID=%s",IdentificationOfDisposableGoods.class.getSimpleName(), wareHouse.getName(),wareHouse.getId())); + }catch(Exception e){ e.printStackTrace(); }