Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r16703 -r16714 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16703) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16714) @@ -20,7 +20,7 @@ "4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2", "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9", "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7","4.5.8", - "4.5.9"};// 版本列表 + "4.5.9","4.6.0"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java =================================================================== diff -u -r16705 -r16714 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java (.../InvoiceItem.java) (revision 16705) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java (.../InvoiceItem.java) (revision 16714) @@ -7,6 +7,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; @@ -27,7 +28,11 @@ * @author WangYi 2012-3-5 */ @Entity -@Table(name = "InvoiceItem") +@Table(name = "InvoiceItem",indexes = {@Index(columnList = "tousseName", name = "tousseName_index") +,@Index(columnList = "expensiveDisposablegoodsId", name = "expensiveDisposablegoodsId_index"),@Index(columnList = "diposable", name = "diposable_index") +,@Index(columnList = "tousseType", name = "tousseType_index"),@Index(columnList = "invoiceID", name = "invoiceID_index") +,@Index(columnList = "invoicePlanID", name = "invoicePlanID_index"),@Index(columnList = "tousseDefinitionId", name = "tousseDefinitionId_index") +}) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class InvoiceItem implements IDAble { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r16654 -r16714 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 16654) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 16714) @@ -35,7 +35,7 @@ @Entity @Table(indexes = {@Index(columnList = "status", name = "status_index"),@Index(columnList = "tousseName", name = "tousseName_index") -,@Index(columnList = "id", name = "id_index"),@Index(columnList = "location", name = "location_index"),@Index(columnList = "sterileFrequency", name = "sterileFrequency_index") +,@Index(columnList = "location", name = "location_index"),@Index(columnList = "sterileFrequency", name = "sterileFrequency_index") ,@Index(columnList = "packageType", name = "packageType_index"),@Index(columnList = "wareHouseId", name = "wareHouseId_index") ,@Index(columnList = "sterilizerName", name = "sterilizerName_index"),@Index(columnList = "sterileStartTime", name = "sterileStartTime_index") ,@Index(columnList = "sterileEndTime", name = "sterileEndTime_index"),@Index(columnList = "foreignProxyItem_id", name = "foreignProxyItem_id_index") Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.5.9_4.6.0.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.5.9_4.6.0.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.5.9_4.6.0.sql (revision 16714) @@ -0,0 +1,2 @@ +update InvoiceItem set tousseDefinitionId=(select max(ti.tousseDefinition_id) from TousseInstance ti where ti.invoice_id=InvoiceItem.invoice_id and ti.tousseName=InvoiceItem.tousseName) +where diposable='否' and tousseDefinitionId is null; \ No newline at end of file