1.收退换打印功能增加日志输出

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/common/entity/MergePrintEntity.java

@@ -1,8 +1,9 @@
 package nckd.jimin.jyyy.fi.common.entity;
 
+import java.io.Serializable;
 import java.util.List;
 
-public class MergePrintEntity {
+public class MergePrintEntity implements Serializable {
 
     /**
      * 单据类型

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/common/util/ReceiveTicketUtils.java

@@ -61,7 +61,10 @@ public class ReceiveTicketUtils {
                 // 电子回单获取附件
                 if(BillTypeConstants.BEI_ELECRECEIPT.equals(print.getFormId())){
                     byte[] printBuff = getElecReceiptPrintUrl(printBillId);
-                    mergeArray.add(printBuff);
+                    if(printBuff != null && printBuff.length != 0){
+                        logger.info("电子回单文件大小：" + printBuff.length);
+                        mergeArray.add(printBuff);
+                    }
                 } else{
                     if(StringUtils.isNotEmpty(print.getTemplateId())){
                         String tplType = getTplTypeById(print.getTemplateId());

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/HandInReceiveTicketPlugin.java

@@ -1,5 +1,6 @@
 package nckd.jimin.jyyy.fi.plugin.form;
 
+import com.alibaba.fastjson.JSON;
 import com.kingdee.util.StringUtils;
 import kd.bos.algo.DataSet;
 import kd.bos.bill.BillShowParameter;
@@ -565,7 +566,7 @@ public class HandInReceiveTicketPlugin extends AbstractFormPlugin implements Row
         String billId = selectRow.getString(HandInReceiveTicketConstant.SCANBILLENTRY.KEY_NCKD_BILLID);
         // 通过打印配置获取单据打印信息
         List<MergePrintEntity> printPdfConfig = ReceiveTicketUtils.getPrintPdfConfig(formId,Long.valueOf(billId),companyId);
-
+        log.info(String.format("获取的打印信息为：%s", JSON.toJSONString(printPdfConfig)));
         String printFileName = String.format("%s报销信息打印",selectRow.getString(HandInReceiveTicketConstant.SCANBILLENTRY.KEY_NCKD_NUMBER));
         String previewUrl = ReceiveTicketUtils.mergePrintPdf(getView(), printPdfConfig, printFileName);
         getView().openUrl(previewUrl);