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 2024-05-23 19:37:22 +08:00
parent d1bac89cbe
commit f613f58c9c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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());