Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r25708 -r25738
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 25708)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 25738)
@@ -68,7 +68,6 @@
 import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
-import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
 import com.forgon.disinfectsystem.disposablegoods.service.DisposableGoodsServiceContext;
 import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
@@ -183,8 +182,6 @@
 	
 	private TousseDefinitionManager tousseDefinitionManager;
 	
-	private DiposableGoodsManager diposableGoodsManager;
-	
 	private WashAndDisinfectRecordManager washAndDisinfectRecordManager;
 	
 	private TousseInstanceManager tousseInstanceManager;
@@ -352,10 +349,6 @@
 		this.tousseDefinitionManager = tousseDefinitionManager;
 	}
 
-	public void setDiposableGoodsManager(DiposableGoodsManager diposableGoodsManager) {
-		this.diposableGoodsManager = diposableGoodsManager;
-	}
-
 	public void setWashAndDisinfectRecordManager(
 			WashAndDisinfectRecordManager washAndDisinfectRecordManager) {
 		this.washAndDisinfectRecordManager = washAndDisinfectRecordManager;
@@ -2920,7 +2913,6 @@
 			String washBasket,ForeignTousseApplication foreignTousseApplication,String orgUnitCoding, 
 			String orgUnitName, Date packingDate,Double tousseWeight,String remark, PackingTask currentPackingTask,Map<Long,WashAndDisinfectRecord> idToWashRecordMap,
 			Map<Long,RecyclingRecord> idToRecyclingRecordMap,Date sterileStartTime) {
-		boolean allowForeignToussePartiallyPacking = CssdUtils.getSystemSetConfigByNameBool("allowForeignToussePartiallyPacking");
 		// 外来器械拆包后价格从系统参数拿
 		SupplyRoomConfig config = supplyRoomConfigManager
 				.getSystemParamsObj();
@@ -3066,7 +3058,6 @@
 			String sterilizer, String frequency, TousseDefinition tousseDefinition,
 			Date packingDate, Integer packingAmount, PackingTask currentPackingTask , 
 			List<PackingTask> packingTaskList,String reviewer,ForeignTousseApplication foreignTousseApplication,JSONArray splits) {
-		boolean allowForeignToussePartiallyPacking = CssdUtils.getSystemSetConfigByNameBool("allowForeignToussePartiallyPacking");
 		PackingRecord packingRecord = new PackingRecord();
 		packingRecord.setIsDirectPacking(false);
 		packingRecord.setSterilizer(sterilizer);
@@ -4788,10 +4779,15 @@
 		TousseInstance tousseInstance = new TousseInstance();
 
 		tousseInstance.setTaskGroup(taskGroup);
-		
 		tousseInstance.setBarcode(barcodeStr);
-		tousseInstance.setWeight(tousseWeight);
-
+		JSONObject sstsConfig = CssdUtils.getWebConfigInfo();
+		// 装配界面是否显示重量 如果不显示，则使用包定义的重量，否则使用用户装配时的重量
+		boolean showTousseWeight = sstsConfig.optBoolean("showTousseWeight",false);
+		if(showTousseWeight){
+			tousseInstance.setWeight(tousseWeight);
+		}else{
+			tousseInstance.setWeight(td.getWeight());
+		}
 		tousseInstance.setRemark(remark);
 		tousseInstance.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE);
 		tousseInstance.setSterilizationUser(sterileUserName);