From f613f58c9c82a8997fc5803569672b3c41e8e8ce Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 23 May 2024 19:37:22 +0800 Subject: [PATCH] md --- .../xdadan/erp/web/emis/EmisWaybillController.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index d261ede56..68058d612 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import cn.hutool.core.io.FileUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; @@ -365,12 +366,14 @@ public class EmisWaybillController extends BaseController { startPage(); - if(!scanRecord.getParams().containsKey("scanStatType")){ - return getDataTable(new ArrayList<>()); - } +// if(!scanRecord.getParams().containsKey("scanStatType")){ +// return getDataTable(new ArrayList<>()); +// } // 1-发件清单 2-到件清单 3-派件清单 String scanStatType=(String)scanRecord.getParams().get("scanStatType"); + log.debug("======>"+scanStatType); + log.debug(JSON.toJSONString(scanRecord.getParams())); if("1".equals(scanStatType)){ scanRecord.setScanType(ScanType.DEPARTURE.opCode); }else if("2".equals(scanStatType)){ @@ -379,7 +382,7 @@ public class EmisWaybillController extends BaseController else if("3".equals(scanStatType)){ scanRecord.setScanType(ScanType.SENT.opCode); }else{ - return getDataTable(new ArrayList<>()); +// return getDataTable(new ArrayList<>()); } scanRecord.setScanSiteCode(getLoginUser().getUser().getOwnerSiteCode());