From 6a4fe0b99844e6dcaccc4b14f587268d74ec1c87 Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 8 Mar 2025 23:07:36 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/emis/domain/EmisWaybill.java | 9 ++++++--- .../xdadan/erp/emis/service/EmisBaseService.java | 10 +++++++--- .../service/impl/EmisTmsScanRecordServiceImpl.java | 8 +++++++- .../main/resources/mapper/EmisWaybillMapper.xml | 14 ++++++++------ 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index f3ff0c8b4..f686e2f80 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -174,6 +174,7 @@ public class EmisWaybill extends BaseEntity @TableField @DataAuditField(fieldComment = "线路") private String transLineType; + /* 快递产品类型 */ @TableField @DataAuditField(fieldComment = "产品类型") @@ -551,7 +552,6 @@ public class EmisWaybill extends BaseEntity @DataAuditField(fieldComment = "产品类型") private String productTypeName; - /* 录单站点 */ @TableField(exist = false) private String registerSiteName; @@ -586,7 +586,6 @@ public class EmisWaybill extends BaseEntity @TableField(exist = false) private String destinationCenterName; - // 派件网点名称,派件人 @TableField(exist = false) private String dispatchSiteName; @@ -643,7 +642,6 @@ public class EmisWaybill extends BaseEntity @TableField(exist = false) private String lockReason; - @TableField @DataAuditField(fieldComment = "录单备注") private String remark; @@ -656,4 +654,9 @@ public class EmisWaybill extends BaseEntity @TableField(exist = false) private String customerAvatar; + // transType - 运输类型 + @TableField(exist = false) + private String transType; + + } 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 62689301f..e6ee165a0 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 @@ -750,8 +750,6 @@ public class EmisBaseService { preOrNextStationStr=scanRecord.getPreOrNextStation(); } - - // 揽收扫描 if(ScanType.GOT.opCode.equals(scanType)){ content="已揽收 快件在【"+scanRecord.getScanSite()+"】已收件,取件员【"+dispatchOrSendManStr+"】"; @@ -781,7 +779,13 @@ public class EmisBaseService { } // 派送扫描 else if(ScanType.SENT.opCode.equals(scanType)){ - content="派件 快件在【"+scanRecord.getScanSite()+"】开始派送,已分配派件员【"+dispatchOrSendManStr+"】"; + + String carNo=""; + if(!StringUtils.isEmpty(scanRecord.getCarNo())){ + carNo="车牌号【"+scanRecord.getCarNo()+"】"; + } + + content="派件 快件在【"+scanRecord.getScanSite()+"】开始派送,已分配派件员【"+dispatchOrSendManStr+"】"+carNo; if(isInner){ content=scanRecord.getScanSite()+","+scanRecord.getScanMan()+",派件,"+scanDateStr+","+content; 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 f8351fcca..a93c2ec4c 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 @@ -1928,6 +1928,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm String scanType = emisTmsScanRecord.getScanType(); // 揽收扫描 if(ScanType.GOT.opCode.equals(scanType)){ + // String scanWeightStr = (String)scanDataItem.get("scanWeight"); // double scanWeight = 0.0D; @@ -1937,7 +1938,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // } // 揽收特殊情况 - // String scanManCode=MapUtils.getString(scanDataItem,"scanManCode",null); // String scanSiteCode=MapUtils.getString(scanDataItem,"scanSiteCode",null); // if(!StringUtils.isEmpty(scanManCode)){ @@ -2056,7 +2056,13 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm if(emUser!=null){ emisTmsScanRecord.setDispatchOrSendMan(emUser.getEmpName()); emisTmsScanRecord.setDispatchOrSendManPhone(emUser.getPhonenumber()); + + // 只有陆运才会显示车牌号 emisTmsScanRecord.setCarNo(emUser.getCarNo()); + + EmisTransLine transLine=getTransLineByCode(waybill.getTransLineType()); + + }else{ emisTmsScanRecord.setDispatchOrSendManCode(getCurrentUser().getEmpCode()); emisTmsScanRecord.setDispatchOrSendMan(getCurrentUser().getEmpName()); diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 345badf0b..1dd955482 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -4,8 +4,6 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - @@ -159,7 +157,6 @@ - @@ -169,7 +166,6 @@ - @@ -216,6 +212,8 @@ + + @@ -319,7 +317,9 @@ w.site_name as current_site_name, x.site_name as next_site_name, y.site_name as last_site_name, - z.type_name as problem_type_name + z.type_name as problem_type_name, + + k.trans_type as trans_type from emis_waybill a left join emis_country b on a.receive_country=b.code and b.del_flag='0' @@ -412,7 +412,9 @@ w.site_name as current_site_name, x.site_name as next_site_name, y.site_name as last_site_name, - z.type_name as problem_type_name + z.type_name as problem_type_name, + + k.trans_type as trans_type from emis_waybill a