Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
===================================================================
diff -u -r13010 -r13041
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 13010)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 13041)
@@ -29,6 +29,7 @@
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
+import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils;
 import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
@@ -246,6 +247,8 @@
 			JSONObject expirationObj = expirationDateInfoManager
 					.getExpirationDate(new Date().getTime() + "", packageType);
 			
+			String packageTypeAbbreviation = TousseInstanceUtils.getPackageTypeAbbreviation(objectDao, packageType);
+			
 			boolean isDefined = expirationObj.optBoolean("isDefined");
 			if (isDefined){
 				validUntil = (Date)JSONObject.toBean(expirationObj.optJSONObject("validUntil"), Date.class);
@@ -448,6 +451,7 @@
 				retObj.put("fixedBarcode", fixedBarcode);
 				retObj.put("isDisinfection", isDisinfection);
 				retObj.put("disinfectionItem", materials);
+				retObj.put("packageTypeAbbreviation", packageTypeAbbreviation);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r12799 -r13041
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 12799)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 13041)
@@ -249,6 +249,16 @@
         			tableHtml += "<td colspan='4' style='font-size: 12px;;font-weight:bold' align='center'>消毒日期:" + dateStr + "<center>";
         			tableHtml += "</center></td></tr>";
         			
+        			if(sstsConfig.printValidDateUtil){
+        				var validDateStr = validDate;
+            			if (validDateStr.length > 10){
+            				validDateStr = validDateStr.substring(0,10);
+            			}
+            			tableHtml += "<tr>";
+            			tableHtml += "<td colspan='4' style='font-size: 12px;;font-weight:bold' align='center'>失效日期:" + validDateStr + "<center>";
+            			tableHtml += "</center></td></tr>";
+        			}
+        			
         			//打印材料明细
         			if(materialsJsonArray && materialsJsonArray.length>0){
         				tableHtml += "<tr>";
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js
===================================================================
diff -u -r13006 -r13041
--- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js	(.../config.js)	(revision 13006)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js	(.../config.js)	(revision 13041)
@@ -45,5 +45,7 @@
   hideDiposableGoodsPrice : true,
   // 显示一次性物品的外部编码，申请时
   showExternalCodeOfDisposableGoods : true,
-  autoFillExternalCodeOfDisposableGoods: true // 自动填写一次性物品的外部编码
+  autoFillExternalCodeOfDisposableGoods: true, // 自动填写一次性物品的外部编码
+  //是否打印消毒物品失效时期
+  printValidDateUtil:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r12958 -r13041
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 12958)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 13041)
@@ -235,7 +235,7 @@
 	}
 	
 	// TODO:自定义装配目前不支持装配消毒物品，装配的消毒物品也无法发货，需要进行改造。需要与普通装配调用同样的方法
-	function printBarcodeOfDisinfection(barcodeStr, materialArr,isTraceable,fixedBarcode){
+	function printBarcodeOfDisinfection(barcodeStr, materialArr,isTraceable,fixedBarcode,expirationDate,packageTypeAbbreviation){
 		var operator = Ext.getCmp('operator').getValue();//打包人
 		var reviewer = Ext.getCmp('reviewer').getValue();//审核人
 		var printNum = Ext.getCmp('tempPrintNum').getValue();//打印张数
@@ -275,7 +275,8 @@
 						obj.materialsJsonArray = materialArr;
 						obj.isTraceable = isTraceable;
 						obj.fixedBarcode = fixedBarcode;
-						obj.validDate = null;
+						obj.validDate = expirationDate;
+						obj.packageTypeAbbreviation = packageTypeAbbreviation;
 						
 						printLabelOfDisinfection(obj);
 						
@@ -1286,11 +1287,14 @@
 				
 				DWREngine.setAsync(false);
 				var  bool = true;
+				var expirationDate = null;
 			    ExpirationDateInfoTableManager.getExpirationDate(disinfectionDate,packageType,function(result){
 			    	var json = JSON.parse(result);
 			    	if(!json.isDefined){
 			    		showResult("此包装类型没有对应的物品失效期设置，请先为该包装类型增加失效期定义！");
 			    		bool = false;
+			    	}else{
+			    		expirationDate = json.expirationDate;
 			    	}
 			    });
 			    
@@ -1333,7 +1337,7 @@
 						
 						if(isPrint){
 							if(action.result.isDisinfection){//是否为消毒物品
-								printBarcodeOfDisinfection(action.result.barcode, action.result.disinfectionItem,isTraceable,fixedBarcode);
+								printBarcodeOfDisinfection(action.result.barcode, action.result.disinfectionItem,isTraceable,fixedBarcode,expirationDate,action.result.packageTypeAbbreviation);
 							}else{
 								printBarcode(action.result.barcode,disinfectionDate,isTraceable,fixedBarcode,idCardDefinitionUseAmount);
 							}