tntdc 2 anni fa
parent
commit
25b89d80fc

+ 11 - 4
adm/src/main/java/com/minpay/guomao/stockManage/BatchPrintBillManageAction.java

@@ -2,8 +2,9 @@ package com.minpay.guomao.stockManage;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
-import java.net.URLEncoder;
+import java.net.URLDecoder;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -11,7 +12,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletResponse;
+
 import com.alibaba.excel.EasyExcel;
+import com.min.base64.Base64;
 import com.minpay.common.bean.User;
 import com.minpay.common.format.IFormatService;
 import com.minpay.common.service.IGuoMaoCommonService;
@@ -76,8 +80,6 @@ import com.startup.minpay.frame.target.MINParam;
 
 import net.sf.json.JSONArray;
 
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * 批量打印
  * @author 华硕
@@ -857,6 +859,7 @@ public class BatchPrintBillManageAction implements IMINAction {
 	 * @throws IllegalAccessException 
 	 * @throws SecurityException 
 	 * @throws NoSuchMethodException 
+	 * @throws UnsupportedEncodingException 
 	 */
 	@MINAction(value = SAVE_GIVE_PRINT,transaction = IMINTransactionEnum.CMT)
 	public MINActionResult saveGivePrint(
@@ -866,7 +869,11 @@ public class BatchPrintBillManageAction implements IMINAction {
 			@MINParam(key = "param") String param,
 			@MINParam(key = "htmlArray") String htmlArray,
 			MINSession session
-			) throws MINBusinessException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException {
+			) throws MINBusinessException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException, UnsupportedEncodingException {
+		printHtml = Base64.decode(printHtml);
+		printHtml = URLDecoder.decode(printHtml, "UTF-8");
+		printHtml = CommonUtil.replaceSTRN(printHtml);
+				
 		MINActionResult res = new MINActionResult();
 		User user = session.getUser();
 		if (CommonUtil.isEmpty(fhDate)) {

+ 1 - 1
adm/src/main/resources/com/minpay/db/table/own/mapper/WarehouseStockMapper.xml

@@ -150,7 +150,7 @@
 		 			IFNULL(ad.AWD_EXCEL_RECEIPT_ID,'')	"excelReceipt",
 		 			IFNULL(
 				    	IF(ad.AWD_BOX_NO IS NULL OR ad.AWD_BOX_NO = '',
-							IF(ad.AWD_LICENSE_NUMBER IS NULL OR ad.AWD_LICENSE_NUMBER = '',ad.AWD_EXCEL_RECEIPT_ID, ad.AWD_BOX_NO),
+							IF(ad.AWD_LICENSE_NUMBER IS NULL OR ad.AWD_LICENSE_NUMBER = '',ad.AWD_EXCEL_RECEIPT_ID, ad.AWD_LICENSE_NUMBER),
 							ad.AWD_BOX_NO
 						),
 					    ''

+ 1 - 1
adm/src/main/webapp/admin/giveOutManage/printGiveOut.html

@@ -151,7 +151,7 @@
 			
 			var contractId = $("#contractId").val();
 			var fhDate = $("#fhDate").val();
-			var printHtml = $("#big").html();
+			var printHtml = window.btoa(encodeURI($("#big").html()));
 			var param = {};
 			param.resAllWeight = resAllWeight;
 			param.yijieMonth = yijieMonth;