This commit is contained in:
linfso 2024-06-01 12:25:33 +08:00
parent 988f82fa8d
commit a1fb50188b

View File

@ -13,6 +13,7 @@ package com.xdadan.erp.web.emis;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.xdadan.erp.common.annotation.Log; import com.xdadan.erp.common.annotation.Log;
import com.xdadan.erp.common.core.controller.BaseController; import com.xdadan.erp.common.core.controller.BaseController;
import com.xdadan.erp.common.core.domain.AjaxResult; import com.xdadan.erp.common.core.domain.AjaxResult;
@ -247,7 +248,10 @@ public class EmisCommonController extends BaseController
printItem.put("billCode",billCode); printItem.put("billCode",billCode);
if(order!=null) { if(order!=null) {
printItem.put("billDetail", Base64.getEncoder().encodeToString(JSONObject.toJSONString(order).getBytes(Charset.forName("UTF-8")))); // 将对象中为空的字段 不忽略,value从null转换为""
String billDetail=JSONObject.toJSONString(order, SerializerFeature.PrettyFormat, SerializerFeature.WriteNullStringAsEmpty);
logger.debug("==>PrintBillDetail"+billDetail);
printItem.put("billDetail", Base64.getEncoder().encodeToString(billDetail.getBytes(Charset.forName("UTF-8"))));
printItem.put("isEncrpt",false); printItem.put("isEncrpt",false);
printItem.put("printCount",1); printItem.put("printCount",1);
printItem.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date())); printItem.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));