From 77bfb26bc2ae3e26f463578730746ff27528edf2 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 18 Jul 2024 11:17:31 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisWaybillController.java | 59 +++++++++++++++++++ .../emis/mapper/EmisSettleSubBillMapper.java | 13 ---- .../emis/mapper/EmisTmsScanRecordMapper.java | 6 +- .../erp/emis/mapper/EmisWaybillMapper.java | 14 ++++- .../erp/emis/service/EmisBaseService.java | 30 ++++++++++ 5 files changed, 107 insertions(+), 15 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 2112714bc..7ac578c44 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 @@ -34,6 +34,7 @@ import com.xdadan.erp.emis.domain.EmisTmsScanRecord; import com.xdadan.erp.emis.domain.enumtype.ScanType; import com.xdadan.erp.emis.domain.enumtype.WaybillStatus; import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.domain.stat.ScanStatInfoDtl; import com.xdadan.erp.emis.domain.vo.*; import com.xdadan.erp.emis.service.*; import com.xdadan.erp.emis.service.print.IXddTplPrint; @@ -548,6 +549,60 @@ public class EmisWaybillController extends EmisBaseController return getDataTable(list); } + /** + * 寄件网点运单统计 + * @param emisWaybill + * @return + */ + @GetMapping("/getSiteSendStatInfoMap") + public TableDataInfo getSiteSendStatInfoMap(EmisWaybill emisWaybill) + { + startPage(); + + // 设置通用权限查询参数 + setPrivParams(emisWaybill); + + List list = emisBaseService.getSiteSendStatInfoMap(emisWaybill); + return getDataTable(list); + } + + /** + * 目的网点运单统计 + * @param emisWaybill + * @return + */ + @GetMapping("/getSiteDestStatInfoMap") + public TableDataInfo getSiteDestStatInfoMap(EmisWaybill emisWaybill) + { + startPage(); + + // 设置通用权限查询参数 + setPrivParams(emisWaybill); + + List list = emisBaseService.getSiteDestStatInfoMap(emisWaybill); + return getDataTable(list); + } + + /** + * 查询运单统计明细数据 + * @param emisWaybill + * @return + */ + @GetMapping("/queryScanStatInfoDtlList") + public TableDataInfo queryScanStatInfoDtlList(EmisWaybill emisWaybill) + { + startPage(); + + // 设置通用权限查询参数 + setPrivParams(emisWaybill); + + List list= emisBaseService.queryScanStatInfoDtlList(emisWaybill); + + return getDataTable(list); + } + + + /** * 获取运单统计信息 * @param emisWaybill @@ -565,6 +620,10 @@ public class EmisWaybillController extends EmisBaseController } + + + + @GetMapping("/selectEmisWaybillByMutiBillCode") public TableDataInfo selectEmisWaybillByMutiBillCode(EmisWaybill emisWaybill) { diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java index b288d734f..50d5a3f5d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java @@ -55,21 +55,8 @@ public interface EmisSettleSubBillMapper extends BaseMapper public Map getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill); - /** - * 寄件网点运单统计 - * @param emisSettleSubBill - * @return - */ - public Map getSiteSendStatInfoMap(EmisSettleSubBill emisSettleSubBill); - /** - * 目的网点运单统计 - * @param emisSettleSubBill - * @return - */ - public Map getSiteDestStatInfoMap(EmisSettleSubBill emisSettleSubBill); - /** * 根据客户统计月结账单 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java index 49e237dd8..d954d19e2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java @@ -102,7 +102,11 @@ public interface EmisTmsScanRecordMapper extends BaseMapper public List queryScanStatRecordList(EmisTmsScanRecord emisTmsScanRecord); - // 查询统计明细 + /** + * 查询运单扫描统计明细 + * @param emisWaybill + * @return + */ public List queryScanStatInfoDtlList(EmisWaybill emisWaybill); 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 615f37917..9f52d41af 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 @@ -16,6 +16,7 @@ import java.util.Map; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xdadan.erp.common.annotation.audit.DataAuditFilter; +import com.xdadan.erp.emis.domain.EmisSettleSubBill; import com.xdadan.erp.emis.domain.EmisWaybill; import org.apache.ibatis.annotations.Param; @@ -158,7 +159,18 @@ public interface EmisWaybillMapper extends BaseMapper + /** + * 寄件网点运单统计 + * @param emisWaybill + * @return + */ + public List getSiteSendStatInfoMap(EmisWaybill emisWaybill); - + /** + * 目的网点运单统计 + * @param emisWaybill + * @return + */ + public List getSiteDestStatInfoMap(EmisWaybill emisWaybill); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index f0a4d672f..b27eacb2e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -33,6 +33,7 @@ package com.xdadan.erp.emis.service; import com.xdadan.erp.emis.domain.enumtype.ScanType; import com.xdadan.erp.emis.domain.enumtype.WaybillStatus; import com.xdadan.erp.emis.domain.exception.EmisBizError; + import com.xdadan.erp.emis.domain.stat.ScanStatInfoDtl; import com.xdadan.erp.emis.domain.vo.WaybillOrder; import com.xdadan.erp.emis.domain.vo.scan.ScanResultItem; import com.xdadan.erp.emis.mapper.*; @@ -2188,6 +2189,35 @@ public class EmisBaseService { } + /** + * 寄件网点运单统计 + * @param emisWaybill + * @return + */ + public List getSiteSendStatInfoMap(EmisWaybill emisWaybill){ + return emisWaybillMapper.getSiteSendStatInfoMap(emisWaybill); + } + + + /** + * 目的网点运单统计 + * @param emisWaybill + * @return + */ + public List getSiteDestStatInfoMap(EmisWaybill emisWaybill){ + return emisWaybillMapper.getSiteDestStatInfoMap(emisWaybill); + } + + + /** + * 查询运单扫描统计明细 + * @param emisWaybill + * @return + */ + public List queryScanStatInfoDtlList(EmisWaybill emisWaybill){ + return emisTmsScanRecordMapper.queryScanStatInfoDtlList(emisWaybill); + } + /** * 根据添加的地址增加客户 * @param emisCustomerAddressNew