Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/StorageLocation.java =================================================================== diff -u -r26820 -r26918 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/StorageLocation.java (.../StorageLocation.java) (revision 26820) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/StorageLocation.java (.../StorageLocation.java) (revision 26918) @@ -1,25 +1,16 @@ package com.forgon.disinfectsystem.entity.basedatamanager.warehouse; -import java.util.ArrayList; import java.util.List; import javax.persistence.Entity; import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Index; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.Lob; import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Table; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.annotations.Cascade; -import org.hibernate.annotations.CascadeType; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -185,7 +176,7 @@ } @ManyToMany(fetch = FetchType.LAZY) - @JoinTable(name = "storageLocation_tousseDefinition", joinColumns = { @JoinColumn(name = "storageLocation_id") }, inverseJoinColumns = { @JoinColumn(name = "tousseDefinition_id") }) + @JoinTable(name = "storageLocation_td", joinColumns = { @JoinColumn(name = "storageLocation_id") }, inverseJoinColumns = { @JoinColumn(name = "tousseDefinition_id") }) public List getTousseDefinitionList() { return tousseDefinitionList; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r26844 -r26918 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 26844) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 26918) @@ -1895,7 +1895,7 @@ } @ManyToMany(fetch = FetchType.LAZY) - @JoinTable(name = "storageLocation_tousseDefinition", joinColumns = { @JoinColumn(name = "tousseDefinition_id") }, inverseJoinColumns = { @JoinColumn(name = "storageLocation_id") }) + @JoinTable(name = "storageLocation_td", joinColumns = { @JoinColumn(name = "tousseDefinition_id") }, inverseJoinColumns = { @JoinColumn(name = "storageLocation_id") }) public List getStorageLocationList() { return storageLocationList; } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r26913 -r26918 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 26913) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 26918) @@ -4260,7 +4260,7 @@ // 根据器械包定义ID查库位简称、库位编码 String sql = String.format("select td.id, sl.simpleName, sl.storageLocationCode, sl.orgUnitName " - + "from StorageLocation sl join storageLocation_tousseDefinition ts on sl.id = ts.storageLocation_id " + + "from StorageLocation sl join storageLocation_td ts on sl.id = ts.storageLocation_id " + "join TousseDefinition td on td.id = ts.tousseDefinition_id " + "and %s ", SqlUtils.getNonStringFieldInLargeCollectionsPredicate("td.id", tdList)); Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.39_4.9.40_sqlserver.sql =================================================================== diff -u -r26916 -r26918 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.39_4.9.40_sqlserver.sql (.../4.9.39_4.9.40_sqlserver.sql) (revision 26916) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.39_4.9.40_sqlserver.sql (.../4.9.39_4.9.40_sqlserver.sql) (revision 26918) @@ -1 +1,2 @@ -sp_rename TousseInstance_InventoryItemOfBaseNum,Tousse_InventoryOfBase; \ No newline at end of file +execute sp_rename TousseInstance_InventoryItemOfBaseNum,Tousse_InventoryOfBase; +execute sp_rename storageLocation_TousseDefinition,storageLocation_td; \ No newline at end of file