Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r17278 -r17479
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 17278)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 17479)
@@ -86,7 +86,28 @@
     names.sterilizationUserToPrint = sterilizationUserToPrint;
     return names;
 }
-
+// 设置材料
+function setMaterialsForPrint(tousseObj,barcode){
+	var jsonObj = "";
+	DWREngine.setAsync(false);
+	PackingTableManager.getMaterialByBarcode(barcode,function(result){
+		jsonObj = Ext.decode(result);
+	});
+	DWREngine.setAsync(true);
+	
+	var materials = [];
+	for(var i = 0; i < jsonObj.result.length;++i){
+		if(jsonObj.result[i].typeName != "一次性物品"){
+			materials.push(jsonObj.result[i]);
+		}else{
+			if(sstsConfig && sstsConfig.tousseLabelPrintDisposableGoods != false){
+				materials.push(jsonObj.result[i]);
+    		}
+		}
+	}
+	tousseObj.materials = materials;
+	
+}
 function printLabel(tousseObj){
 	
 	var barcodes = tousseObj.barcodes;
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
===================================================================
diff -u -r16529 -r17479
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 16529)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 17479)
@@ -876,7 +876,7 @@
 							triggerAction : 'all',
 							hideTrigger : false,
 							typeAhead : false,
-							allowBlank : sstsConfig.hideCssdForeignProxyDisinfectionAapplicantAndMaker == true ? true : false,
+							allowBlank : sstsConfig.hideCssdForeignProxyDisinfectionAapplicantAndMaker || sstsConfig.foreignProxyDisinfectionViewApplicantAllowBlank,
 							anchor : '97%'
 					}]
 				}/*,{
@@ -1554,6 +1554,8 @@
 					'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'material':material, 'sterilingType':sterilingType,
 					'maker':maker,'assistant':assistant,'markTousse':markTousse};
 			top.Ext4.applyIf(printSummaryObj,tousse);
+			
+			setMaterialsForPrint(printSummaryObj,barcode);
 			defaultForeignPrintPackage(printSummaryObj);
 		}
 		hideMessageBox(true);
Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
===================================================================
diff -u -r17467 -r17479
--- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 17467)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 17479)
@@ -448,6 +448,8 @@
 									'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'material':material, 'sterilingType':tousseObj.sterilingType,
 									'maker':tousseObj.maker,'assistant':tousseObj.assistant};
 							top.Ext4.applyIf(printSummaryObj,tousseObj);
+							
+							setMaterialsForPrint(printSummaryObj,barcode);
 							defaultForeignPrintPackage(printSummaryObj);
 
 						}