md

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;
+
+
 }

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;

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());

emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml

@@ -4,8 +4,6 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillMapper">
 
-<!--    extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult"-->
-
     <resultMap type="EmisWaybill" id="BaseEmisWaybillResult" >
         <result property="id"    column="id"    />
         <result property="orderSn"    column="order_sn"    />
@@ -159,7 +157,6 @@
         <result property="signSiteCode"    column="sign_site_code"    />
         <result property="signDate"    column="sign_date"    />
 
-
         <result property="timezoneOffset"    column="timezone_offset"    />
         <result property="paymentStatus"    column="payment_status"    />
         <result property="paymentDate"    column="payment_date"    />
@@ -169,7 +166,6 @@
         <result property="blSpecialGoods"    column="bl_special_goods"    />
         <result property="extInfo"    column="ext_info"    />
 
-
         <!-- 扩展属性 -->
         <result property="receiveCountryName"    column="receive_country_name"    />
         <result property="receiveProvinceName"    column="receive_province_name"    />
@@ -216,6 +212,8 @@
         <result property="customerNickName"    column="customer_nick_name"    />
         <result property="customerAvatar"    column="customer_avatar"    />
 
+        <result property="transType"    column="trans_type"    />
+
 
     </resultMap>
 
@@ -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