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-27 06:34:56 +08:00
parent d2ca6f800b
commit 4a98aa213d
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -351,20 +351,27 @@ public class EmisWaybillController extends BaseController
/**
* 查询扫描统计数据
* 1-发件清单 2-到件清单 3-派件清单
* @param scanRecord
* 1-发件清单 2-到件清单 3-派件清单
* @param scanStatType
* @param beginScanDate
* @param endScanDate
* @param billCode
* @return
*/
// @JacksonFilter(include= {
// "billCode","scanDate"
// },value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@JacksonFilter(include= {
"billCode","scanDate"
},value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@GetMapping("/queryScanWaybillList")
public TableDataInfo queryScanWaybillList(EmisTmsScanRecord scanRecord)
public TableDataInfo queryScanWaybillList(String scanStatType,Date beginScanDate,Date endScanDate,String billCode )
{
log.debug(JSON.toJSONString(scanRecord));
EmisTmsScanRecord scanRecord=new EmisTmsScanRecord();
scanRecord.getParams().put("scanStatType",scanStatType);
scanRecord.getParams().put("beginScanDate",beginScanDate);
scanRecord.getParams().put("beginScanDate",endScanDate);
scanRecord.setBillCode(billCode);
// 1-发件清单 2-到件清单 3-派件清单
String scanStatType=(String)scanRecord.getParams().get("scanStatType");
// String scanStatType=(String)scanRecord.getParams().get("scanStatType");
if("1".equals(scanStatType)){
scanRecord.setScanType(ScanType.DEPARTURE.opCode);
}else if("2".equals(scanStatType)){
@ -380,6 +387,9 @@ public class EmisWaybillController extends BaseController
}
scanRecord.setScanSiteCode(getLoginUser().getUser().getOwnerSiteCode());
log.debug(JSON.toJSONString(scanRecord));
startPage();
List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(scanRecord);
return getDataTable(list);