From dc80d75c810a145dcf03b2be35d7fe6c8d9f9d74 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 18 Jul 2024 10:13:14 +0800 Subject: [PATCH] md --- .../emis/domain/stat/ScanStatDataInfo.java | 1 - .../erp/emis/domain/stat/ScanStatInfoDtl.java | 37 ++++++ .../emis/domain/stat/SendStatDataInfo.java | 28 ----- .../emis/mapper/EmisSettleSubBillMapper.java | 16 +++ .../emis/mapper/EmisTmsScanRecordMapper.java | 6 + .../mapper/EmisTmsScanRecordMapper.xml | 64 +++++++++++ .../resources/mapper/EmisWaybillMapper.xml | 105 +++++++++++++++++- 7 files changed, 222 insertions(+), 35 deletions(-) create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatInfoDtl.java delete mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/SendStatDataInfo.java diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatDataInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatDataInfo.java index 8f731ade3..cdf3e1aba 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatDataInfo.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatDataInfo.java @@ -22,7 +22,6 @@ public class ScanStatDataInfo implements Serializable { private Integer scanCount; private Integer signCount; private BigDecimal signRate; -// private String billCodeStr; private String scanSiteCode; private String scanSiteName; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatInfoDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatInfoDtl.java new file mode 100644 index 000000000..9f734b8ce --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatInfoDtl.java @@ -0,0 +1,37 @@ +package com.xdadan.erp.emis.domain.stat; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xdadan.erp.emis.domain.EmisWaybill; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 扫描统计信息明细 + */ +@Data +public class ScanStatInfoDtl implements Serializable { + private static final long serialVersionUID = 1L; + + // 运单号 + private String billCode; + + // 收件扫描数 + private Integer gotCount; + // 发件扫描 + private Integer sendCount; + // 到件扫描 + private Integer arrivalCount; + // 派件扫描 + private Integer sentCount; + // 问题件扫描 + private Integer issueCount; + // 留仓次数 + private Integer holdCount; + + // 运单详情 + private EmisWaybill waybillDetail; + + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/SendStatDataInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/SendStatDataInfo.java deleted file mode 100644 index 723dbc4b0..000000000 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/SendStatDataInfo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.xdadan.erp.emis.domain.stat; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 寄件录单统计 - */ -@Data -public class SendStatDataInfo implements Serializable { - private static final long serialVersionUID = 1L; - - /* 录单日期 yyyy-mm-dd */ - private String sendDay; - - // 扫描记录数,已签收数量 - private Integer scanCount; - private Integer signCount; - - private String billCodeStr; - - private String scanSiteCode; - private String scanSiteName; - -} 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 d395e52a7..b288d734f 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,6 +55,22 @@ 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 4b3496ac5..49e237dd8 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 @@ -17,7 +17,9 @@ import java.util.Map; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xdadan.erp.emis.domain.EmisTmsScanPicInfo; import com.xdadan.erp.emis.domain.EmisTmsScanRecord; +import com.xdadan.erp.emis.domain.EmisWaybill; import com.xdadan.erp.emis.domain.stat.ScanStatDataInfo; +import com.xdadan.erp.emis.domain.stat.ScanStatInfoDtl; import org.apache.ibatis.annotations.Param; /** @@ -100,4 +102,8 @@ public interface EmisTmsScanRecordMapper extends BaseMapper public List queryScanStatRecordList(EmisTmsScanRecord emisTmsScanRecord); + // 查询统计明细 + public List queryScanStatInfoDtlList(EmisWaybill emisWaybill); + + } diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml index 873162239..13eed3d67 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml @@ -78,6 +78,70 @@ + + + + + + + + + + + + + + + + + + - select + date_format(a.send_date,'%Y-%m-%d') as sendDate, + a.send_site_code as sendSiteCode, + a.send_center_code as sendCenterCode, + b.site_name as sendSiteName, + c.site_name as sendCenterName, count(1) as totalNum, sum(a.parcel_qty) as totalParcelQty, - round(sum(bill_weight),2) as totalBillWeight, - round(sum(total_volume),5) as totalVolume, - round(sum(volume_weight),2) as totalVolumeWeight, - round(sum(settlement_weight),2) as totalSettlementWeight, - round(sum(freight),2) as totalFreight + round(sum(a.bill_weight),2) as totalBillWeight, + round(sum(a.total_volume),5) as totalVolume, + round(sum(a.volume_weight),2) as totalVolumeWeight, + round(sum(a.settlement_weight),2) as totalSettlementWeight, + round(sum(a.freight),2) as totalFreight + from emis_waybill a + left join emis_site b on a.send_site_code = b.site_code and b.del_flag='0' + left join emis_site c on a.send_center_code = c.site_code and c.del_flag='0' + + a.del_flag='0' and order_status !='0' + and a.send_site_code= #{sendSiteCode} + + and a.send_date = ]]> #{params.beginSendDate} + + + and a.send_date #{params.endSendDate} + + + and ( + a.send_site_code in ( + SELECT t1.site_code FROM ( + SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid := + #{params.privSiteCode} ) pd + WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code) + UNION + SELECT #{params.privSiteCode} FROM dual + ) + ) + + + + group by a.send_site_code + order by a.send_date desc + + + + + + + +