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 cdd78096c..7d78d7598 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 @@ -404,6 +404,40 @@ public class EmisWaybillController extends EmisBaseController return getDataTable(list); } + + /** + * 查询统计信息 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')") + @GetMapping("/getQueryStatInfoMap") + public AjaxResult getQueryStatInfoMap(EmisWaybill emisWaybill) + { + + startPage(); + + setPrivParams(emisWaybill); + + if(!StringUtils.isEmpty(emisWaybill.getBillCode())){ + emisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode())); + String[] billCodeSortList = emisWaybill.getBillCode().split(","); + if(billCodeSortList.length>1){ + emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList)); + } + } + + if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){ + emisWaybill.setOrderSn(WaybillHelper.formatQueryValue(emisWaybill.getOrderSn())); + String[] orderSnSortList = emisWaybill.getOrderSn().split(","); + if(orderSnSortList.length>1){ + emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList)); + } + } + + Map rstMap = emisWaybillService.getQueryStatInfoMap(emisWaybill); + return AjaxResult.success("查询成功",rstMap); + } + + /** * 查询签收运单列表列表 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java index 8faa79bfc..d72cfa676 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java @@ -54,6 +54,9 @@ public interface EmisWaybillMapper extends BaseMapper public List selectEmisWaybillList(EmisWaybill emisWaybill); + public Map getQueryStatInfoMap(EmisWaybill emisWaybill); + + public List selectWaitDoBillList(EmisWaybill emisWaybill); /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java index 68b42545d..dc261ae2e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java @@ -52,6 +52,14 @@ public interface IEmisWaybillService public List selectEmisWaybillList(EmisWaybill emisWaybill); + /** + * 查询统计信息 + * @param emisWaybill + * @return + */ + public Map getQueryStatInfoMap(EmisWaybill emisWaybill); + + /** * 获取运单信息 根据 billCode * @param billCode diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 7a56fdbaf..380a71100 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -114,6 +114,20 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb return list; } + /** + * 获取查询统计信息 + * + * @param emisWaybill 运单列表 + * @return 获取查询统计信息Map + */ + @Override + public Map getQueryStatInfoMap(EmisWaybill emisWaybill) + { + Map statInfoMap=emisWaybillMapper.getQueryStatInfoMap(emisWaybill); + + return statInfoMap; + } + diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 64b16b044..55a6e13be 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -762,6 +762,288 @@ a.create_time desc + + +