Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r25569 -r25661
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 25569)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 25661)
@@ -3923,7 +3923,7 @@
 									tousse.optInt("toolAmount"),
 									tousse.optInt("implantAmount"),tousse.optString("department"),
 									td.getPrintOrgSource(),0L,"","",objectDao,td.getBarcodePaperType(),tousse.optString("washOperator"),tousse.optString("washOperatorCode"),
-									tousse.optString("weight"),tousse.optString("remark"),tousse.optInt("printAmount"),false,tousse.optString("isUrgentTousse"),0);
+									Double.valueOf(tousse.optString("weight")),tousse.optString("remark"),tousse.optInt("printAmount"),false,tousse.optString("isUrgentTousse"),0);
 	
 							setPrintCause(currentPackingTask,obj);
 							toussesArray.add(obj);
@@ -4781,7 +4781,7 @@
 		tousseInstance.setTaskGroup(taskGroup);
 		
 		tousseInstance.setBarcode(barcodeStr);
-		tousseInstance.setWeight(tousseWeight);
+		tousseInstance.setWeight(Double.valueOf(tousseWeight));
 		tousseInstance.setRemark(remark);
 		tousseInstance.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE);
 		tousseInstance.setSterilizationUser(sterileUserName);
@@ -6287,7 +6287,7 @@
 				ti.getOperationTime(), false, false, true, isReview,
 				isTraceable, td.getIsBigPackage(), "", null, 0l, "", 0,
 				0, ti.getDepart(), TousseDefinition.PRINGORGSOURCE_NONE, 0l, "", "", objectDao, td.getBarcodePaperType(), "", "",
-				"",remark,printAmount ,BooleanUtils.toBooleanDefaultIfNull(ti.getHaveUnSupplementMaterials(), false),ti.getIsUrgentTousse(),ti.getTousseInstancesAmountBelongToThisComboTousse(objectDao));
+				ti.getWeight(),remark,printAmount ,BooleanUtils.toBooleanDefaultIfNull(ti.getHaveUnSupplementMaterials(), false),ti.getIsUrgentTousse(),ti.getTousseInstancesAmountBelongToThisComboTousse(objectDao));
 	}
 
 	private JSONObject getTousseDefinitionPrintJsonForComboTousse(
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.29_4.9.30_sqlserver.sql
===================================================================
diff -u
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.29_4.9.30_sqlserver.sql	(revision 0)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.29_4.9.30_sqlserver.sql	(revision 25661)
@@ -0,0 +1 @@
+alter table TousseInstance alter column [weight] float;
\ No newline at end of file
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
===================================================================
diff -u -r25568 -r25661
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java	(.../CssdUtils.java)	(revision 25568)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java	(.../CssdUtils.java)	(revision 25661)
@@ -1285,7 +1285,7 @@
 			int implantAmount, String department, String printOrgSource,
 			Long idCardDefinitionUseAmount, String idCardDefinitionIdNumber, String idCardDefinitionDescription, ObjectDao objectDao,
 			String barcodePaperType, String washOperator,
-			String washOperatorCode, String weight,String remark, int printAmount,boolean haveUnSupplementMaterials,String isUrgentTousse,
+			String washOperatorCode, Double weight,String remark, int printAmount,boolean haveUnSupplementMaterials,String isUrgentTousse,
 			int includedTousseAmount) {
 		JSONObject obj = new JSONObject();
 		obj.put("tousseName", tousseName);  // 名称
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.29_4.9.30_oracle.sql
===================================================================
diff -u
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.29_4.9.30_oracle.sql	(revision 0)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.29_4.9.30_oracle.sql	(revision 25661)
@@ -0,0 +1,5 @@
+execute immediate 'alter table TousseInstance add weighttemp FLOAT';
+execute immediate 'update TousseInstance set weighttemp = to_number(weight)';
+execute immediate 'commit';
+execute immediate 'alter table TousseInstance drop column weight';
+execute immediate 'alter table TousseInstance rename column weighttemp to weight';
\ No newline at end of file
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r25657 -r25661
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 25657)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 25661)
@@ -535,7 +535,7 @@
 	/**
 	 * 器械包重量
 	 */
-	private String weight;
+	private Double weight;
 	
 	/**
 	 *  灭菌时所在的位置
@@ -1992,11 +1992,11 @@
 	public boolean actualNotUsed(){
 		return StringTools.equals(Constants.STR_NO, actualUsed);
 	}
-	public String getWeight() {
+	public Double getWeight() {
 		return weight;
 	}
 
-	public void setWeight(String weight) {
+	public void setWeight(Double weight) {
 		this.weight = weight;
 	}