aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-07-10 16:01:18 +08:00
parent cf01247e99
commit 88a25f233b
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -21,6 +21,7 @@ import javax.validation.Valid;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
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.filter.jackson.JacksonFilter; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
import com.xdadan.erp.common.config.PayConfig; import com.xdadan.erp.common.config.PayConfig;
import com.xdadan.erp.common.core.domain.entity.SysUser; import com.xdadan.erp.common.core.domain.entity.SysUser;
@ -36,6 +37,7 @@ import com.xdadan.erp.emis.service.*;
import com.xdadan.erp.emis.service.print.IXddTplPrint; import com.xdadan.erp.emis.service.print.IXddTplPrint;
import com.xdadan.erp.emis.service.print.cpcl.CvtTplToCpcl; import com.xdadan.erp.emis.service.print.cpcl.CvtTplToCpcl;
import com.xdadan.erp.emis.service.print.tanex.TanexTplPrintImpl; import com.xdadan.erp.emis.service.print.tanex.TanexTplPrintImpl;
import com.xdadan.erp.emis.utils.GZipUtils;
import com.xdadan.erp.emis.utils.PrintUtils; import com.xdadan.erp.emis.utils.PrintUtils;
import com.xdadan.erp.emis.utils.WaybillHelper; import com.xdadan.erp.emis.utils.WaybillHelper;
import com.xdadan.erp.system.domain.SysFileInfo; import com.xdadan.erp.system.domain.SysFileInfo;
@ -549,9 +551,21 @@ public class EmisWaybillController extends EmisBaseController
// 设置通用权限查询参数 // 设置通用权限查询参数
list = emisWaybillService.selectEmisWaybillList(emisWaybill); list = emisWaybillService.selectEmisWaybillList(emisWaybill);
} }
if(emisWaybill.getParams().containsKey("blExport")){
List<String> exportList= new ArrayList<>();
JSON.DEFFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
String encStr = GZipUtils.zipToBase64Str(JSON.toJSONString(list, SerializerFeature.WriteMapNullValue ,SerializerFeature.WriteDateUseDateFormat));
if(encStr!=null) {
exportList.add(encStr);
}
return getDataTable(exportList);
}else {
return getDataTable(list); return getDataTable(list);
} }
}
/** /**
* 查询订单列表 * 查询订单列表