Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r21392 -r21435
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 21392)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 21435)
@@ -1922,45 +1922,63 @@
 	var config = printConfig.invoicePlan;
 	var printParams = getPrintJsonParams("batchPrint", id , config);
 	
-	var mask;
-	if (!isIE6OrIE7){
-		createMask.call(objMask,'printMask','正在处理批量打印请求，请稍候...',Ext.getBody(),true);
-		objMask.printMask.show();
-	}else{
-		mask = new Ext.LoadMask(Ext.getBody(), { msg: '正在处理批量打印请求，请稍候...'});
-		mask.show();
-	}
-	
-
-
-    RecyclingApplicationTableManager.findPrintRecyclingGoods(JSON.stringify(printParams) , function(result){
-    	var obj = JSON.parse(result);
+	function doBatchPrintService(repeat){
+		var mask;
 		if (!isIE6OrIE7){
-			objMask.printMask.hide();
+			createMask.call(objMask,'printMask','正在处理批量打印请求，请稍候...',Ext.getBody(),true);
+			objMask.printMask.show();
+		}else{
+			mask = new Ext.LoadMask(Ext.getBody(), { msg: '正在处理批量打印请求，请稍候...'});
+			mask.show();
 		}
-		else {
-			mask.hide();
-		}
-
-    	if (obj.success){
-			if (sstsConfig.isShowNoPrintList && obj.noPrintList){
-				showResult("如下科室未填写申请单：【" + obj.noPrintList + "】","",-1);
+		printParams.printScope.reprintTodayPrintedTousseItem = repeat;
+	    RecyclingApplicationTableManager.findPrintRecyclingGoods(JSON.stringify(printParams) , function(result){
+	    	var obj = JSON.parse(result);
+			if (!isIE6OrIE7){
+				objMask.printMask.hide();
 			}
-			var newP = top.Ext.MessageBox.show({
-				title:'请等待',
-				msg:'打印中……',
-				width:350,
-				progress:true,
-				closable:false
-			});
+			else {
+				mask.hide();
+			}
 
-			formTypeOfPrinted = "invoicePlan";
-			printByJsonPrintObject(obj, newP,false,0,true);
-    	}
-    	else{
-    		showResult(obj.error);
-    	}
-    });
+	    	if (obj.success){
+				if (sstsConfig.isShowNoPrintList && obj.noPrintList){
+					showResult("如下科室未填写申请单：【" + obj.noPrintList + "】","",-1);
+				}
+				var newP = top.Ext.MessageBox.show({
+					title:'请等待',
+					msg:'打印中……',
+					width:350,
+					progress:true,
+					closable:false
+				});
+
+				formTypeOfPrinted = "invoicePlan";
+				printByJsonPrintObject(obj, newP,false,0,true);
+	    	}
+	    	else{
+	    		showResult(obj.error);
+	    	}
+	    });
+	}
+	if(sstsConfig.reprintTodayPrintedTousseItem){
+		RecyclingApplicationTableManager.haveTodayPrintedTousseItem(JSON.stringify(printParams),function(result){
+			var obj = JSON.parse(result);
+			if(obj.haveTodayPrinted){
+				top.Ext.MessageBox.confirm("请确认","部分申请单已打印，是否重复打印",
+						function(button, text) {
+							if ("yes" == button){
+								doBatchPrintService(true);
+							}
+						}
+					);
+			}else{
+				doBatchPrintService(false);
+			}
+		});
+	}else{
+		doBatchPrintService(false);
+	}
 }
 
 /**