Index: forgon-tools/src/main/java/com/forgon/Constants.java
===================================================================
diff -u -r26809 -r26914
--- forgon-tools/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 26809)
+++ forgon-tools/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 26914)
@@ -24,7 +24,7 @@
 			"4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4","4.7.5","4.7.6","4.7.7",
 			"4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8","4.8.9","4.9.0","4.9.1","4.9.2","4.9.3","4.9.4","4.9.5","4.9.6",
 			"4.9.7","4.9.8","4.9.9","4.9.10","4.9.11","4.9.12","4.9.13","4.9.14","4.9.15","4.9.16","4.9.17","4.9.18","4.9.19","4.9.20","4.9.21","4.9.22","4.9.23","4.9.24",
-			"4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34","4.9.35","4.9.36","4.9.37","4.9.38","4.9.39"};
+			"4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34","4.9.35","4.9.36","4.9.37","4.9.38","4.9.39","4.9.40"};
 
 	// 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本)
 	/*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItemOfBaseNum.java
===================================================================
diff -u -r26769 -r26914
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItemOfBaseNum.java	(.../InventoryItemOfBaseNum.java)	(revision 26769)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItemOfBaseNum.java	(.../InventoryItemOfBaseNum.java)	(revision 26914)
@@ -98,7 +98,7 @@
 		this.inventoryRecord = inventoryRecord;
 	}
 	@ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, fetch = FetchType.LAZY)
-	@JoinTable(name = "TousseInstance_InventoryItemOfBaseNum", joinColumns = { @JoinColumn(name = "inventoryItemOfBaseNumId") }, inverseJoinColumns = { @JoinColumn(name = "tousseInstanceId") })
+	@JoinTable(name = "Tousse_InventoryOfBase", joinColumns = { @JoinColumn(name = "inventoryItemOfBaseNumId") }, inverseJoinColumns = { @JoinColumn(name = "tousseInstanceId") })
 	public Set<TousseInstance> getTousseInstances() {
 		return tousseInstances;
 	}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r26845 -r26914
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 26845)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 26914)
@@ -2534,7 +2534,7 @@
 		this.operationRoomName = operationRoomName;
 	}
 	@ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, fetch = FetchType.LAZY)
-	@JoinTable(name = "TousseInstance_InventoryItemOfBaseNum", joinColumns = { @JoinColumn(name = "tousseInstanceId") }, inverseJoinColumns = { @JoinColumn(name = "inventoryItemOfBaseNumId") })
+	@JoinTable(name = "Tousse_InventoryOfBase", joinColumns = { @JoinColumn(name = "tousseInstanceId") }, inverseJoinColumns = { @JoinColumn(name = "inventoryItemOfBaseNumId") })
 	public Set<InventoryItemOfBaseNum> getInventoryItemOfBaseNums() {
 		return inventoryItemOfBaseNums;
 	}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r26877 -r26914
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 26877)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 26914)
@@ -6693,7 +6693,7 @@
 		if(id != null){
 			sql = String.format("select ti.id,barcode,status,sterileEndTime,invoiceSendTime,signedDate from %s ti "
 					+ "inner join %s bd on ti.id=bd.id "
-					+ "inner join TousseInstance_InventoryItemOfBaseNum tii on tii.tousseInstanceId=ti.id where tii.inventoryItemOfBaseNumId=%s ",
+					+ "inner join Tousse_InventoryOfBase tii on tii.tousseInstanceId=ti.id where tii.inventoryItemOfBaseNumId=%s ",
 					TousseInstance.class.getSimpleName(),BarcodeDevice.class.getSimpleName(),id);
 		}else{
 			Set<String> scanIdSet = null;