From f1e0b82e2ecc35762a16881b00a9422dec398a65 Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 2 Jun 2024 06:27:44 +0800 Subject: [PATCH] md --- .../web/emis/EmisTmsScanRecordController.java | 9 +- .../erp/emis/domain/EmisTmsScanRecord.java | 2 + .../emis/domain/stat/ScanStatDataInfo.java | 32 ++++++ .../emis/mapper/EmisTmsScanRecordMapper.java | 12 ++ .../service/IEmisTmsScanRecordService.java | 7 +- .../impl/EmisTmsScanRecordServiceImpl.java | 13 ++- .../mapper/EmisTmsScanRecordMapper.xml | 105 ++++++++++++++---- .../resources/mapper/EmisWaybillMapper.xml | 54 +-------- 8 files changed, 153 insertions(+), 81 deletions(-) create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatDataInfo.java diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java index e51a18e49..09a44b20a 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java @@ -23,6 +23,7 @@ import com.xdadan.erp.common.core.domain.entity.SysUser; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.ScanType; import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.domain.stat.ScanStatDataInfo; import com.xdadan.erp.emis.domain.vo.scan.ScanInfo; import com.xdadan.erp.emis.domain.vo.scan.ScanResult; import com.xdadan.erp.emis.service.EmisBaseService; @@ -79,12 +80,12 @@ public class EmisTmsScanRecordController extends BaseController /** * 签收签收统计数据 */ - @PreAuthorize("@ss.hasPermi('emis:emisTmsScanRecord:signStat')") - @GetMapping("/querySignStatData") - public TableDataInfo querySignStatData(EmisTmsScanRecord emisTmsScanRecord) +// @PreAuthorize("@ss.hasPermi('emis:emisTmsScanRecord:signStat')") + @GetMapping("/queryScanStatDataList") + public TableDataInfo queryScanStatDataList(EmisTmsScanRecord emisTmsScanRecord) { startPage(); - List list = emisTmsScanRecordService.querySignStatData(emisTmsScanRecord); + List list = emisTmsScanRecordService.queryScanStatDataList(emisTmsScanRecord); return getDataTable(list); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java index f4a1bec63..a38da101d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java @@ -115,6 +115,8 @@ public class EmisTmsScanRecord extends BaseEntity private String status; +// 扩展参数 private EmisWaybill waybillDetail; + } 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 new file mode 100644 index 000000000..a94dc566b --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatDataInfo.java @@ -0,0 +1,32 @@ +package com.xdadan.erp.emis.domain.stat; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xdadan.erp.common.core.domain.BaseEntity; +import com.xdadan.erp.emis.domain.EmisTmsScanRecord; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 扫描统计信息,自定义VO,非表结构 + */ +@Data +public class ScanStatDataInfo extends EmisTmsScanRecord { + private static final long serialVersionUID = 1L; + + // 扫描记录数,已签收数量，未签收数量 + private Integer scanCount; + private Integer signCount; + private Integer unSignCount; + + private String billCodeStr; + private String scanSiteName; + + + + +} 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 344428a03..89b4efe06 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 @@ -12,9 +12,12 @@ package com.xdadan.erp.emis.mapper; import java.util.Date; import java.util.List; +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.stat.ScanStatDataInfo; import org.apache.ibatis.annotations.Param; /** @@ -81,4 +84,13 @@ public interface EmisTmsScanRecordMapper extends BaseMapper public List selectTraceListByBillCode(String billCode); + + /** + * 获取签收异常对比数据 + * @param emisTmsScanRecord + * @return + */ + public List queryScanStatDataList(EmisTmsScanRecord emisTmsScanRecord); + + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java index 9e6ef7068..cad39bd45 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java @@ -14,6 +14,7 @@ import java.util.Map; import com.xdadan.erp.emis.domain.EmisTmsScanRecord; import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.domain.stat.ScanStatDataInfo; import com.xdadan.erp.emis.domain.vo.scan.ScanInfo; import com.xdadan.erp.emis.domain.vo.scan.ScanResult; @@ -94,13 +95,11 @@ public interface IEmisTmsScanRecordService public List queryWaybillTraceInfo(String billCode, String lang); - /** - * 签收异常对比 + * 签收异常对比-扫描统计数据 * @param emisTmsScanRecord * @return */ - public List querySignStatData(EmisTmsScanRecord emisTmsScanRecord); - + public List queryScanStatDataList(EmisTmsScanRecord emisTmsScanRecord); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index bfba2b0e6..ca9894c85 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -18,6 +18,7 @@ import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.ScanType; import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.domain.stat.ScanStatDataInfo; import com.xdadan.erp.emis.domain.vo.scan.ScanInfo; import com.xdadan.erp.emis.domain.vo.scan.ScanResult; import com.xdadan.erp.emis.domain.vo.scan.ScanResultItem; @@ -673,13 +674,21 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } + /** + * 查询扫描统计数据 + * @param emisTmsScanRecord + * @return + */ @Override - public List getTraceListByBillCode(String billCode) { - return emisTmsScanRecordMapper.selectTraceListByBillCode(billCode); + public List queryScanStatDataList(EmisTmsScanRecord emisTmsScanRecord){ + return emisTmsScanRecordMapper.queryScanStatDataList(emisTmsScanRecord); } + + + } diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml index 8ec723de9..e712fe837 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -53,6 +53,11 @@ + + + + + + + - - select id, bill_code, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site from emis_tms_scan_record - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + select id, bill_code, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site from emis_tms_scan_record + + + + - - - - where del_flag='0' and bill_code=#{billCode} - order by create_time desc; - - \ No newline at end of file diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index a9d88940e..539939014 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -208,58 +208,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, bill_code, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site from emis_tms_scan_record a where a.bill_code = #{billCode} limit 1