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);
 							}