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-07-18 11:17:31 +08:00
parent dc80d75c81
commit 77bfb26bc2
5 changed files with 107 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<Map> list = emisBaseService.getSiteSendStatInfoMap(emisWaybill);
return getDataTable(list);
}
/**
* 目的网点运单统计
* @param emisWaybill
* @return
*/
@GetMapping("/getSiteDestStatInfoMap")
public TableDataInfo getSiteDestStatInfoMap(EmisWaybill emisWaybill)
{
startPage();
// 设置通用权限查询参数
setPrivParams(emisWaybill);
List<Map> list = emisBaseService.getSiteDestStatInfoMap(emisWaybill);
return getDataTable(list);
}
/**
* 查询运单统计明细数据
* @param emisWaybill
* @return
*/
@GetMapping("/queryScanStatInfoDtlList")
public TableDataInfo queryScanStatInfoDtlList(EmisWaybill emisWaybill)
{
startPage();
// 设置通用权限查询参数
setPrivParams(emisWaybill);
List<ScanStatInfoDtl> 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)
{

13
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java
View File

@ -55,21 +55,8 @@ public interface EmisSettleSubBillMapper extends BaseMapper<EmisSettleSubBill>
public Map getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill);
/**
* 寄件网点运单统计
* @param emisSettleSubBill
* @return
*/
public Map getSiteSendStatInfoMap(EmisSettleSubBill emisSettleSubBill);
/**
* 目的网点运单统计
* @param emisSettleSubBill
* @return
*/
public Map getSiteDestStatInfoMap(EmisSettleSubBill emisSettleSubBill);
/**
* 根据客户统计月结账单

6
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java
View File

@ -102,7 +102,11 @@ public interface EmisTmsScanRecordMapper extends BaseMapper<EmisTmsScanRecord>
public List<EmisTmsScanRecord> queryScanStatRecordList(EmisTmsScanRecord emisTmsScanRecord);
// 查询统计明细
/**
* 查询运单扫描统计明细
* @param emisWaybill
* @return
*/
public List<ScanStatInfoDtl> queryScanStatInfoDtlList(EmisWaybill emisWaybill);

14
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
View File

@ -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<EmisWaybill>
/**
* 寄件网点运单统计
* @param emisWaybill
* @return
*/
public List<Map> getSiteSendStatInfoMap(EmisWaybill emisWaybill);
/**
* 目的网点运单统计
* @param emisWaybill
* @return
*/
public List<Map> getSiteDestStatInfoMap(EmisWaybill emisWaybill);
}

30
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -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<Map> getSiteSendStatInfoMap(EmisWaybill emisWaybill){
return emisWaybillMapper.getSiteSendStatInfoMap(emisWaybill);
}
/**
* 目的网点运单统计
* @param emisWaybill
* @return
*/
public List<Map> getSiteDestStatInfoMap(EmisWaybill emisWaybill){
return emisWaybillMapper.getSiteDestStatInfoMap(emisWaybill);
}
/**
* 查询运单扫描统计明细
* @param emisWaybill
* @return
*/
public List<ScanStatInfoDtl> queryScanStatInfoDtlList(EmisWaybill emisWaybill){
return emisTmsScanRecordMapper.queryScanStatInfoDtlList(emisWaybill);
}
/**
* 根据添加的地址增加客户
* @param emisCustomerAddressNew