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 22:56:02 +08:00
parent 666ea64766
commit 1172b3ebfa
2 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
View File

@ -204,43 +204,7 @@ public class EmisTmsScanRecordController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
/**
* 查询扫描统计数据
* 1-发件清单 2-到件清单 3-派件清单
* @param scanRecord
* @return
*/
@JacksonFilter(include= {
"billCode","scanDate"
},value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/queryScanWaybillList")
public TableDataInfo queryScanWaybillList(EmisTmsScanRecord scanRecord)
{
// 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)){
scanRecord.setScanType(ScanType.ARRIVAL.opCode);
}
else if("3".equals(scanStatType)){
scanRecord.setScanType(ScanType.SENT.opCode);
}else{
// return getDataTable(new ArrayList<>());
}
scanRecord.setScanSiteCode(getLoginUser().getUser().getOwnerSiteCode());
startPage();
List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(scanRecord);
return getDataTable(list);
}
/** /**
* 导出TMS扫描记录列表 * 导出TMS扫描记录列表

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

@ -351,8 +351,50 @@ public class EmisWaybillController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
/**
* 查询扫描统计数据
* 1-发件清单 2-到件清单 3-派件清单
* @param scanRecord
* @return
*/
@RequestMapping("/queryScanWaybillList")
@JacksonFilter(include= {
"billCode","scanDate"
},value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
public TableDataInfo queryScanWaybillList(EmisTmsScanRecord scanRecord)
{
if(!scanRecord.getParams().containsKey("scanStatType")){
TableDataInfo tableDataInfo = getDataTable(new ArrayList<>());
tableDataInfo.setCode(500);
tableDataInfo.setMsg("参数有误");
return tableDataInfo;
}
// 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)){
scanRecord.setScanType(ScanType.ARRIVAL.opCode);
}
else if("3".equals(scanStatType)){
scanRecord.setScanType(ScanType.SENT.opCode);
}else{
TableDataInfo tableDataInfo = getDataTable(new ArrayList<>());
tableDataInfo.setCode(500);
tableDataInfo.setMsg("参数有误");
return tableDataInfo;
}
scanRecord.setScanSiteCode(getLoginUser().getUser().getOwnerSiteCode());
startPage();
List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(scanRecord);
return getDataTable(list);
}
@RequestMapping("/realGetWaybillPrintData") @RequestMapping("/realGetWaybillPrintData")
public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang, String printType,String isNeedPdf) public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang, String printType,String isNeedPdf)